summaryrefslogtreecommitdiff
path: root/muse2/muse/mixer
diff options
context:
space:
mode:
authorOrcan Ogetbil <oget.fedora@gmail.com>2011-09-10 20:16:16 +0000
committerOrcan Ogetbil <oget.fedora@gmail.com>2011-09-10 20:16:16 +0000
commit5f5a8e76f19d6956f6d711979877028f07203d88 (patch)
tree46278d7e52b4f6fca58c9c285a291c2fa499ced7 /muse2/muse/mixer
parent8595cf0d68091d5c3bd20db53a156efe3e669439 (diff)
added license info to new files. moved populateAddSynth / populateAddTrack into helper.cpp, Put stuff in helper.* into MusEUtil namespace.
Diffstat (limited to 'muse2/muse/mixer')
-rw-r--r--muse2/muse/mixer/amixer.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/muse2/muse/mixer/amixer.cpp b/muse2/muse/mixer/amixer.cpp
index 08e1aad4..35173731 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,11 +46,6 @@
#include "gconfig.h"
#include "xml.h"
-//namespace MusEApp { FINDMICHJETZT dirty, dirty. this is implemented in arrangerview.cpp,
-// currently in global namespace. where to put it? in an own code file? helper.cpp?
-extern QActionGroup* populateAddTrack(QMenu* addTrack);
-//}
-
#define __WIDTH_COMPENSATION 4
//typedef std::list<Strip*> StripList;
@@ -172,7 +168,7 @@ AudioMixerApp::AudioMixerApp(QWidget* parent, MusEConfig::MixerConfig* c)
setWindowIcon(*museIcon);
QMenu* menuConfig = menuBar()->addMenu(tr("&Create"));
- populateAddTrack(menuConfig);
+ MusEUtil::populateAddTrack(menuConfig);
QMenu* menuView = menuBar()->addMenu(tr("&View"));
routingId = menuView->addAction(tr("Routing"), this, SLOT(toggleRouteDialog()));