--- jsampler/trunk/src/org/jsampler/view/classic/Channel.java	2007/09/22 17:27:06	1357
+++ jsampler/trunk/src/org/jsampler/view/classic/Channel.java	2007/12/03 23:22:02	1540
@@ -79,7 +79,7 @@
 import org.jsampler.AudioDeviceModel;
 import org.jsampler.CC;
 import org.jsampler.HF;
-import org.jsampler.Instrument;
+import org.jsampler.OrchestraInstrument;
 import org.jsampler.MidiDeviceModel;
 import org.jsampler.MidiInstrumentMap;
 import org.jsampler.SamplerChannelModel;
@@ -545,15 +545,15 @@
 			if(sc.getInstrumentName() == null || sc.getInstrumentStatus() < 0)
 				return null;
 			
-			Instrument instr = new Instrument();
+			OrchestraInstrument instr = new OrchestraInstrument();
 			instr.setName(sc.getInstrumentName());
 			instr.setInstrumentIndex(sc.getInstrumentIndex());
-			instr.setPath(sc.getInstrumentFile());
+			instr.setFilePath(sc.getInstrumentFile());
 			return instr.getDnDString();
 		}
 		
 		public void setInstrument(String instr) {
-			if(!Instrument.isDnDString(instr)) return;
+			if(!OrchestraInstrument.isDnDString(instr)) return;
 			
 			String[] args = instr.split("\n");
 			if(args.length < 6) return;
@@ -1429,6 +1429,9 @@
 		Object oldEngine = getModel().getChannelInfo().getEngine();
 		SamplerEngine newEngine = (SamplerEngine)cbEngines.getSelectedItem();
 		
+		if(newEngine == null) cbEngines.setToolTipText(null);
+		else cbEngines.setToolTipText(newEngine.getDescription());
+		
 		if(oldEngine != null) { if(oldEngine.equals(newEngine)) return; }
 		else if(newEngine == null) return;