diff options
Diffstat (limited to 'muse2/muse/mixer/amixer.cpp')
| -rw-r--r-- | muse2/muse/mixer/amixer.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/muse2/muse/mixer/amixer.cpp b/muse2/muse/mixer/amixer.cpp index 0aa246a2..e30524ae 100644 --- a/muse2/muse/mixer/amixer.cpp +++ b/muse2/muse/mixer/amixer.cpp @@ -35,6 +35,7 @@ #include <QAction> #include "app.h" +#include "helper.h" #include "icons.h" #include "amixer.h" #include "song.h" @@ -45,10 +46,6 @@ #include "gconfig.h" #include "xml.h" -namespace MusEApp { -extern QActionGroup* populateAddTrack(QMenu* addTrack); -} - #define __WIDTH_COMPENSATION 4 //typedef std::list<Strip*> StripList; @@ -171,7 +168,8 @@ AudioMixerApp::AudioMixerApp(QWidget* parent, MusEConfig::MixerConfig* c) setWindowIcon(*museIcon); QMenu* menuConfig = menuBar()->addMenu(tr("&Create")); - MusEApp::populateAddTrack(menuConfig); + MusEUtil::populateAddTrack(menuConfig); + connect(menuConfig, SIGNAL(triggered(QAction *)), song, SLOT(addNewTrack(QAction *))); QMenu* menuView = menuBar()->addMenu(tr("&View")); routingId = menuView->addAction(tr("Routing"), this, SLOT(toggleRouteDialog())); @@ -255,6 +253,12 @@ bool AudioMixerApp::event(QEvent* event) } */ +//void AudioMixerApp::addNewTrack(QAction* action) +//{ + //song->addNewTrack(action, MusEGlobal::muse->arranger()->curTrack()); // Insert at current selected track. +// song->addNewTrack(action); // Add at end. +//} + void AudioMixerApp::setSizing() { int w = 0; |