!!! Song type is now removed !!! : See ChangeLog

1 files changed, 9 insertions, 7 deletions

diff --git a/muse2/muse/instruments/minstrument.h b/muse2/muse/instruments/minstrument.h
index 6b534672..7ff6f7d8 100644
--- a/muse2/muse/instruments/minstrument.h
+++ b/muse2/muse/instruments/minstrument.h
@@ -47,7 +47,8 @@ class DrumMap;
 //---------------------------------------------------------
 
 struct Patch {
-      signed char typ;                     // 1 - GM  2 - GS  4 - XG
+      // REMOVE Tim. OBSOLETE. 
+      //signed char typ;                     // 1 - GM  2 - GS  4 - XG
       signed char hbank, lbank, prog;
       QString name;
       bool drum;
@@ -200,6 +201,7 @@ class MidiInstrument {
       MidiInstrument(const QString& txt);
       const QString& iname() const      { return _name; }
       void setIName(const QString& txt) { _name = txt; }
+      MType midiType() const;
       
       //MidiInstrument& uniqueCopy(const MidiInstrument&);
       // Assign will 'delete' all existing patches and groups from the instrument.
@@ -214,9 +216,9 @@ class MidiInstrument {
       void addSysex(SysEx* sysex)            { _sysex.append(sysex); }
       
       const DrumMap* drummap_for_patch(int patch) const;
-      QList<dumb_patchlist_entry_t> getPatches(int channel, MType songType, bool drum);
-      unsigned getNextPatch(int channel, unsigned patch, MType songType, bool drum);
-      unsigned getPrevPatch(int channel, unsigned patch, MType songType, bool drum);
+      QList<dumb_patchlist_entry_t> getPatches(int channel, bool drum);
+      unsigned getNextPatch(int channel, unsigned patch, bool drum);
+      unsigned getPrevPatch(int channel, unsigned patch, bool drum);
       
       EventList* midiInit() const            { return _midiInit; }
       EventList* midiReset() const           { return _midiReset; }
@@ -235,9 +237,9 @@ class MidiInstrument {
       virtual bool hasNativeGui() const       { return false; }
       virtual void writeToGui(const MidiPlayEvent&) {}
 
-      virtual void reset(int, MType);
-      virtual QString getPatchName(int,int,MType,bool);
-      virtual void populatePatchPopup(MusEGui::PopupMenu*, int, MType, bool);
+      virtual void reset(int); 
+      virtual QString getPatchName(int,int,bool);
+      virtual void populatePatchPopup(MusEGui::PopupMenu*, int, bool);
       void read(Xml&);
       void write(int level, Xml&);