diff options
| author | Florian Jung <flo@windfisch.org> | 2011-12-14 15:08:02 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-12-14 15:08:02 +0000 |
| commit | c36a5508aa42e596b005425208054af9a60734b4 (patch) | |
| tree | fde0504e0c25b8f39ed6f5f7f7332943e4a95c7f /muse2/muse/instruments/minstrument.h | |
| parent | 42126f3b398802eb24c8d9acd2591ef4dbe7257d (diff) | |
pulled fixes from release into trunk
Diffstat (limited to 'muse2/muse/instruments/minstrument.h')
| -rw-r--r-- | muse2/muse/instruments/minstrument.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/muse2/muse/instruments/minstrument.h b/muse2/muse/instruments/minstrument.h index 3a645d7f..385e67b4 100644 --- a/muse2/muse/instruments/minstrument.h +++ b/muse2/muse/instruments/minstrument.h @@ -143,7 +143,7 @@ class MidiInstrument { virtual void reset(int, MType); virtual QString getPatchName(int,int,MType,bool); //virtual void populatePatchPopup(QMenu*, int, MType, bool); - //virtual void populatePatchPopup(MusEGui::PopupMenu*, int, MType, bool); + virtual void populatePatchPopup(MusEGui::PopupMenu*, int, MType, bool); void read(Xml&); void write(int level, Xml&); @@ -171,8 +171,8 @@ extern void removeMidiInstrument(const MidiInstrument* instr); } // namespace MusECore -namespace MusEGui { -extern void populatePatchPopup(MusECore::MidiInstrument*, PopupMenu*, int, MType, bool); -} +//namespace MusEGui { +//extern void populatePatchPopup(MusECore::MidiInstrument*, PopupMenu*, int, MType, bool); +//} #endif |