See ChangeLog

2 files changed, 139 insertions, 38 deletions

diff --git a/muse2/synti/deicsonze/CMakeLists.txt b/muse2/synti/deicsonze/CMakeLists.txt
new file mode 100644
index 00000000..2d9ddfbf
--- /dev/null
+++ b/muse2/synti/deicsonze/CMakeLists.txt
@@ -0,0 +1,63 @@
+#=============================================================================
+#  MusE
+#  Linux Music Editor
+#  $Id:$
+#
+#  Copyright (C) 2002-2006 by Werner Schweer and others
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License version 2.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#=============================================================================
+
+include(${PROJECT_SOURCE_DIR}/pch.txt)
+
+QT4_WRAP_CPP ( deicsonze_mocs deicsonzegui.h )
+# QT4_WRAP_UI (  deicsonze_uis deicsonzegui.ui )
+QT4_WRAP_UI3 (  deicsonze_uis deicsonzeguibase.ui newpreset.ui )
+
+add_library ( deicsonze SHARED
+      ${PROJECT_BINARY_DIR}/all.h
+      ${PROJECT_BINARY_DIR}/all-pic.h.pch
+      deicsonze.cpp
+      # deicsonzepreset.cpp
+      # deicsonzeplugin.cpp
+      # deicsonzefilter.cpp
+      deicsonzegui.cpp
+      deicsonzegui.h
+      
+      ${deicsonze_mocs}
+      ${deicsonze_uis}
+      )
+
+target_link_libraries( deicsonze synti )
+
+# - tell cmake to name target deicsonze.so instead of
+#   libdeicsonze.so
+# - use precompiled header files
+#
+set_target_properties ( deicsonze
+   PROPERTIES PREFIX ""
+   #COMPILE_FLAGS "-O2 -include ${PROJECT_BINARY_DIR}/all-pic.h"
+   COMPILE_FLAGS "-DINSTPREFIX='\"${CMAKE_INSTALL_PREFIX}\"' -include ${PROJECT_BINARY_DIR}/all-pic.h"
+   )
+
+target_link_libraries(deicsonze
+      # al awl 
+      synti
+      ${QT_LIBRARIES}
+      )
+
+install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/synthi/ deicsonze )
+
+# install_files ( /share/${MusE_INSTALL_NAME}/presets/deicsonze SutulaBank.dei )
+install_files ( /share/${MusE_INSTALL_NAME}/presets/deicsonze ARCH_ALIN )
+install_files ( /share/${MusE_INSTALL_NAME}/presets/deicsonze README )
diff --git a/muse2/synti/deicsonze/deicsonzegui.cpp b/muse2/synti/deicsonze/deicsonzegui.cpp
index da293df9..5d20a9b5 100644
--- a/muse2/synti/deicsonze/deicsonzegui.cpp
+++ b/muse2/synti/deicsonze/deicsonzegui.cpp
@@ -324,9 +324,12 @@ void DeicsOnzeGui::setFeedback(int f) {
 
 void DeicsOnzeGui::setLfoWave(const QString& qs) {
     _deicsOnze->_preset->lfo.wave=
-	((operator==(qs,"Saw Up")?SAWUP:
-	  (operator==(qs,"Square")?SQUARE:
-	   (operator==(qs,"Triangl")?TRIANGL:SHOLD))));
+        //((operator==(qs,"Saw Up")?SAWUP:
+	//  (operator==(qs,"Square")?SQUARE:
+	//   (operator==(qs,"Triangl")?TRIANGL:SHOLD))));
+        ((operator==(qs,QString("Saw Up"))?SAWUP:                   // p4.0.2
+          (operator==(qs,QString("Square"))?SQUARE:
+           (operator==(qs,QString("Triangl"))?TRIANGL:SHOLD))));
     _deicsOnze->setLfo();
 }
 
@@ -370,13 +373,20 @@ void DeicsOnzeGui::setGlobalDetune(int gd) {
 
 void DeicsOnzeGui::setAlgorithm(const QString& a) {
     _deicsOnze->_preset->algorithm=
-	((operator==(a,"Algorithm 1")?FIRST:
-	  (operator==(a,"Algorithm 2")?SECOND:
-	   (operator==(a,"Algorithm 3")?THIRD:
-	    (operator==(a, "Algorithm 4")?FOURTH:
-	     (operator==(a, "Algorithm 5")?FIFTH:
-	      (operator==(a, "Algorithm 6")?SIXTH:
-	       (operator==(a, "Algorithm 7")?SEVENTH:EIGHTH))))))));
+	//((operator==(a,"Algorithm 1")?FIRST:
+	//  (operator==(a,"Algorithm 2")?SECOND:
+	//   (operator==(a,"Algorithm 3")?THIRD:
+	//    (operator==(a, "Algorithm 4")?FOURTH:
+	//     (operator==(a, "Algorithm 5")?FIFTH:
+	//      (operator==(a, "Algorithm 6")?SIXTH:
+	//       (operator==(a, "Algorithm 7")?SEVENTH:EIGHTH))))))));
+        ((operator==(a,QString("Algorithm 1"))?FIRST:                              // p4.0.2
+          (operator==(a,QString("Algorithm 2"))?SECOND:
+           (operator==(a,QString("Algorithm 3"))?THIRD:
+            (operator==(a, QString("Algorithm 4"))?FOURTH:
+             (operator==(a, QString("Algorithm 5"))?FIFTH:
+              (operator==(a, QString("Algorithm 6"))?SIXTH:
+               (operator==(a, QString("Algorithm 7"))?SEVENTH:EIGHTH))))))));
 }
 
 void DeicsOnzeGui::setPitchBendRange(int pbr) {
@@ -528,43 +538,71 @@ void DeicsOnzeGui::setDET4(int val){_deicsOnze->_preset->detune[3]=val;}
 //--------------------------------------------------------------
 void DeicsOnzeGui::setWaveForm1(const QString& a) {
     _deicsOnze->_preset->oscWave[0]=
-	((operator==(a,"Wave1")?W1:
-	  (operator==(a,"Wave2")?W2:
-	   (operator==(a,"Wave3")?W3:
-	    (operator==(a, "Wave4")?W4:
-	     (operator==(a, "Wave5")?W5:
-	      (operator==(a, "Wave6")?W6:
-	       (operator==(a, "Wave7")?W7:W8))))))));
+	//((operator==(a,"Wave1")?W1:
+	//  (operator==(a,"Wave2")?W2:
+	//   (operator==(a,"Wave3")?W3:
+	//    (operator==(a, "Wave4")?W4:
+	//     (operator==(a, "Wave5")?W5:
+	//      (operator==(a, "Wave6")?W6:
+	//       (operator==(a, "Wave7")?W7:W8))))))));
+        ((operator==(a,QString("Wave1"))?W1:             // p4.0.2  
+          (operator==(a,QString("Wave2"))?W2:
+           (operator==(a,QString("Wave3"))?W3:
+            (operator==(a, QString("Wave4"))?W4:
+             (operator==(a, QString("Wave5"))?W5:
+              (operator==(a, QString("Wave6"))?W6:
+               (operator==(a, QString("Wave7"))?W7:W8))))))));
 }
 void DeicsOnzeGui::setWaveForm2(const QString& a) {
     _deicsOnze->_preset->oscWave[1]=
-	((operator==(a,"Wave1")?W1:
-	  (operator==(a,"Wave2")?W2:
-	   (operator==(a,"Wave3")?W3:
-	    (operator==(a, "Wave4")?W4:
-	     (operator==(a, "Wave5")?W5:
-	      (operator==(a, "Wave6")?W6:
-	       (operator==(a, "Wave7")?W7:W8))))))));
+	//((operator==(a,"Wave1")?W1:
+	//  (operator==(a,"Wave2")?W2:
+	//   (operator==(a,"Wave3")?W3:
+	//    (operator==(a, "Wave4")?W4:
+	//     (operator==(a, "Wave5")?W5:
+	//      (operator==(a, "Wave6")?W6:
+	//       (operator==(a, "Wave7")?W7:W8))))))));
+        ((operator==(a,QString("Wave1"))?W1:                     // p4.0.2
+          (operator==(a,QString("Wave2"))?W2:
+           (operator==(a,QString("Wave3"))?W3:
+            (operator==(a, QString("Wave4"))?W4:
+             (operator==(a, QString("Wave5"))?W5:
+              (operator==(a, QString("Wave6"))?W6:
+               (operator==(a, QString("Wave7"))?W7:W8))))))));
 }
 void DeicsOnzeGui::setWaveForm3(const QString& a) {
     _deicsOnze->_preset->oscWave[2]=
-	((operator==(a,"Wave1")?W1:
-	  (operator==(a,"Wave2")?W2:
-	   (operator==(a,"Wave3")?W3:
-	    (operator==(a, "Wave4")?W4:
-	     (operator==(a, "Wave5")?W5:
-	      (operator==(a, "Wave6")?W6:
-	       (operator==(a, "Wave7")?W7:W8))))))));
+	//((operator==(a,"Wave1")?W1:
+	//  (operator==(a,"Wave2")?W2:
+	//   (operator==(a,"Wave3")?W3:
+	//    (operator==(a, "Wave4")?W4:
+	//     (operator==(a, "Wave5")?W5:
+	//      (operator==(a, "Wave6")?W6:
+	//       (operator==(a, "Wave7")?W7:W8))))))));
+        ((operator==(a,QString("Wave1"))?W1:                         // p4.0.2
+          (operator==(a,QString("Wave2"))?W2:
+           (operator==(a,QString("Wave3"))?W3:
+            (operator==(a, QString("Wave4"))?W4:
+             (operator==(a, QString("Wave5"))?W5:
+              (operator==(a, QString("Wave6"))?W6:
+               (operator==(a, QString("Wave7"))?W7:W8))))))));
 }
 void DeicsOnzeGui::setWaveForm4(const QString& a) {
     _deicsOnze->_preset->oscWave[3]=
-	((operator==(a,"Wave1")?W1:
-	  (operator==(a,"Wave2")?W2:
-	   (operator==(a,"Wave3")?W3:
-	    (operator==(a, "Wave4")?W4:
-	     (operator==(a, "Wave5")?W5:
-	      (operator==(a, "Wave6")?W6:
-	       (operator==(a, "Wave7")?W7:W8))))))));
+	//((operator==(a,"Wave1")?W1:
+	//  (operator==(a,"Wave2")?W2:
+	//   (operator==(a,"Wave3")?W3:
+	//    (operator==(a, "Wave4")?W4:
+	//     (operator==(a, "Wave5")?W5:
+	//      (operator==(a, "Wave6")?W6:
+	//       (operator==(a, "Wave7")?W7:W8))))))));
+        ((operator==(a,QString("Wave1"))?W1:                        // p4.0.2
+          (operator==(a,QString("Wave2"))?W2:
+           (operator==(a,QString("Wave3"))?W3:
+            (operator==(a, QString("Wave4"))?W4:
+             (operator==(a, QString("Wave5"))?W5:
+              (operator==(a, QString("Wave6"))?W6:
+               (operator==(a, QString("Wave7"))?W7:W8))))))));
 }
 
 //--------------------------------------------------------------