--- qsampler/trunk/src/qsamplerChannel.h	2005/01/18 11:29:01	341
+++ qsampler/trunk/src/qsamplerChannel.h	2005/01/18 13:53:04	344
@@ -67,11 +67,12 @@
     bool     loadEngine(const QString& sEngineName);
     
     // Instrument file and index.
+    QString& instrumentName();
     QString& instrumentFile();
     int      instrumentNr();
     int      instrumentStatus();
     bool     loadInstrument(const QString& sInstrumentFile, int iInstrumentNr);
-    
+
     // MIDI input driver (DEPRECATED).
     QString& midiDriver();
     bool     setMidiDriver(const QString& sMidiDriver);
@@ -120,12 +121,10 @@
     void contextMenuEvent(QContextMenuEvent *pEvent);
 
     // Retrieve the available instrument name(s) of an instrument file (.gig).
-    static QString     getInstrumentName (const QString& sInstrumentFile, int iInstrumentNr);
-    static QStringList getInstrumentList (const QString& sInstrumentFile);
-
-    // Instrument name(s) retrieval mode.
-    static bool instrumentNames();
-    static void setInstrumentNames (bool bInstrumentNames);
+    static QString     getInstrumentName (const QString& sInstrumentFile,
+							int iInstrumentNr, bool bInstrumentNames);
+    static QStringList getInstrumentList (const QString& sInstrumentFile,
+							bool bInstrumentNames);
 
 private:
 
@@ -137,6 +136,7 @@
 
     // Sampler channel info map.
     QString m_sEngineName;
+    QString m_sInstrumentName;
     QString m_sInstrumentFile;
     int     m_iInstrumentNr;
     int     m_iInstrumentStatus;
@@ -147,10 +147,6 @@
     QString m_sAudioDriver;         // DEPRECATED.
     int     m_iAudioDevice;
     float   m_fVolume;
-
-    // Retrieve mode for available instrument name(s)
-	// from an instrument file (.gig).
-	static bool g_bInstrumentNames;
 };
 
 #endif  // __qsamplerChannel_h