summaryrefslogtreecommitdiff
path: root/muse2/muse/instruments/minstrument.h
diff options
context:
space:
mode:
authorTim E. Real <termtech@rogers.com>2011-05-19 07:43:06 +0000
committerTim E. Real <termtech@rogers.com>2011-05-19 07:43:06 +0000
commit0f3ed66e83d6639452a5aa219b9a6bf2bfd54897 (patch)
tree950c324e7301f657cba543d8ccbb268ca40e418f /muse2/muse/instruments/minstrument.h
parent0792c2ec66dacfff10899cbe171cb661871617f1 (diff)
Popup menus now auto-scroll if too large to fit on desktop.
Midi track info patch popup now stays open for auditioning patches. Editor 'ctrl' controller popups: Split instrument/other (+ common controls!) + show ctrl numbers.
Diffstat (limited to 'muse2/muse/instruments/minstrument.h')
-rw-r--r--muse2/muse/instruments/minstrument.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/muse2/muse/instruments/minstrument.h b/muse2/muse/instruments/minstrument.h
index a8fb1168..15942537 100644
--- a/muse2/muse/instruments/minstrument.h
+++ b/muse2/muse/instruments/minstrument.h
@@ -14,7 +14,8 @@
#include <vector>
class MidiPort;
-class QMenu;
+//class QMenu;
+class PopupMenu;
class MidiPlayEvent;
class Xml;
class EventList;
@@ -118,7 +119,8 @@ class MidiInstrument {
virtual void reset(int, MType);
virtual QString getPatchName(int,int,MType,bool);
- virtual void populatePatchPopup(QMenu*, int, MType, bool);
+ //virtual void populatePatchPopup(QMenu*, int, MType, bool);
+ virtual void populatePatchPopup(PopupMenu*, int, MType, bool);
void read(Xml&);
void write(int level, Xml&);