summaryrefslogtreecommitdiff
path: root/muse2
diff options
context:
space:
mode:
Diffstat (limited to 'muse2')
-rw-r--r--muse2/ChangeLog2
-rw-r--r--muse2/muse/mplugins/mitplugin.cpp10
-rw-r--r--muse2/muse/mplugins/rhythm.cpp4
-rw-r--r--muse2/muse/mplugins/rhythm.h27
4 files changed, 28 insertions, 15 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index 04e0c297..5d306791 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -1,3 +1,5 @@
+11.10.2011:
+ - Fixed the build of experimental rhythm generator. (Orcan)
09.10.2011:
- Fixed track list midi port popup menu - too many ports listed. Separated empty ports into submenu. (Tim)
06.10.2011:
diff --git a/muse2/muse/mplugins/mitplugin.cpp b/muse2/muse/mplugins/mitplugin.cpp
index 48e30bb6..d4d7dd70 100644
--- a/muse2/muse/mplugins/mitplugin.cpp
+++ b/muse2/muse/mplugins/mitplugin.cpp
@@ -48,7 +48,7 @@ void MusE::startMidiInputPlugin(int id)
QAction* act;
if (id == 0) {
if (!MusEGlobal::mitPluginTranspose) {
- MusEGlobal::mitPluginTranspose = new MusEGui::MITPluginTranspose();
+ MusEGlobal::mitPluginTranspose = new MITPluginTranspose();
MusECore::mitPlugins.push_back(MusEGlobal::mitPluginTranspose);
connect(MusEGlobal::mitPluginTranspose, SIGNAL(hideWindow()),
SLOT(hideMitPluginTranspose()));
@@ -58,7 +58,7 @@ void MusE::startMidiInputPlugin(int id)
}
else if (id == 1) {
if (!midiInputTransform) {
- midiInputTransform = new MusEGui::MidiInputTransformDialog();
+ midiInputTransform = new MidiInputTransformDialog();
connect(midiInputTransform, SIGNAL(hideWindow()),
SLOT(hideMidiInputTransform()));
}
@@ -67,7 +67,7 @@ void MusE::startMidiInputPlugin(int id)
}
else if (id == 2) {
if (!midiFilterConfig) {
- midiFilterConfig = new MusEGui::MidiFilterConfig();
+ midiFilterConfig = new MidiFilterConfig();
connect(midiFilterConfig, SIGNAL(hideWindow()),
SLOT(hideMidiFilterConfig()));
}
@@ -76,7 +76,7 @@ void MusE::startMidiInputPlugin(int id)
}
else if (id == 3) {
if (!midiRemoteConfig) {
- midiRemoteConfig = new MusEGui::MRConfig();
+ midiRemoteConfig = new MRConfig();
connect(midiRemoteConfig, SIGNAL(hideWindow()),
SLOT(hideMidiRemoteConfig()));
}
@@ -134,7 +134,7 @@ void MusE::hideMidiRhythmGenerator()
void MusE::startMidiTransformer()
{
if (midiTransformerDialog == 0)
- midiTransformerDialog = new MusEGui::MidiTransformerDialog;
+ midiTransformerDialog = new MidiTransformerDialog;
midiTransformerDialog->show();
}
diff --git a/muse2/muse/mplugins/rhythm.cpp b/muse2/muse/mplugins/rhythm.cpp
index 78dfeee5..7c51227c 100644
--- a/muse2/muse/mplugins/rhythm.cpp
+++ b/muse2/muse/mplugins/rhythm.cpp
@@ -29,6 +29,8 @@
#include "rhythm.h"
+namespace MusEGui {
+
//---------------------------------------------------------
// RhythmGen
//---------------------------------------------------------
@@ -525,5 +527,7 @@ RhythmGenerator::~RhythmGenerator()
{
// no need to delete child widgets, Qt does it all for us
}
+
#endif
+} // namespace MusEGui
diff --git a/muse2/muse/mplugins/rhythm.h b/muse2/muse/mplugins/rhythm.h
index d60e7993..de6c178b 100644
--- a/muse2/muse/mplugins/rhythm.h
+++ b/muse2/muse/mplugins/rhythm.h
@@ -34,17 +34,22 @@
#include <QMainWindow>
+#define MAX_GROUPS 5
+#define MAX_KEYS 20
+
class QCloseEvent;
+namespace MusECore {
+class Xml;
+}
+
+namespace MusEGui {
+
class tTrack;
class tEventWin;
class tSong;
class tBarInfo;
-#define MAX_GROUPS 5
-#define MAX_KEYS 20
-
-class Xml;
#if 0
//---------------------------------------------------------
@@ -59,8 +64,8 @@ struct tRhyGroup {
listen = 0;
contrib = 0;
}
-// void write(int, Xml&);
-// void read(Xml&);
+// void write(int, MusECore::Xml&);
+// void read(MusECore::Xml&);
};
//---------------------------------------------------------
@@ -71,8 +76,8 @@ struct tRhyGroups {
tRhyGroup g[MAX_GROUPS];
tRhyGroup& operator [] (int i) { return g[i]; }
-// void write(int, Xml&);
-// void read(Xml&);
+// void write(int, MusECore::Xml&);
+// void read(MusECore::Xml&);
};
//---------------------------------------------------------
@@ -123,8 +128,8 @@ class tRhythm
void GenInit(long start_clock);
void GenerateEvent(tTrack *track, long clock, short vel, short len);
- void write(int, Xml&);
- void read(Xml&);
+ void write(int, MusECore::Xml&);
+ void read(MusECore::Xml&);
};
#endif
@@ -209,5 +214,7 @@ class RhythmGen : public QMainWindow, public Ui::RhythmBase
// bool OnClose();
};
+} // namespace MusEGui
+
#endif