--- qsampler/trunk/src/qsamplerChannel.h	2004/11/19 10:18:59	303
+++ qsampler/trunk/src/qsamplerChannel.h	2005/02/11 15:36:06	371
@@ -1,7 +1,7 @@
 // qsamplerChannel.h
 //
 /****************************************************************************
-   Copyright (C) 2003-2004, rncbc aka Rui Nuno Capela. All rights reserved.
+   Copyright (C) 2003-2005, rncbc aka Rui Nuno Capela. All rights reserved.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
@@ -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);
@@ -100,6 +101,9 @@
     float    volume();
     bool     setVolume(float fVolume);
 
+    // Istrument name remapper.
+    void     updateInstrumentName();
+
     // Channel info structure map executive.
     bool     updateChannelInfo();
 
@@ -120,8 +124,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);
+    static QString     getInstrumentName (const QString& sInstrumentFile,
+							int iInstrumentNr, bool bInstrumentNames);
+    static QStringList getInstrumentList (const QString& sInstrumentFile,
+							bool bInstrumentNames);
 
 private:
 
@@ -133,6 +139,7 @@
 
     // Sampler channel info map.
     QString m_sEngineName;
+    QString m_sInstrumentName;
     QString m_sInstrumentFile;
     int     m_iInstrumentNr;
     int     m_iInstrumentStatus;