diff options
Diffstat (limited to 'muse2/muse/midiedit/drumedit.h')
| -rw-r--r-- | muse2/muse/midiedit/drumedit.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/muse2/muse/midiedit/drumedit.h b/muse2/muse/midiedit/drumedit.h index 7ebf2fd9..63246e2e 100644 --- a/muse2/muse/midiedit/drumedit.h +++ b/muse2/muse/midiedit/drumedit.h @@ -35,7 +35,9 @@ #include "shortcuts.h" #include "event.h" #include "dcanvas.h" +#include "midictrl.h" +class QAction; class QCloseEvent; class QLabel; class QMenu; @@ -44,6 +46,7 @@ class QResizeEvent; class QToolButton; class QWidget; class QComboBox; +class QPushButton; namespace MusECore { @@ -110,6 +113,7 @@ class DrumEdit : public MidiEditor { MusEGui::Header* header; QToolBar* tools; QComboBox *stepLenWidget; + QPushButton* ctrl; static int _rasterInit; static int _dlistWidthInit, _dcanvasWidthInit; @@ -123,6 +127,7 @@ class DrumEdit : public MidiEditor { QAction *groupNoneAction, *groupChanAction, *groupMaxAction; void initShortcuts(); + void setupNewCtrl(CtrlEdit* ctrlEdit); virtual void closeEvent(QCloseEvent*); QWidget* genToolbar(QWidget* parent); @@ -147,6 +152,8 @@ class DrumEdit : public MidiEditor { void configChanged(); void songChanged1(MusECore::SongChangedFlags_t); void setStep(QString); + void addCtrlClicked(); + void ctrlPopupTriggered(QAction* act); void updateGroupingActions(); void set_ignore_hide(bool); @@ -165,7 +172,6 @@ class DrumEdit : public MidiEditor { void execDeliveredScript(int); void execUserScript(int); void focusCanvas(); - CtrlEdit* addCtrl(); void ourDrumMapChanged(bool); virtual void updateHScrollRange(); @@ -180,6 +186,8 @@ class DrumEdit : public MidiEditor { static void readConfiguration(MusECore::Xml& xml); static void writeConfiguration(int, MusECore::Xml&); + CtrlEdit* addCtrl(int ctl_num = MusECore::CTRL_VELOCITY); + bool old_style_drummap_mode() { return _old_style_drummap_mode; } group_mode_t group_mode() { return _group_mode; } bool ignore_hide() { return _ignore_hide; } |