rc2

5 files changed, 36 insertions, 9 deletions

diff --git a/muse2/CMakeLists.txt b/muse2/CMakeLists.txt
index b45b132e..44e3903a 100644
--- a/muse2/CMakeLists.txt
+++ b/muse2/CMakeLists.txt
@@ -59,7 +59,7 @@ IF(NOT DEFINED SHARE_INSTALL_PREFIX)
         SET(SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/share")
 ENDIF(NOT DEFINED SHARE_INSTALL_PREFIX)
 
-#set(CMAKE_BUILD_TYPE debug)
+set(CMAKE_BUILD_TYPE debug)
 #set(CMAKE_BUILD_TYPE release)
 
 # If no CMAKE_BUILD_TYPE is given on the command line,
@@ -85,8 +85,8 @@ set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
 SET(MusE_VERSION_MAJOR 2)
 SET(MusE_VERSION_MINOR 1)
 SET(MusE_VERSION_PATCH 0)
-SET(MusE_VERSION       "2.1rc1")
-SET(MusE_VERSION_FULL  "2.1rc1")
+SET(MusE_VERSION       "2.1rc2")
+SET(MusE_VERSION_FULL  "2.1rc2")
 SET(MusE_INSTALL_NAME  "muse-2.1")
 SET(MusE_EXEC_NAME     "muse2")
 
diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index df71c19d..4bc26620 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -1,3 +1,9 @@
+10.12.2012:
+         - Changed versions to rc2
+         - Changed name of SimpleSynth to original name SimpleDrums, this
+           does affect loading of songs using SimpleSynth. Open the song file
+           in a text editor and change the name of all SimpleSynth to SimpleDrums
+           and all should be ok. (rj)
 09.12.2012:
          - Fix VST names: Use filename if effect name or product name blank. (Tim)
          - Fix bug 3594221: End-to-end midi notes don't retrigger. My bad. (Tim)
diff --git a/muse2/muse/widgets/aboutbox.ui b/muse2/muse/widgets/aboutbox.ui
index d9b900b9..9e497900 100644
--- a/muse2/muse/widgets/aboutbox.ui
+++ b/muse2/muse/widgets/aboutbox.ui
@@ -48,7 +48,7 @@
    <item>
     <widget class="QLabel" name="versionLabel">
      <property name="text">
-      <string>Version 2.1rc1</string>
+      <string>Version 2.1rc2</string>
      </property>
      <property name="wordWrap">
       <bool>false</bool>
diff --git a/muse2/synti/simpledrums2/simpledrums.cpp b/muse2/synti/simpledrums2/simpledrums.cpp
index 8b3ea69c..ef626954 100644
--- a/muse2/synti/simpledrums2/simpledrums.cpp
+++ b/muse2/synti/simpledrums2/simpledrums.cpp
@@ -1,5 +1,5 @@
 //
-// C++ Implementation: simplesynth
+// C++ Implementation: simpledrums
 //
 // Description:
 //
@@ -1665,9 +1665,9 @@ void SimpleSynth::guiSendError(const char* errorstring)
 extern "C"
       {
       static MESS descriptor = {
-            "SimpleSynth",
-            "SimpleSynth by Mathias Lundgren",   // (lunar_shuttle@users.sf.net)",
-            "0.1",      //Version string
+            "SimpleDrums",
+            "SimpleDrums by Mathias Lundgren",   // (lunar_shuttle@users.sf.net)",
+            "0.1.1",      //Version string
             MESS_MAJOR_VERSION, MESS_MINOR_VERSION,
             instantiate,
             };
diff --git a/muse2/synti/simpledrums2/simpledrumsgui.cpp b/muse2/synti/simpledrums2/simpledrumsgui.cpp
index 54063959..f5e38a86 100644
--- a/muse2/synti/simpledrums2/simpledrumsgui.cpp
+++ b/muse2/synti/simpledrums2/simpledrumsgui.cpp
@@ -94,6 +94,26 @@
 
 SimpleSynthGui* simplesynthgui_ptr;
 
+QString labelStrings[] = {
+  "C 1",
+  "C#1",
+  "D 1",
+  "D#1",
+  "E 1",
+  "F 1",
+  "F#1",
+  "G 1",
+
+  "G#1",
+  "A 1",
+  "A#1",
+  "B 1",
+  "C 2",
+  "C#2",
+  "D 2",
+  "D#2",
+};
+
 
 /*!
     \fn QChannelSlider::QChannelSlider(Qt::Orientation orientation, int ch, QWidget* parent, const char* name)
@@ -401,7 +421,8 @@ SimpleSynthGui::SimpleSynthGui()
                   QHBoxLayout* strip = new QHBoxLayout;//(mgbLayout, 5);
                   mgbLayout->addLayout(strip, r, c);
 
-                  QLabel* channelLabel = new QLabel(QString("Ch ") + QString::number(i + 1), mainGroupBox);
+                  //QLabel* channelLabel = new QLabel(QString("Ch ") + QString::number(i + 1), mainGroupBox);
+                  QLabel* channelLabel = new QLabel(QString::number(i + 1) + ": (" +labelStrings[i] + ")", mainGroupBox);
                   strip->addWidget(channelLabel);
 
                   sampleNameLineEdit[i] = new QLineEdit(mainGroupBox);