See ChangeLog

62 files changed, 3116 insertions, 83 deletions

diff --git a/muse2/CMakeLists.txt b/muse2/CMakeLists.txt
new file mode 100644
index 00000000..63555ab8
--- /dev/null
+++ b/muse2/CMakeLists.txt
@@ -0,0 +1,425 @@
+#=============================================================================
+#  MusE
+#  Linux Music Editor
+#  $Id:$
+#
+#  Copyright (C) 2002-2008 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.
+#=============================================================================
+
+project(muse)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.4.1)
+if (COMMAND cmake_policy)
+      cmake_policy(SET CMP0003 NEW)
+endif(COMMAND cmake_policy)
+
+# set libdir if not use -DCMAKE_INSTALL_LIBDIR
+if (NOT CMAKE_INSTALL_LIBDIR)
+	SET(CMAKE_INSTALL_LIBDIR "lib")
+endif (NOT CMAKE_INSTALL_LIBDIR)
+
+#set(CMAKE_BUILD_TYPE debug)
+#set(CMAKE_BUILD_TYPE release)
+
+# for debugging the make system uncomment next line:
+# set(CMAKE_VERBOSE_MAKEFILE ON)
+
+set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
+set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
+set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
+
+# The MusE version number.
+SET(MusE_VERSION_MAJOR 2)
+SET(MusE_VERSION_MINOR 0)
+SET(MusE_VERSION_PATCH 1)
+SET(MusE_VERSION       "2.0.1")
+SET(MusE_VERSION_FULL  "2.0.1")
+SET(MusE_INSTALL_NAME  "muse-2.0")
+
+include ( ${PROJECT_SOURCE_DIR}/cmake/UsePkgConfig1.cmake )
+include ( ${PROJECT_SOURCE_DIR}/cmake/TargetDoc.cmake)
+# include ( ${PROJECT_SOURCE_DIR}/cmake/WrapMacros.cmake)
+
+option ( ENABLE_LASH        "enable LASH Audio Session Handler"                              ON)
+option ( ENABLE_OSC         "enable Open Sound Control (DSSI also recommended)"              ON)   
+option ( ENABLE_DSSI        "enable Disposable Soft Synth Interface (OSC also recommended)"  ON)
+option ( ENABLE_VST         "enable VST/win support"                                         OFF)
+option ( ENABLE_FLUID       "enable fluidsynth softsynth plugins"                            ON)
+
+##
+## Just print a notice if this is OS X
+##
+if (APPLE)
+	message("OS X found.")
+else (APPLE)
+	if (UNIX)
+		message("Unix (probably linux) found")
+	endif(UNIX)
+
+endif (APPLE)
+
+##
+##  look for Qt3
+##
+
+# set(QT_MT_REQUIRED TRUE)
+# 
+#  find_package(Qt3)
+# # IF(EXISTS "${CMAKE_ROOT}/Modules/FindQt3.cmake")
+# #      include ( "${CMAKE_ROOT}/Modules/FindQt3.cmake" )
+# # else (EXISTS "${CMAKE_ROOT}/Modules/FindQt3.cmake")
+# #       message(FATAL_ERROR "Fatal error: cmake module FindQt3 required.\n")
+# #endif (EXISTS "${CMAKE_ROOT}/Modules/FindQt3.cmake")
+# 
+# if (NOT QT_FOUND)
+#       message(FATAL_ERROR "Fatal error: QT (version >= 3.2.0) required.\n"
+#       # "Cmake tries to detect QT4 by searching for 'qmake' in your PATH\n"
+#       # "If you have QT4 installed, make sure qmake is found in your PATH."
+#       )
+# endif (NOT QT_FOUND)
+# 
+# set (MUSE_QT_WRAP_CPP QT_WRAP_CPP)
+# set (MUSE_QT_WRAP_UI QT_WRAP_UI)
+
+# include(${QT_USE_FILE})
+
+##
+##  look for Qt4
+##
+
+set(QT_MIN_VERSION "4.3.0")
+set(QT_USE_QTXML TRUE)
+set(QT_USE_QTDESIGNER TRUE)
+set(QT_USE_QTNSPLUGIN TRUE)
+set(QT_USE_QTSVG TRUE)
+
+## QT3 Compatibility support required, for now. 
+set(QT_USE_QT3SUPPORT TRUE)
+
+find_package(Qt4)
+
+if (NOT QT4_FOUND)
+      message(FATAL_ERROR "Fatal error: QT (version >= 4.3.0) required.\n"
+      "Cmake tries to detect QT4 by searching for 'qmake' in your PATH\n"
+      "If you have QT4 installed, make sure qmake is found in your PATH."
+      )
+endif (NOT QT4_FOUND)
+
+include(${QT_USE_FILE})
+
+# set (MUSE_QT_WRAP_CPP QT4_WRAP_CPP)
+# set (MUSE_QT_WRAP_UI QT4_WRAP_UI)
+include ( ${PROJECT_SOURCE_DIR}/cmake/QtWrapMacros.cmake)
+
+
+##
+## find doxygen
+##    TODO
+
+##
+## alsa >= 0.9.0
+##
+
+if (APPLE)
+	message("Disabling ALSA support due to OS X build.")
+else (APPLE)
+PKGCONFIG (alsa 0.9.0 ALSA_INCDIR ALSA_LIBDIR ALSA_LIB ALSA_CPP )
+if (NOT ALSA_INCDIR)
+      message(FATAL_ERROR "Fatal error: ALSA >= 1.0.0 required")
+else (NOT ALSA_INCDIR)
+	message("Alsa found.")
+endif (NOT ALSA_INCDIR)
+endif (APPLE)
+
+##
+## find sndfile >= 1.0.0
+##
+
+PKGCONFIG (sndfile 1.0.0 SNDFILE_INCDIR SNDFILE_LIBDIR SNDFILE_LIB SNDFILE_CPP )
+if (NOT SNDFILE_INCDIR)
+      message(FATAL_ERROR "Fatal error: libsndfile >= 1.0.0 required")
+else (NOT SNDFILE_INCDIR)
+	message("sndfile found.")
+endif (NOT SNDFILE_INCDIR)
+
+##
+## find libsamplerate >= 0.1.0
+##
+
+PKGCONFIG (samplerate 0.1.0 SAMPLERATE_INCDIR SAMPLERATE_LIBDIR SAMPLERATE_LIB SAMPLERATE_CPP )
+if (NOT SAMPLERATE_INCDIR)
+      message(FATAL_ERROR "Fatal error: libsamplerate >= 0.1.0 required")
+else (NOT SAMPLERATE_INCDIR)
+	message("samplerate found")
+endif (NOT SAMPLERATE_INCDIR)
+
+##
+## find libuuid 
+##
+
+PKGCONFIG (uuid 0.0.1 UUID_INCDIR UUID_LIBDIR UUID_LIB UUID_CPP )
+if (NOT UUID_INCDIR)
+      message(FATAL_ERROR "Fatal error: libuuid >= 0.0.1 required")
+else (NOT UUID_INCDIR)
+        message("uuid lib found")
+endif (NOT UUID_INCDIR)
+
+# AC_CHECK_HEADER(uuid/uuid.h, UUID_FOUND="yes", UUID_FOUND="no")
+# if test x$UUID_FOUND = xno; then
+#   AC_MSG_ERROR([Header file uuid.h, from the uuid-dev (sometimes in e2fsprogs) package, is required])
+# fi
+# 
+# AC_CHECK_LIB(uuid, uuid_generate, UUID_FOUND="yes", UUID_FOUND="no")
+# if test x$UUID_FOUND = xno; then
+#   AC_MSG_ERROR([libuuid (sometimes in e2fsprogs package) is required])
+# fi
+# UUID_LIBS="-luuid"
+# AC_SUBST(UUID_CFLAGS)
+# AC_SUBST(UUID_LIBS)
+# 
+# ## PKG_CHECK_MODULES(UUID, uuid >= 1.0,
+# ##   true,
+# ##   AC_MSG_ERROR([need libuuid >= 1.0 from e2fsprogs package])
+# ## )
+
+##
+## find jack >= 0.103.0
+##
+
+PKGCONFIG (jack 0.107.0 JACK_INCDIR JACK_LIBDIR JACK_LIB JACK_CPP )
+if (NOT JACK_INCDIR)
+      PKGCONFIG (jack 0.103.0 JACK_INCDIR JACK_LIBDIR JACK_LIB JACK_CPP )
+      if (NOT JACK_INCDIR)
+            message(FATAL_ERROR "Fatal error: JACK >= 0.103 required")
+      else (NOT JACK_INCDIR)
+	      message("JACK 0.103 found")
+            set(JACK103 ON)
+      endif (NOT JACK_INCDIR)
+else (NOT JACK_INCDIR)
+	message("JACK 0.107 found")
+      set(JACK107 ON)
+endif (NOT JACK_INCDIR)
+
+##
+## find LASH 
+##
+
+if (ENABLE_LASH)
+      PKGCONFIG (lash 0.2 LASH_INCDIR LASH_LIBDIR LASH_LIB LASH_CPP )
+      if (NOT LASH_INCDIR)
+            message("Error: lash >= 0.2 not found, disabling feature")
+      else (NOT LASH_INCDIR)
+            message("lash >= 0.2 found.")
+            set (HAVE_LASH TRUE)
+            message("LASH enabled")
+      endif (NOT LASH_INCDIR)
+else (ENABLE_LASH)
+      message("LASH disabled")
+endif (ENABLE_LASH)
+
+# muse_enable_lash="no"
+# AC_ARG_ENABLE(lash,
+#   [  --enable-lash           enable LASH support],[
+#   case "$enableval" in
+#     "yes")
+#       muse_enable_lash="yes"
+#       ;;
+#     "no")
+#       muse_enable_lash="no"
+#       ;;
+#     *)
+#       AC_MSG_ERROR([must use --enable-lash(=yes/no) or --disable-lash])
+#       ;;
+#   esac
+# ])
+# 
+# if test "$muse_enable_lash" = "yes"; then
+#   PKG_CHECK_MODULES(LASH, lash-1.0 >= 0.2, LASH_FOUND="yes", LASH_FOUND="no")
+#   AC_SUBST(LASH_CFLAGS)
+#   AC_SUBST(LASH_LIBS)
+# 
+#   if test "$LASH_FOUND" = "yes"; then
+#     AC_DEFINE(HAVE_LASH, 1, [whether or not we are supporting lash])
+#     LASH_VERSION=$( pkg-config --modversion lash-1.0 )
+#     AC_DEFINE_UNQUOTED(LASH_VERSION, "$LASH_VERSION", [The version of lash we're compiling against])
+#   fi
+# else
+#   AC_MSG_WARN([LASH support is disabled])
+#   LASH_FOUND="no"
+# fi
+# AM_CONDITIONAL(HAVE_LASH, test "$LASH_FOUND" = "yes")
+
+
+##
+## check for liblo >= 0.23
+##
+
+if (ENABLE_OSC)
+      PKGCONFIG (liblo 0.23 LIBLO_INCDIR LIBLO_LIBDIR LIBLO_LIB LIBLO_CPP )
+      if (NOT LIBLO_INCDIR)
+            message("Error: liblo >= 0.23 not found, disabling feature")
+            set ( ENABLE_OSC OFF )
+      else (NOT LIBLO_INCDIR)
+            message("liblo >= 0.23 found.")
+            set (OSC_SUPPORT TRUE)
+            message("OSC enabled")
+      endif (NOT LIBLO_INCDIR)
+else (ENABLE_OSC)
+      message("OSC disabled")
+endif (ENABLE_OSC)
+
+##
+## check for dssi >= 0.9.0
+##
+
+if (ENABLE_DSSI)
+      PKGCONFIG (dssi 0.9.0 DSSI_INCDIR DSSI_LIBDIR DSSI_LIB DSSI_CPP )
+      if (NOT DSSI_INCDIR)
+            message("Error: dssi >= 0.9.0 not found, disabling feature")
+            set ( ENABLE_DSSI OFF )
+      else (NOT DSSI_INCDIR)
+            message("dssi >= 0.9.0 found.")
+            set (DSSI_SUPPORT TRUE)
+            message("DSSI enabled")
+      endif (NOT DSSI_INCDIR)
+else (ENABLE_DSSI)
+      message("DSSI disabled")
+endif (ENABLE_DSSI)
+
+if (ENABLE_VST)
+      message("VST support enabled")
+      set (VST_SUPPORT TRUE)
+else (ENABLE_VST)
+      message("VST support disabled")
+      set (VST_SUPPORT FALSE)
+endif (ENABLE_VST)
+
+##
+## TODO
+##
+## Optimizations
+##
+
+SET (USE_SSE false)
+
+##
+## check for fluidsynth
+##
+
+if ( ENABLE_FLUID )
+      PKGCONFIG (fluidsynth 1.0.0 FLUID_INCDIR FLUID_LIBDIR FLUID_LIB FLUID_CPP )
+      if (NOT FLUID_INCDIR)
+            message("Error: fluidsynth >= 0.9.0 not found, disabling feature")
+            set ( ENABLE_FLUID OFF )
+      else (NOT FLUID_INCDIR)
+	    message("Fluidsynth found")
+      endif (NOT FLUID_INCDIR)
+endif ( ENABLE_FLUID )
+
+#
+# produce config.h file
+#
+configure_file (
+      ${PROJECT_SOURCE_DIR}/config.h.in
+      ${PROJECT_BINARY_DIR}/config.h
+      )
+
+add_custom_command(
+      OUTPUT ${PROJECT_BINARY_DIR}/all.h
+      COMMAND cp ${PROJECT_SOURCE_DIR}/all.h ${PROJECT_BINARY_DIR}/all.h
+      DEPENDS ${PROJECT_SOURCE_DIR}/all.h
+      WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+      )
+
+add_custom_command(
+      OUTPUT ${PROJECT_BINARY_DIR}/all-pic.h
+      COMMAND cp ${PROJECT_SOURCE_DIR}/all.h ${PROJECT_BINARY_DIR}/all-pic.h
+      DEPENDS ${PROJECT_SOURCE_DIR}/all.h
+      WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+      )
+
+add_custom_command(
+      OUTPUT ${PROJECT_BINARY_DIR}/all-pic-debug.h
+      COMMAND cp ${PROJECT_SOURCE_DIR}/all.h ${PROJECT_BINARY_DIR}/all-pic-debug.h
+      DEPENDS ${PROJECT_SOURCE_DIR}/all.h
+      WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+      )
+
+# uninstall custom target
+# CONFIGURE_FILE(
+#     "${CMAKE_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
+#     "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+#     IMMEDIATE @ONLY)
+# 
+# ADD_CUSTOM_TARGET(uninstall
+#     "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+
+include_directories(
+   .
+   ${PROJECT_SOURCE_DIR}
+   ${PROJECT_SOURCE_DIR}/muse
+   ${PROJECT_SOURCE_DIR}/muse/widgets
+   ${PROJECT_BINARY_DIR}
+   ${PROJECT_BINARY_DIR}/muse
+   ${PROJECT_BINARY_DIR}/muse/widgets
+   ${PROJECT_BINARY_DIR}/muse/instruments
+   ${PROJECT_BINARY_DIR}/muse/ctrl
+
+   ${ALSA_INCDIR}
+   ${JACK_INCDIR}
+   ${SNDFILE_INCDIR}
+   ${SAMPLERATE_INCDIR}
+   ${LIBLO_INCDIR}
+   ${DSSI_INCDIR}
+   )
+
+# include (pch.txt)
+
+#
+# If the cmake version includes cpack, use it
+#
+IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
+
+  IF(EXISTS "${CMAKE_ROOT}/Modules/InstallRequiredSystemLibraries.cmake")
+      SET(CMAKE_INSTALL_MFC_LIBRARIES 1)
+      INCLUDE(InstallRequiredSystemLibraries)
+  ENDIF(EXISTS "${CMAKE_ROOT}/Modules/InstallRequiredSystemLibraries.cmake")
+
+  SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MusE is a virtual audio studio environment")
+  SET(CPACK_PACKAGE_VENDOR "Werner Schweer and others")
+  SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
+  SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
+  SET(CPACK_PACKAGE_VERSION_MAJOR "${MusE_VERSION_MAJOR}")
+  SET(CPACK_PACKAGE_VERSION_MINOR "${MusE_VERSION_MINOR}")
+  SET(CPACK_PACKAGE_VERSION_PATCH "${MusE_VERSION_PATCH}")
+  SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}")
+  SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${MusE_INSTALL_NAME}")
+
+  SET(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
+
+  SET(CPACK_PACKAGE_FILE_NAME "${CPACK_SOURCE_PACKAGE_FILE_NAME}-${CPACK_SYSTEM_NAME}")
+  SET(CPACK_STRIP_FILES "bin/muse;bin/grepmidi")
+  SET(CPACK_PACKAGE_EXECUTABLES "muse" "MusE" "grepmidi" "grepmidi")
+  INCLUDE(CPack)
+ENDIF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
+
+set(CMAKE_CXX_FLAGS         "-Wl,-rpath,${QT_LIBRARY_DIR} -Wall -Wextra -Winvalid-pch -fno-exceptions")
+set(CMAKE_CXX_FLAGS_RELEASE "-O2 -fomit-frame-pointer -ffast-math -fstrength-reduce")
+set(CMAKE_CXX_FLAGS_DEBUG   "-g -DQT_DEBUG")
+
+# subdirs(al awl grepmidi plugins midiplugins muse share synti)
+# subdirs(al lib grepmidi plugins xpm muse share demos doc synti utils)
+subdirs(al lib grepmidi plugins muse share demos synti )
+#  TODO        packaging utils)
+
diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index d31e0086..a0e1632a 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -1,3 +1,10 @@
+19.10.2010
+      * Changed: Build system changed to cmake. (T356)
+        - Some other suitable changes. p4.0.2
+        - WIP Need to fix a few placed in code with regards to installation search paths (MESS synths not found etc.)
+        - Choose suitable version number. Currently left at 2.0.1 
+        - Maybe a few other things. Change name of prog so as not to conflict with existing muse installation? etc. etc.
+        - Default install location is /usr/local. Be careful not to overwrite an existing working muse-1 !
 16.10.2010
       * Fixed: Routing and popup menus should work now. Sorry, no 'stay-open' menus for now. (T356)
         - p4.0.1 Reverted back to regular non-overloaded Q3PopupMenu behaviour (self-extinguishing) for PopupMenu class.
diff --git a/muse2/README b/muse2/README
index 65963b43..b0e19086 100644
--- a/muse2/README
+++ b/muse2/README
@@ -1,5 +1,5 @@
 ====================================================================
-      MusE  ---  Linux (Midi) Music Editor
+      MusE  ---  Linux Music Editor
 ====================================================================
 
 Welcome to MusE, the open source MIDI/Audio sequencer.
@@ -19,64 +19,111 @@ details.
   =============================
       Requirements
   =============================
+      
 
-      - QT: Qt 3.2.0 or above
+      - CMake >= 2.4 
+        http:/www.cmake.org/HTML/Download.html
+
+      - QT: Qt >= 4.2.0 
         ftp://ftp.trolltech.com/qt/source
         MusE does _not_ compile with older versions
-        Please compile Qt3 with "-thread" option so you get
-        the qt-mt.so lib instead of qt.so
-        MAKE SURE YOU SET YOUR 'QTDIR' ENVIRONMENT VARIABLE
-
-      - ALSA 0.9.x or newer (cvs)
-        http://www.alsa-project.org/
 
-      - gcc 3.x.x
-        NOTE: you _must_ compile MusE with the same compiler
-                you used to compile QT
+      - gcc >= 4.x.x
 
-      - libsndfile 1.0.1 (current 1.0.4)
+      - libsndfile >= 1.0.1
         http://www.zip.com.au/~erikd/libsndfile/
 
-      - Linux kernel with rtc (RealTimeClock) driver (device /dev/rtc)
-        (you may also apply "low latency patches" for low timing jitter)
+      - libsamplerate
+
+      - JACK >= 0.103
+          http://jackit.sourceforge.net/download/
 
-      - JACK
-	  http://jackit.sourceforge.net/download/
+      Optional:
 
-      - fluidsynth-1.0.3 (formerly known as iiwusynth) from
+      - fluidsynth >= 1.0.3 (formerly known as iiwusynth) from
         http://savannah.nongnu.org/download/fluid
 
-      - of course: a soundcard and/or some midi gear
-      - (if you compile from cvs:) automake 1.7 and autoconf 2.54
+      - OSC (Open Sound Control) 
+      - DSSI (Disposable Soft Synth Interface) with support for DSSI vst plugins.
+        (Both recommended - DSSI alone will have no DSSI GUIs. OSC alone does nothing, for now.)
+
+      - LASH Audio Session Handler
+      
+      - ConTeXt (for building documentation, by default the build
+               script tries to build documentation, can be
+               disabled by setting ENABLE_DOCUMENTATION to OFF)
 
   =============================
       Compiling:
   =============================
 
       - download source from http://lmuse.sourceforge.net/
-      - uncompress source:
-            bunzip2 muse-x.x.x.tar.bz2
-      - untar source:
-            tar xvof muse-x.x.x.tar </code>
-        or if you have a recent tar, you can combine both steps:
-            tar xvofj muse-x.x.x.tar.bz2
-
-      - enter dirctory muse-x.x.x:
-            MAKE SURE YOU SET YOUR 'QTDIR' ENVIRONMENT VARIABLE
-            run configure
-            run make all
-
-      - as root run:
-            make install
-        to install MusE
+
+      - command line to unpack source:
+            tar xvofz muse-x.y.z.tar.gz </code>
+        where x.y.z is the version number.
+
+      - to compile MusE, run the following commands from the 
+        top level directory, where the source code was unpacked : 
+        
+            mkdir build                                      # create build directory
+            cd build                                         # enter build directory
+            
+            cmake  [-DCMAKE_INSTALL_PREFIX=<prefix> ] ../    # create make system in build directory
+                                                             # prefix is desired location to install MusE, default /usr/local
+            
+            make                                             # compile muse
+            
+      - install MusE:
+            run "make install"  (as root user)
+
+  =============================
+      running MusE
+  =============================
+
+      MusE is a realtime program which requires special rights to
+      work poperly.
+      Recommended setup:
+
+      - check if you are running a sufficiently new linux kernel > 2.6.x
+
+      - create an "audio" group if it does not already exists
+        and put yourself into this group
+
+      - make sure you can acces the realtime clock (RTC)
+            chmod 660 /dev/rtc
+            chgrp audio /dev/rtc
+
+      - make sure MusE can set the rtc clock:
+            echo 8192 > /proc/sys/dev/rtc/max-user-freq
+            inspect with:
+            cat /proc/sys/dev/rtc/max-user-freq
+
+      - for MusE to gain RT priviledges load the "realtime-lsm"
+        modul; the modul should be configured to give all "audio"
+        group members realtime priviledges
+
+      - some distros do not load the alsa sequencer module by default.
+        if necessary, load the alsa sequencer module with:
+            /sbin/modprobe snd-seq
+
+      - start qjackctl
+            - start JACK with qjackctl
+
+      - start MusE
+
+      (JACK and all its clients (qjackctl & MusE) must run with the
+      same user id)
+
 
   =============================
-      some known bugs
+      known bugs
   =============================
 
       - many
 
 ====================================================================
-Let me know whether MusE works for you !!!
-Have a look at the webpage http://www.muse-sequencer.org/ for details.
+Let us know whether MusE works for you !!!
+Have a look at the webpage http://www.muse-sequencer.org for details.
+
 
diff --git a/muse2/al/CMakeLists.txt b/muse2/al/CMakeLists.txt
new file mode 100644
index 00000000..6075a399
--- /dev/null
+++ b/muse2/al/CMakeLists.txt
@@ -0,0 +1,30 @@
+#
+#
+#
+#
+
+include(${PROJECT_SOURCE_DIR}/pch.txt)
+
+set (al_src
+   al.cpp dsp.cpp
+   )
+
+if (USE_SSE)
+      set(al_src ${al_src} dspSSE.cpp dspXMM.cpp)
+endif (USE_SSE)
+
+add_library(al STATIC
+   ${al_src}
+   ${PROJECT_BINARY_DIR}/all.h.pch
+   )
+
+set_source_files_properties(
+   al.cpp dsp.cpp
+   dspXMM.cpp
+   PROPERTIES COMPILE_FLAGS "-fPIC -include ${PROJECT_BINARY_DIR}/all.h"
+   )
+
+set_source_files_properties( dspSSE.cpp
+   PROPERTIES COMPILE_FLAGS "-x assembler"
+   )
+
diff --git a/muse2/all.h b/muse2/all.h
index e69de29b..147aa6b4 100644
--- a/muse2/all.h
+++ b/muse2/all.h
@@ -0,0 +1,179 @@
+//#ifndef __ALLQT_H__
+//#define __ALLQT_H__
+
+
+/*
+#include <stdio.h>
+#include <values.h>
+#include <stdarg.h>
+#include <list>
+#include <vector>
+#include <map>
+*/
+
+/*
+#include <qaction.h>
+#include <qapplication.h>
+#include <qbitmap.h>
+#include <qbuttongroup.h>
+#include <qcheckbox.h>
+#include <qcolor.h>
+#include <qcolordialog.h>
+#include <qcombobox.h>
+#include <qcursor.h>
+#include <qdatetime.h>
+#include <qdom.h>
+#include <qevent.h>
+#include <qfile.h>
+#include <qfiledialog.h>
+#include <qfileinfo.h>
+#include <qfont.h>
+#include <qfontdatabase.h>
+#include <qfontinfo.h>
+#include <qfontmetrics.h>
+#include <qiconset.h>
+#include <qiconset.h>
+#include <qlabel.h>
+#include <qlineedit.h>
+#include <qlistbox.h>
+#include <qlistview.h>
+#include <qmainwindow.h>
+#include <qmenubar.h>
+#include <qmessagebox.h>
+#include <qnamespace.h>
+#include <qobject.h>
+#include <qobjectlist.h>
+#include <qpainter.h>
+#include <qpen.h>
+#include <qpixmap.h>
+#include <qpoint.h>
+#include <qpointarray.h>
+#include <qpopupmenu.h>
+#include <qprinter.h>
+#include <qpushbutton.h>
+#include <qradiobutton.h>
+#include <qrect.h>
+#include <qscrollview.h>
+#include <qsize.h>
+#include <qspinbox.h>
+#include <qstring.h>
+#include <qstringlist.h>
+#include <qtextcodec.h>
+#include <qtextedit.h>
+#include <qtimer.h>
+#include <qtoolbutton.h>
+#include <qtooltip.h>
+#include <qtranslator.h>
+#include <qvalidator.h>
+#include <qwidget.h>
+#endif
+
+*/
+
+
+
+/*
+#include <stdio.h>
+#ifndef __APPLE__
+#include <values.h>
+#endif
+#include <errno.h>
+#include <stdarg.h>
+#include <unistd.h>
+#include <assert.h>
+#include <poll.h>
+#include <cmath>
+#include <list>
+#include <vector>
+#include <map>
+*/
+
+/*
+#include <QtCore/qplugin.h>
+#include <QtCore/QUrl>
+#include <QtCore/QFile>
+#include <QtCore/QTextStream>
+#include <QtCore/QBuffer>
+#include <QtCore/QLocale>
+#include <QtCore/QTimer>
+#include <QtCore/QSocketNotifier>
+#include <QtCore/QSignalMapper>
+#include <QtCore/QTime>
+#include <QtCore/QMetaProperty>
+#include <QtCore/QEvent>
+#include <QtCore/QTranslator>
+#include <QtCore/qatomic.h>
+#include <QtCore/QTemporaryFile>
+#include <QtCore/QQueue>
+#include <QtCore/QSettings>
+
+#include <QtDesigner/QDesignerCustomWidgetInterface>
+#include <QtDesigner/QDesignerFormEditorInterface>
+#include <QtDesigner/QFormBuilder>
+
+#include <QtXml/QDomNode>
+
+#include <QtGui/QScrollBar>
+#include <QtGui/QToolBar>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QPushButton>
+#include <QtGui/QToolButton>
+#include <QtGui/QRadioButton>
+#include <QtGui/QScrollArea>
+#include <QtGui/QListWidgetItem>
+#include <QtGui/QTreeWidgetItem>
+#include <QtGui/QPainterPath>
+#include <QtGui/QStackedWidget>
+#include <QtGui/QShortcut>
+#include <QtGui/QTableView>
+#include <QtGui/QTextEdit>
+#include <QtGui/QFileDialog>
+#include <QtGui/QInputDialog>
+#include <QtGui/QGroupBox>
+#include <QtGui/QProgressDialog>
+#include <QtGui/QHeaderView>
+#include <QtGui/QStyle>
+#include <QtGui/QWindowsStyle>
+#include <QtCore/QProcess>
+#include <QtGui/QWhatsThis>
+#include <QtGui/QDial>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QPen>
+#include <QtGui/QPainter>
+#include <QtGui/QLineEdit>
+#include <QtGui/QCheckBox>
+#include <QtGui/QComboBox>
+#include <QtGui/QApplication>
+#include <QtGui/QSpinBox>
+#include <QtGui/QLabel>
+#include <QtGui/QPixmap>
+#include <QtGui/QPrinter>
+#include <QtGui/QGridLayout>
+#include <QtGui/QMainWindow>
+#include <QtGui/QAction>
+#include <QtGui/QColor>
+#include <QtGui/QColorDialog>
+#include <QtGui/QCursor>
+#include <QtGui/QFont>
+#include <QtGui/QFontInfo>
+#include <QtGui/QFontMetrics>
+#include <QtGui/QIcon>
+#include <QtGui/QMessageBox>
+#include <QtGui/QMenu>
+#include <QtGui/QFontDialog>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QSplitter>
+#include <QtGui/QMenuBar>
+#include <QtGui/QSizeGrip>
+#include <QtGui/QClipboard>
+#include <QtGui/QCloseEvent>
+#include <QtGui/QSplashScreen>
+#include <QtGui/QStyleFactory>
+#include <QtGui/QDockWidget>
+#include <QtGui/QDesktopServices>
+#include <QtGui/QItemDelegate>
+#include <QtSvg/QSvgRenderer>
+*/
+
+//#endif
+
diff --git a/muse2/config.h.in b/muse2/config.h.in
new file mode 100644
index 00000000..74a504a1
--- /dev/null
+++ b/muse2/config.h.in
@@ -0,0 +1,31 @@
+//=============================================================================
+//  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.
+//=============================================================================
+
+#cmakedefine HAVE_LASH
+#cmakedefine OSC_SUPPORT
+#cmakedefine DSSI_SUPPORT
+#cmakedefine VST_SUPPORT
+#cmakedefine USE_SSE
+#cmakedefine JACK103
+#cmakedefine JACK107
+
+#define INSTALL_NAME     "${MusE_INSTALL_NAME}"
+#define INSTPREFIX       "${CMAKE_INSTALL_PREFIX}"
+#define VERSION          "${MusE_VERSION_FULL}"
diff --git a/muse2/grepmidi/CMakeLists.txt b/muse2/grepmidi/CMakeLists.txt
new file mode 100644
index 00000000..55084217
--- /dev/null
+++ b/muse2/grepmidi/CMakeLists.txt
@@ -0,0 +1,24 @@
+#=============================================================================
+#  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.
+#=============================================================================
+
+add_executable ( grepmidi grepmidi.cpp )
+
+install_targets ( /bin grepmidi )
+
diff --git a/muse2/muse/CMakeLists.txt b/muse2/muse/CMakeLists.txt
new file mode 100644
index 00000000..bb7947d7
--- /dev/null
+++ b/muse2/muse/CMakeLists.txt
@@ -0,0 +1,329 @@
+#=============================================================================
+#  MusE
+#  Linux Music Editor
+#  $Id:$
+#
+#  Copyright (C) 2002-2008 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)
+
+include_directories(
+      ${CMAKE_CURRENT_BINARY_DIR}
+      )
+
+set (SubDirs 
+     widgets master midiedit mixer arranger 
+     liste driver waveedit ctrl cliplist 
+     instruments marker mplugins      
+    )
+
+if (ENABLE_PYTHON)
+set ( PYREM_CPP_FLAGS "-DENABLE_PYTHON" )
+set ( PYLIBS ${PYTHON_LIB} remote) 
+set ( SubDirs ${SubDirs} remote )
+endif (ENABLE_PYTHON)
+
+subdirs (${SubDirs})
+
+#QT4_WRAP_UI  (muse_ui_headers
+# QT4_WRAP_UI3  (muse_ui_headers
+#       preferences.ui
+#       exportmididialog.ui
+#       configmidifile.ui
+#       transport.ui
+#       aboutbox.ui
+#       transpose.ui
+#       projectpropsdialog.ui
+#       projectdialog.ui
+#       templatedialog.ui
+#       importmidi.ui
+#       routedialog.ui
+#       configtrack.ui
+#       midiportinfo.ui
+#       miditrackinfo.ui
+#       )
+
+QT4_WRAP_CPP ( muse_moc_headers
+#       projectpropsdialog.h
+# 	projectdialog.h
+#       templatedialog.h
+#       preferences.h
+#       plugingui.h
+#       midiplugin.h
+#       muse.h
+#       song.h
+#       transport.h
+#       conf.h
+#       editor.h
+# 	cobject.h
+#       transpose.h
+#       track.h
+#       miditrackbase.h
+#       midisynti.h
+#       miditrack.h
+#       wavetrack.h
+#       audiotrack.h
+#       audiooutput.h
+#       audioinput.h
+#       audiogroup.h
+#       synth.h
+#       exportmidi.h
+#       importmidi.h
+#       midiinport.h
+#       midioutport.h
+#       astrip.h
+#       midirack.h
+#       mixer.h
+#       mstrip.h
+#       rack.h
+#       routedialog.h
+#       strip.h
+#       arranger.h
+#       canvas.h
+#       configtrack.h
+#       partdrag.h
+#       tllineedit.h
+#       tlswidget.h
+#       tlwidget.h
+#       trackdrag.h
+#       trackinfo.h
+      
+      plugin.h 
+      app.h 
+      song.h 
+      transport.h 
+      conf.h 
+      confmport.h 
+      midieditor.h 
+      cobject.h 
+      value.h 
+      transpose.h 
+      miditransform.h 
+      appearance.h
+      )
+
+QT4_ADD_RESOURCES (muse_qrc_files muse.qrc)
+
+add_executable ( muse
+      ${muse_qrc_files}
+      ${muse_moc_headers}
+      # ${muse_ui_headers}
+      ${PROJECT_BINARY_DIR}/all.h.pch
+
+#       ticksynth.cpp
+#       vst.cpp
+#       dssihost.cpp
+#       synth.cpp
+#       plugin.cpp
+#       ladspaplugin.cpp
+#       auxplugin.cpp
+#       pipeline.cpp
+# 	mtc.cpp
+#       thread.cpp
+#       audio.cpp
+# 	audioprefetch.cpp
+#       audiowriteback.cpp
+#       globals.cpp
+#       sync.cpp
+# 	part.cpp
+#       undo.cpp
+#       songfile.cpp
+#       midi.cpp
+#       importmidi.cpp
+#       importmidi.h
+#       midifile.cpp
+#       icons.cpp
+#       event.cpp
+#       eventlist.cpp
+#       midieventbase.cpp
+#       waveevent.cpp
+#       midievent.cpp
+# 	wave.cpp
+#       seqmsg.cpp
+# 	help.cpp
+# 	midictrl.cpp
+#       fifo.cpp
+#       helper.cpp
+#       route.cpp
+#       shortcuts.cpp
+#       ctrl.cpp
+#       gconfig.cpp
+#       midirc.cpp
+#       midififo.cpp
+#       midioutport.cpp
+#       midiinport.cpp
+#       midiout.cpp
+# 
+#       projectpropsdialog.cpp
+# 	projectdialog.cpp
+#       templatedialog.cpp
+#       preferences.cpp
+#       plugingui.cpp
+#       midiplugin.cpp
+#       muse.cpp
+#       song.cpp
+#       songpart.cpp
+#       songtrack.cpp
+#       transport.cpp
+#       conf.cpp
+#       editor.cpp
+# 	cobject.cpp
+#       transpose.cpp
+#       track.cpp
+#       miditrackbase.cpp
+#       midisynti.cpp
+#       miditrack.cpp
+#       wavetrack.cpp
+#       audiotrack.cpp
+#       audiooutput.cpp
+#       audioinput.cpp
+#       audiogroup.cpp
+#       exportmidi.cpp
+#       revision.cpp
+#       jack.cpp dummyaudio.cpp
+#       astrip.cpp
+#       midirack.cpp
+#       mixer.cpp
+#       mstrip.cpp
+#       rack.cpp
+#       routedialog.cpp
+#       strip.cpp
+# 
+#       arranger.cpp
+#       canvas.cpp
+#       configtrack.cpp
+#       partdrag.cpp
+#       tllineedit.cpp
+#       tlswidget.cpp
+#       tlwidget.cpp
+#       tlwlayout.cpp
+#       trackdrag.cpp
+#       trackinfo.cpp
+      
+      ticksynth.h ticksynth.cpp 
+      vst.h vst.cpp 
+      dssihost.h dssihost.cpp 
+      osc.cpp osc.h 
+      stringparam.cpp stringparam.h 
+      synth.h synth.cpp  
+      plugin.cpp plugin.h 
+      mtc.cpp mtc.h 
+      thread.cpp thread.h 
+      audio.cpp audio.h 
+      audioprefetch.cpp audioprefetch.h 
+      audioconvert.cpp audioconvert.h 
+      globals.cpp globals.h 
+      sync.cpp sync.h 
+      midiport.cpp midiport.h 
+      part.cpp part.h 
+      tempo.cpp tempo.h 
+      pos.cpp pos.h 
+      sig.cpp sig.h 
+      key.cpp key.h 
+      undo.cpp undo.h 
+      songfile.cpp 
+      midi.cpp midi.h 
+      importmidi.cpp 
+      exportmidi.cpp 
+      midifile.h midifile.cpp 
+      xml.cpp xml.h 
+      icons.cpp icons.h 
+      event.cpp event.h eventbase.h evdata.h 
+      eventlist.cpp 
+      midievent.h midievent.cpp 
+      waveevent.h waveevent.cpp 
+      mpevent.cpp mpevent.h 
+      track.cpp track.h 
+      audiotrack.cpp wavetrack.cpp 
+      wave.cpp wave.h 
+      seqmsg.cpp 
+      device.h 
+      globaldefs.h 
+      ladspa.h 
+      app.cpp app.h 
+      song.cpp song.h 
+      transport.cpp transport.h 
+      conf.cpp conf.h 
+      confmport.cpp confmport.h 
+      help.cpp 
+      midieditor.cpp midieditor.h 
+      cobject.cpp cobject.h 
+      value.cpp value.h 
+      midictrl.cpp midictrl.h 
+      transpose.cpp transpose.h 
+      miditransform.cpp miditransform.h 
+      appearance.cpp appearance.h 
+      node.cpp node.h 
+      midiseq.cpp midiseq.h 
+      helper.cpp helper.h 
+      debug.h memory.h memory.cpp 
+      mididev.h mididev.cpp 
+      route.h route.cpp
+      shortcuts.h shortcuts.cpp 
+      ctrl.cpp ctrl.h 
+      gconfig.h gconfig.cpp 
+      fastlog.h 
+      default_click.h
+      )
+
+# AM_CXXFLAGS +=-DSVNVERSION=\"$(shell svnversion)\"
+EXEC_PROGRAM( svnversion
+      ARGS ${PROJECT_SOURCE_DIR}
+      OUTPUT_VARIABLE SVNVER )
+
+# add_definitions ( -DINSTLIBDIR=${LIBRARY_OUTPUT_DIRECTORY} )
+include_directories (midiedit arranger liste widgets mixer driver waveedit mplugins instruments remote)
+
+set_target_properties( muse
+      # PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h"
+      # PROPERTIES COMPILE_FLAGS "-Imidiedit -Iarranger -Iliste -Iwidgets -Imixer -Idriver -Iwaveedit -Implugins -Iinstruments -Iremote ${PYREM_CPP_FLAGS} -DSVNVERSION='\"${SVNVER}\"' -include ${PROJECT_BINARY_DIR}/all.h "
+      PROPERTIES COMPILE_FLAGS "${PYREM_CPP_FLAGS} -DINSTPREFIX='\"${CMAKE_INSTALL_PREFIX}\"' -DINSTLIBDIR='\"${LIBRARY_OUTPUT_DIRECTORY}\"' -DSVNVERSION='\"${SVNVER}\"' -include ${PROJECT_BINARY_DIR}/all.h "
+      )
+
+target_link_libraries(muse
+#       midiedit
+#       master
+#       instruments
+#       marker
+#       liste
+#       synti
+#       waveedit
+#       widgets
+#       al
+#       awl
+#       ctrl
+      
+      midiedit ctrl 
+      liste mixer driver marker 
+      master waveedit mplugins arranger 
+      cliplist instruments widgets 
+      synti al      
+      
+      ${QT_LIBRARIES}
+      QtSvg
+      ${ALSA_LIB}
+      ${JACK_LIB}
+      ${SNDFILE_LIB}
+      ${SAMPLERATE_LIB}
+      ${UUID_LIB}
+      ${PYLIBS}
+      ${LASH_LIB}
+      ${FST_LIB}
+      ${LIBLO_LIB}
+      )
+
+install_targets ( /bin muse )
+
diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp
index 761df24e..a4df0d3f 100644
--- a/muse2/muse/app.cpp
+++ b/muse2/muse/app.cpp
@@ -3229,8 +3229,11 @@ int main(int argc, char* argv[])
       if (museGlobal.isEmpty()) {
             QString museGlobal(INSTPREFIX);
             QString museGlobalLibDir(INSTLIBDIR);
-            museGlobalLib   =  museGlobalLibDir + "/muse";
-            museGlobalShare =  museGlobal + "/share/muse";
+            
+            //museGlobalLib   =  museGlobalLibDir + "/muse";
+            //museGlobalShare =  museGlobal + "/share/muse";
+            museGlobalLib   =  museGlobalLibDir + QString("/") + QString(INSTALL_NAME);   // p4.0.2
+            museGlobalShare =  museGlobal + QString("/share/") + QString(INSTALL_NAME);   //
             }
       else {
             museGlobalLib   = museGlobal + "/lib";
diff --git a/muse2/muse/arranger/CMakeLists.txt b/muse2/muse/arranger/CMakeLists.txt
new file mode 100644
index 00000000..7da35146
--- /dev/null
+++ b/muse2/muse/arranger/CMakeLists.txt
@@ -0,0 +1,45 @@
+#=============================================================================
+#  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.
+#=============================================================================
+
+QT4_WRAP_CPP (arranger_mocs
+      arranger.h 
+      pcanvas.h 
+      tlist.h 
+      alayout.h
+      )
+
+#QT4_WRAP_UI (arranger_ui_headers
+# QT4_WRAP_UI3 (arranger_ui_headers
+#       )
+
+add_library ( arranger STATIC
+      arranger.cpp arranger.h 
+      pcanvas.cpp pcanvas.h 
+      tlist.cpp tlist.h 
+      alayout.cpp alayout.h 
+      trackinfo.cpp trackautomationview.h
+      
+      ${arranger_mocs}
+      # ${arranger_ui_headers}
+      )
+set_target_properties( arranger
+  PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h"
+  )
+
diff --git a/muse2/muse/audio.cpp b/muse2/muse/audio.cpp
index f38bcc9c..69ff7caf 100644
--- a/muse2/muse/audio.cpp
+++ b/muse2/muse/audio.cpp
@@ -15,8 +15,10 @@
 #include "song.h"
 #include "node.h"
 #include "audiodev.h"
+//#include "driver/audiodev.h"   // p4.0.2
 #include "mididev.h"
 #include "alsamidi.h"
+//#include "driver/alsamidi.h"   // p4.0.2
 #include "synth.h"
 #include "audioprefetch.h"
 #include "plugin.h"
diff --git a/muse2/muse/cliplist/CMakeLists.txt b/muse2/muse/cliplist/CMakeLists.txt
new file mode 100644
index 00000000..e9164fb7
--- /dev/null
+++ b/muse2/muse/cliplist/CMakeLists.txt
@@ -0,0 +1,38 @@
+#=============================================================================
+#  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.
+#=============================================================================
+
+QT4_WRAP_CPP (cliplist_mocs
+        cliplist.h
+      )
+
+#QT4_WRAP_UI (cliplist_ui_headers
+# QT4_WRAP_UI3 (cliplist_ui_headers
+#       )
+
+add_library ( cliplist STATIC
+      cliplist.cpp 
+      cliplist.h
+      ${cliplist_mocs}
+      # ${cliplist_ui_headers}
+      )
+set_target_properties( cliplist
+  PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h"
+  )
+
diff --git a/muse2/muse/driver/CMakeLists.txt b/muse2/muse/driver/CMakeLists.txt
new file mode 100644
index 00000000..2bdc1b97
--- /dev/null
+++ b/muse2/muse/driver/CMakeLists.txt
@@ -0,0 +1,30 @@
+#=============================================================================
+#  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.
+#=============================================================================
+
+add_library ( driver STATIC
+       audiodev.h alsamidi.cpp alsamidi.h jack.cpp jackaudio.h 
+       dummyaudio.cpp alsatimer.cpp alsatimer.h timerdev.h rtctimer.cpp rtctimer.h 
+       jackmidi.cpp jackmidi.h
+       # ${PROJECT_BINARY_DIR}/all.h.pch
+      )
+set_target_properties( driver
+  PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h"
+  )
+
diff --git a/muse2/muse/dssihost.cpp b/muse2/muse/dssihost.cpp
index 2c13d223..3a3c55f1 100644
--- a/muse2/muse/dssihost.cpp
+++ b/muse2/muse/dssihost.cpp
@@ -44,6 +44,7 @@
 #include "synth.h"
 #include "audio.h"
 #include "jackaudio.h"
+//#include "../driver/jackaudio.h"  // p4.0.2
 #include "midi.h"
 #include "midiport.h"
 #include "stringparam.h"
diff --git a/muse2/muse/importmidi.cpp b/muse2/muse/importmidi.cpp
index 2c8bfb24..63cccffc 100644
--- a/muse2/muse/importmidi.cpp
+++ b/muse2/muse/importmidi.cpp
@@ -20,11 +20,13 @@
 #include "midiport.h"
 #include "transport.h"
 #include "arranger.h"
+//#include "arranger/arranger.h"    // p4.0.2
 #include "mpevent.h"
 #include "event.h"
 #include "midictrl.h"
 #include "instruments/minstrument.h"
 #include "drummap.h"
+//#include "midiedit/drummap.h"    // p4.0.2        
 #include "xml.h"
 #include "audio.h"
 #include "gconfig.h"
diff --git a/muse2/muse/instruments/CMakeLists.txt b/muse2/muse/instruments/CMakeLists.txt
new file mode 100644
index 00000000..ec68941a
--- /dev/null
+++ b/muse2/muse/instruments/CMakeLists.txt
@@ -0,0 +1,43 @@
+#=============================================================================
+#  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.
+#=============================================================================
+
+QT4_WRAP_CPP ( instruments_mocs
+   # minstrument.h editinstrument.h
+   editinstrument.h
+   )
+
+# QT4_WRAP_UI ( instruments_ui_headers
+QT4_WRAP_UI3 ( instruments_ui_headers
+      editinstrumentbase.ui
+      )
+
+add_library ( instruments STATIC
+   minstrument.cpp
+   editinstrument.cpp
+   minstrument.h
+   editinstrument.h
+   ${instruments_mocs}
+   ${instruments_ui_headers}
+   )
+
+set_target_properties( instruments
+   PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h"
+   )
+
diff --git a/muse2/muse/liste/CMakeLists.txt b/muse2/muse/liste/CMakeLists.txt
new file mode 100644
index 00000000..dd1b4e0b
--- /dev/null
+++ b/muse2/muse/liste/CMakeLists.txt
@@ -0,0 +1,56 @@
+#=============================================================================
+#  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.
+#=============================================================================
+
+QT4_WRAP_CPP ( liste_mocs
+#       listedit.h
+#       ctrllistedit.h
+#       tracklistedit.h
+#       partlistedit.h
+#       ieventdialog.h
+      
+      listedit.h 
+      editevent.h
+      )
+
+# QT4_WRAP_UI ( liste_ui_headers
+QT4_WRAP_UI3 ( liste_ui_headers
+#       ctrllistedit.ui
+#       partlistedit.ui
+#       tracklistedit.ui
+      
+      editctrlbase.ui
+      )
+
+add_library ( liste STATIC
+#       listedit.cpp listedit.h
+#       ctrllistedit.cpp ctrllistedit.h
+#       partlistedit.cpp partlistedit.h
+#       tracklistedit.cpp tracklistedit.h
+#       ieventdialog.cpp ieventdialog.h
+      listedit.cpp listedit.h 
+      editevent.cpp editevent.h 
+      ${liste_mocs}
+      ${liste_ui_headers}
+      )
+set_target_properties( liste
+   PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h"
+   )
+
+
diff --git a/muse2/muse/marker/CMakeLists.txt b/muse2/muse/marker/CMakeLists.txt
new file mode 100644
index 00000000..6155d055
--- /dev/null
+++ b/muse2/muse/marker/CMakeLists.txt
@@ -0,0 +1,66 @@
+#
+#
+#
+#
+
+# MACRO(WRAP_CPP outfiles )
+#    FOREACH(it ${ARGN})
+#       SET(${outfiles} ${${outfiles}} ${it}.cpp)
+#       ENDFOREACH(it)
+#    ENDMACRO(WRAP_CPP)
+# 
+# MACRO(WRAP_H outfiles )
+#    FOREACH(it ${ARGN})
+#       SET(${outfiles} ${${outfiles}} ${it}.h)
+#       ENDFOREACH(it)
+#    ENDMACRO(WRAP_H)
+# 
+# MACRO(WRAP_UI outfiles )
+#    FOREACH(it ${ARGN})
+#       SET(${outfiles} ${${outfiles}} ${it}.ui)
+#       ENDFOREACH(it)
+#    ENDMACRO(WRAP_UI)
+# 
+# set(mocs
+#       markerview
+#       )
+# 
+# WRAP_H(mocH ${mocs})
+# WRAP_CPP(mocCPP ${mocs})
+# 
+# QT4_WRAP_CPP (moc_headers ${mocH})
+# 
+# set (uics
+#    )
+# 
+# WRAP_UI(uiUI ${uics})
+# QT4_WRAP_UI (ui_headers ${uiUI})
+# 
+# set ( marker_src ${mocCPP} ${moc_headers})
+# 
+# add_library ( marker STATIC ${marker_src})
+# set_target_properties( marker
+#    PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h"
+#    )
+
+
+
+QT4_WRAP_CPP ( marker_mocs
+        markerview.h
+      )
+
+# QT4_WRAP_UI ( marker_ui_headers
+# QT4_WRAP_UI3 ( marker_ui_headers
+#       )
+
+add_library ( marker STATIC
+        # ${marker_ui_headers}
+        ${marker_mocs}
+        marker.cpp marker.h 
+        markerview.cpp # markerview.h
+      )
+
+set_target_properties( marker
+      PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h"
+      )
+
diff --git a/muse2/muse/master/CMakeLists.txt b/muse2/muse/master/CMakeLists.txt
new file mode 100644
index 00000000..0a3a54de
--- /dev/null
+++ b/muse2/muse/master/CMakeLists.txt
@@ -0,0 +1,66 @@
+#
+#
+#
+#
+
+# MACRO(WRAP_CPP outfiles )
+#    FOREACH(it ${ARGN})
+#       SET(${outfiles} ${${outfiles}} ${it}.cpp)
+#       ENDFOREACH(it)
+#    ENDMACRO(WRAP_CPP)
+# 
+# MACRO(WRAP_H outfiles )
+#    FOREACH(it ${ARGN})
+#       SET(${outfiles} ${${outfiles}} ${it}.h)
+#       ENDFOREACH(it)
+#    ENDMACRO(WRAP_H)
+# 
+# MACRO(WRAP_UI outfiles )
+#    FOREACH(it ${ARGN})
+#       SET(${outfiles} ${${outfiles}} ${it}.ui)
+#       ENDFOREACH(it)
+#    ENDMACRO(WRAP_UI)
+# 
+# set( mocs master masteredit )
+# 
+# WRAP_H(mocH ${mocs})
+# WRAP_CPP(mocCPP ${mocs})
+# 
+# QT4_WRAP_CPP (moc_headers ${mocH})
+# 
+# set ( master_src ${mocCPP} ${moc_headers})
+# 
+# add_library ( master STATIC ${master_src})
+# set_target_properties( master
+#    PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h"
+#    )
+# 
+# 
+
+
+
+
+QT4_WRAP_CPP ( master_mocs
+        lmaster.h 
+        masteredit.h 
+        master.h 
+        tscale.h
+      )
+
+# QT4_WRAP_UI ( master_ui_headers
+# QT4_WRAP_UI3 ( master_ui_headers
+#       )
+
+add_library ( master STATIC
+        # ${master_ui_headers}
+        ${master_mocs}
+        lmaster.cpp # lmaster.h 
+        masteredit.cpp # masteredit.h 
+        master.cpp # master.h 
+        tscale.cpp # tscale.h
+      )
+
+set_target_properties( master
+      PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h"
+      )
+
diff --git a/muse2/muse/midi.cpp b/muse2/muse/midi.cpp
index 3ec40065..efabfe95 100644
--- a/muse2/muse/midi.cpp
+++ b/muse2/muse/midi.cpp
@@ -14,6 +14,7 @@
 #include "song.h"
 #include "midi.h"
 #include "drummap.h"
+//#include "midiedit/drummap.h"  // p4.0.2
 #include "event.h"
 #include "globals.h"
 #include "midictrl.h"
diff --git a/muse2/muse/midiedit/CMakeLists.txt b/muse2/muse/midiedit/CMakeLists.txt
new file mode 100644
index 00000000..846cd347
--- /dev/null
+++ b/muse2/muse/midiedit/CMakeLists.txt
@@ -0,0 +1,92 @@
+#=============================================================================
+#  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.
+#=============================================================================
+
+QT4_WRAP_CPP ( midiedit_mocs
+#       midicmd.h
+#       gatetime.h
+#       velocity.h
+#       quantconfig.h
+#       dcanvas.h
+#       drumedit.h
+#       ecanvas.h
+#       midieditor.h
+#       pianoroll.h
+#       prcanvas.h
+#       miditracker.h
+#       trackpattern.h
+      
+      pianoroll.h 
+      piano.h 
+      prcanvas.h 
+      quantconfig.h 
+      drumedit.h 
+      dlist.h 
+      dcanvas.h 
+      ecanvas.h
+      )
+
+# QT4_WRAP_UI ( midiedit_ui_headers
+# QT4_WRAP_UI3 ( midiedit_ui_headers
+#       midicmd.ui
+#       gatetime.ui
+#       velocity.ui
+#       quantconfig.ui
+#       )
+
+add_library ( midiedit STATIC
+#      midicmd.h
+#      gatetime.h
+      # ${midiedit_ui_headers}
+      ${midiedit_mocs}
+#       midicmd.cpp
+#       gatetime.cpp
+#       velocity.cpp
+#       quantconfig.cpp
+#       citem.h
+#       cmd.h
+#       drummap.h
+#       midicmd.h
+#       citem.cpp
+#       dcanvas.cpp
+#       drumedit.cpp
+#       drummap.cpp
+#       ecanvas.cpp
+#       midieditor.cpp
+#       pianoroll.cpp
+#       prcanvas.cpp
+#       miditracker.cpp
+#       trackpattern.cpp
+      
+      drummap.cpp drummap.h 
+      cmd.h 
+      pianoroll.cpp # pianoroll.h 
+      piano.cpp # piano.h 
+      prcanvas.cpp # prcanvas.h 
+      quantconfig.cpp # quantconfig.h 
+      drumedit.cpp # drumedit.h 
+      dlist.cpp # dlist.h 
+      dcanvas.cpp # dcanvas.h 
+      ecanvas.cpp # ecanvas.h
+      )
+
+set_target_properties( midiedit
+      PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h"
+      )
+
diff --git a/muse2/muse/midiport.cpp b/muse2/muse/midiport.cpp
index e5b4e63d..fcaa8f36 100644
--- a/muse2/muse/midiport.cpp
+++ b/muse2/muse/midiport.cpp
@@ -14,6 +14,7 @@
 #include "midictrl.h"
 #include "midi.h"
 #include "minstrument.h"
+//#include "instruments/minstrument.h"   // p4.0.2
 #include "xml.h"
 #include "globals.h"
 #include "mpevent.h"
diff --git a/muse2/muse/mixer/CMakeLists.txt b/muse2/muse/mixer/CMakeLists.txt
new file mode 100644
index 00000000..fb5c15cf
--- /dev/null
+++ b/muse2/muse/mixer/CMakeLists.txt
@@ -0,0 +1,40 @@
+#=============================================================================
+#  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.
+#=============================================================================
+
+QT4_WRAP_CPP ( mixer_mocs amixer.h strip.h astrip.h mstrip.h meter.h rack.h panknob.h auxknob.h routedialog.h )
+# QT4_WRAP_UI ( mixer_uis routedialogbase.ui )
+QT4_WRAP_UI3 (  mixer_uis routedialogbase.ui )
+
+add_library ( mixer STATIC 
+      amixer.cpp  
+      meter.cpp 
+      rack.cpp 
+      panknob.cpp 
+      auxknob.cpp 
+      routedialog.cpp 
+      strip.cpp astrip.cpp mstrip.cpp
+      ${mixer_mocs}
+      ${mixer_uis}
+      )
+
+set_target_properties ( mixer
+   PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h"
+   )
+
diff --git a/muse2/muse/mixer/astrip.cpp b/muse2/muse/mixer/astrip.cpp
index de7bf985..c7d2d4f0 100644
--- a/muse2/muse/mixer/astrip.cpp
+++ b/muse2/muse/mixer/astrip.cpp
@@ -1893,7 +1893,7 @@ void AudioStrip::iRoutePressed()
             char buffer[128];
             snprintf(buffer, 128, "%s %d", tr("Channel").latin1(), i+1);
             MenuTitleItem* titel = new MenuTitleItem(QString(buffer));
-            //pup->insertItem(titel); ddskrjo
+            //pup->insertItem(titel); //ddskrjo
   
             if(!checkAudioDevice())
             { 
@@ -2441,7 +2441,7 @@ void AudioStrip::oRoutePressed()
             char buffer[128];
             snprintf(buffer, 128, "%s %d", tr("Channel").latin1(), i+1);
             MenuTitleItem* titel = new MenuTitleItem(QString(buffer));
-            //pup->insertItem(titel); ddskrjo
+            //pup->insertItem(titel); //ddskrjo
   
             if(!checkAudioDevice())
             { 
diff --git a/muse2/muse/mplugins/CMakeLists.txt b/muse2/muse/mplugins/CMakeLists.txt
new file mode 100644
index 00000000..005197dd
--- /dev/null
+++ b/muse2/muse/mplugins/CMakeLists.txt
@@ -0,0 +1,72 @@
+#=============================================================================
+#  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.
+#=============================================================================
+
+# subdirs(
+#         libmidiplugin
+#         splitlayer
+#         filter 
+#       metronom
+#       transform
+#       trigg 
+#       dump
+#       drumglue
+#  )
+# 
+# set ( CMAKE_CXX_FLAGS 
+#       "${CMAKE_CXX_FLAGS} -DQT_NO_DEBUG -DQT_PLUGIN -DQT_SHARED -fPIC"
+#       )
+# 
+# set ( CMAKE_LDD_FLAGS -module -avoid-version )
+
+
+
+QT4_WRAP_CPP ( mplugins_mocs  mittranspose.h midiitransform.h midifilterimpl.h mrconfig.h rhythm.h )
+# QT4_WRAP_UI (  mplugins_uis transform.ui )
+QT4_WRAP_UI3 (  mplugins_uis midifilter.ui mrconfigbase.ui rhythmbase.ui )
+
+# add_library ( mplugins SHARED 
+add_library ( mplugins STATIC 
+      mitplugin.cpp mitplugin.h 
+      mittranspose.cpp 
+      midiitransform.cpp 
+      midifilterimpl.cpp 
+      mrconfig.cpp 
+      rhythm.cpp 
+      random.cpp random.h 
+      ${mplugins_mocs}
+      ${mplugins_uis}
+      )
+
+#target_link_libraries( mplugins
+#   # midiplugin
+#   ${QT_LIBRARIES}
+#   )
+
+# - tell cmake to name target transform.so instead of 
+#   libtransform.so
+# - use precompiled header files
+#
+set_target_properties ( mplugins
+   # PROPERTIES PREFIX ""
+   PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h"
+   )
+
+# install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/midiplugins/ transform )
+
diff --git a/muse2/muse/muse.qrc b/muse2/muse/muse.qrc
new file mode 100644
index 00000000..b7581fa3
--- /dev/null
+++ b/muse2/muse/muse.qrc
@@ -0,0 +1,8 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+   <qresource>
+      <file>style.qss</file>
+      
+   </qresource>
+</RCC>
+
diff --git a/muse2/muse/muse.qrc.ORIG b/muse2/muse/muse.qrc.ORIG
new file mode 100644
index 00000000..0603ba96
--- /dev/null
+++ b/muse2/muse/muse.qrc.ORIG
@@ -0,0 +1,85 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+   <qresource>
+      <file>style.qss</file>
+      <file>xpm/muse_icon_64x64.png</file>
+      <file>xpm/splash.png</file>
+      <file>xpm/filenew.png</file>
+      <file>xpm/fileopen.png</file>
+      <file>xpm/filesave.png</file>
+      <file>xpm/punchin.xpm</file>
+      <file>xpm/punchout.xpm</file>
+      <file>xpm/loop.xpm</file>
+      <file>xpm/start.xpm</file>
+      <file>xpm/stop.xpm</file>
+      <file>xpm/play.xpm</file>
+      <file>xpm/frewind.xpm</file>
+      <file>xpm/fforward.xpm</file>
+      <file>xpm/folder_new.png</file>
+      <file>xpm/recordOn.svg</file>
+      <file>xpm/recordOff.svg</file>
+      <file>xpm/greendot.svg</file>
+      <file>xpm/darkgreendot.svg</file>
+      <file>xpm/activeon.svg</file>
+      <file>xpm/activeoff.svg</file>
+      <file>xpm/on.svg</file>
+      <file>xpm/off.svg</file>
+      <file>xpm/mono.svg</file>
+      <file>xpm/stereo.svg</file>
+      <file>xpm/loop.xpm</file>
+      <file>xpm/punchin.xpm</file>
+      <file>xpm/punchout.xpm</file>
+      <file>xpm/undo.xpm</file>
+      <file>xpm/redo.xpm</file>
+      <file>xpm/panic.xpm</file>
+      <file>xpm/piano.xpm</file>
+      <file>xpm/view_transport_window.xpm</file>
+      <file>xpm/view_bigtime_window.xpm</file>
+      <file>xpm/view_cliplist.xpm</file>
+      <file>xpm/view_marker.xpm</file>
+      <file>xpm/view_mixer.xpm</file>
+      <file>xpm/pointer.xpm</file>
+      <file>xpm/pencil.xpm</file>
+      <file>xpm/delete.xpm</file>
+      <file>xpm/cut.xpm</file>
+      <file>xpm/glue.xpm</file>                                                          
+      <file>xpm/quant.xpm</file>
+      <file>xpm/draw.xpm</file>
+      <file>xpm/editmute.xpm</file>
+
+      <file>xpm/select_all.xpm</file>
+      <file>xpm/select_deselect_all.xpm</file>
+      <file>xpm/select_invert_selection.xpm</file>
+      <file>xpm/select_inside_loop.xpm</file>
+      <file>xpm/select_outside_loop.xpm</file>
+      <file>xpm/editcut.xpm</file>
+      <file>xpm/editcopy.xpm</file>
+      <file>xpm/editpaste.xpm</file>
+      <file>xpm/edit_drumms.xpm</file>
+      <file>xpm/edit_mastertrack.xpm</file>
+      <file>xpm/edit_list.xpm</file>
+      <file>xpm/wave.xpm</file>
+
+   </qresource>
+
+   <qresource lang="de">
+      <file alias="muse.qm">../share/locale/muse_de.qm</file>
+   </qresource>
+
+   <qresource lang="es">
+      <file alias="muse.qm">../share/locale/muse_es.qm</file>
+   </qresource>
+
+   <qresource lang="fr">
+      <file alias="muse.qm">../share/locale/muse_fr.qm</file>
+   </qresource>
+
+   <qresource lang="ru">
+      <file alias="muse.qm">../share/locale/muse_ru.qm</file>
+   </qresource>
+
+   <qresource lang="sv">
+      <file alias="muse.qm">../share/locale/muse_sv_SE.qm</file>
+   </qresource>
+</RCC>
+
diff --git a/muse2/muse/part.cpp b/muse2/muse/part.cpp
index 250cf3ea..0ca898ff 100644
--- a/muse2/muse/part.cpp
+++ b/muse2/muse/part.cpp
@@ -19,6 +19,7 @@
 #include "wave.h"
 #include "midiport.h"
 #include "drummap.h"
+//#include "midiedit/drummap.h"    // p4.0.2
 
 int Part::snGen;
 
diff --git a/muse2/muse/remote/CMakeLists.txt b/muse2/muse/remote/CMakeLists.txt
new file mode 100644
index 00000000..bf04110d
--- /dev/null
+++ b/muse2/muse/remote/CMakeLists.txt
@@ -0,0 +1,21 @@
+#
+#
+#
+#
+
+include(${PROJECT_SOURCE_DIR}/pch.txt)
+
+set (remote_src
+   pyapi.cpp
+   )
+
+add_library(remote STATIC
+   ${remote_src}
+   ${PROJECT_BINARY_DIR}/all.h.pch
+   )
+
+set_source_files_properties(
+   pyapi.cpp
+   PROPERTIES COMPILE_FLAGS "-fPIC -include ${PROJECT_BINARY_DIR}/all.h -include ${PYTHON_INCLUDES} -DENABLE_PYTHON"
+   )
+
diff --git a/muse2/muse/songfile.cpp b/muse2/muse/songfile.cpp
index b13cb07a..3ffa85c8 100644
--- a/muse2/muse/songfile.cpp
+++ b/muse2/muse/songfile.cpp
@@ -13,21 +13,27 @@
 #include "app.h"
 #include "song.h"
 #include "arranger.h"
+//#include "arranger/arranger.h"  // p4.0.2
 #include "transport.h"
 #include "cobject.h"
 #include "drumedit.h"
+//#include "midiedit/drumedit.h"  // p4.0.2
 #include "pianoroll.h"
+//#include "midiedit/pianoroll.h"  // p4.0.2
 #include "globals.h"
 #include "xml.h"
 #include "drummap.h"
+//#include "midiedit/drummap.h"    // p4.0.2
 #include "event.h"
 #include "marker/marker.h"
 #include "midiport.h"
 #include "audio.h"
 #include "mitplugin.h"
+//#include "mplugins/mitplugin.h"           // p4.0.2
 #include "wave.h"
 #include "midictrl.h"
 #include "amixer.h"
+//#include "mixer/amixer.h"              // p4.0.2
 #include "conf.h"
 #include "driver/jackmidi.h"
 
diff --git a/muse2/muse/style.qss b/muse2/muse/style.qss
new file mode 100644
index 00000000..d3eb889d
--- /dev/null
+++ b/muse2/muse/style.qss
@@ -0,0 +1,73 @@
+/*
+ *    this is the MusE application style sheet
+ */
+
+
+/* TODO */
+
+/*
+
+QLabel#midiChannelLabel { font-size: 6pt }
+MidiRack, EffectRack    { font-size: 8pt }
+QLabel#trackLabel       { font-size: 6pt }
+SimpleButton            { font-size: 8pt }
+QToolButton#routeButton { font-size: 8pt }
+QToolButton#preButton   { font-size: 8pt }
+
+TimeCanvas {
+      qproperty-fontSize1: 6;
+      qproperty-fontSize2: 8;
+      qproperty-fontSize3: 8
+      }
+
+QLabel#knobLabel        { font-size: 8pt }
+Awl--MidiVolEntry       { font-size: 5pt }
+Awl--MidiPanEntry       { font-size: 5pt }
+Awl--VolEntry           { font-size: 5pt }
+Awl--PanEntry           { font-size: 5pt }
+
+QLabel#AudioOut         {
+      font-size: 7pt;
+      background-color: white;
+      }
+
+QLabel#Group         {
+      font-size: 7pt;
+      background-color: yellow;
+      }
+
+QLabel#Wave         {
+      font-size: 7pt;
+      background-color: rgb(0,255,0);
+      }
+
+QLabel#AudioIn         {
+      font-size: 7pt;
+      background-color: red;
+      }
+
+QLabel#Synth         {
+      font-size: 7pt;
+      background-color: blue;
+      }
+
+QLabel#Midi         {
+      font-size: 7pt;
+      background-color: gray;
+      }
+
+QLabel#MidiOut         {
+      font-size: 7pt;
+      background-color: gray;
+      }
+
+QLabel#MidiIn         {
+      font-size: 7pt;
+      background-color: gray;
+      }
+QLabel#M-Synth         {
+      font-size: 7pt;
+      background-color: gray;
+      }
+
+*/
\ No newline at end of file
diff --git a/muse2/muse/sync.cpp b/muse2/muse/sync.cpp
index 699b5a33..74b38122 100644
--- a/muse2/muse/sync.cpp
+++ b/muse2/muse/sync.cpp
@@ -16,6 +16,7 @@
 #include "midiseq.h"
 #include "audio.h"
 #include "audiodev.h"
+//#include "driver/audiodev.h"  // p4.0.2
 #include "gconfig.h"
 #include "xml.h"
 #include "midi.h"
diff --git a/muse2/muse/synth.cpp b/muse2/muse/synth.cpp
index 352be582..f62a0627 100644
--- a/muse2/muse/synth.cpp
+++ b/muse2/muse/synth.cpp
@@ -25,7 +25,8 @@
 #include "midi.h"
 #include "midiport.h"
 #include "mididev.h"
-#include "libsynti/mess.h"
+//#include "libsynti/mess.h"
+#include "synti/libsynti/mess.h"   // p4.0.2
 #include "song.h"
 #include "audio.h"
 #include "event.h"
diff --git a/muse2/muse/waveedit/CMakeLists.txt b/muse2/muse/waveedit/CMakeLists.txt
new file mode 100644
index 00000000..075aadff
--- /dev/null
+++ b/muse2/muse/waveedit/CMakeLists.txt
@@ -0,0 +1,42 @@
+#=============================================================================
+#  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.
+#=============================================================================
+
+QT4_WRAP_CPP ( waveedit_mocs
+      waveedit.h
+      waveview.h
+      editgain.h
+      )
+
+# QT4_WRAP_UI (waveedit_ui_headers
+QT4_WRAP_UI3 (waveedit_ui_headers
+      editgainbase.ui
+      )
+
+add_library ( waveedit STATIC
+      ${waveedit_ui_headers}
+      ${waveedit_mocs}
+      waveedit.cpp
+      waveview.cpp
+      editgain.cpp
+      )
+
+set_target_properties( waveedit
+      PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h"
+      )
diff --git a/muse2/muse/widgets/CMakeLists.txt b/muse2/muse/widgets/CMakeLists.txt
new file mode 100644
index 00000000..c59d66b8
--- /dev/null
+++ b/muse2/muse/widgets/CMakeLists.txt
@@ -0,0 +1,253 @@
+#=============================================================================
+#  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)
+
+# FIXME: Can't build shared widgets library while using QT3 support for the widgets code. 
+# QT3's QWidgetPlugin no longer supported in QT4. Our code would have to be native QT4...
+# Rules seem OK but get compile errors.
+
+# IF (APPLE)
+#    message("Not yet able to build musewidgetsplugin under OS X.")
+# ELSE (APPLE)
+# 
+#    #
+#    #  build libmusewidgetsplugin.so
+#    #
+#    QT4_WRAP_CPP (moc_widgetsplugin_headers
+#       posedit.h poslabel.h   sigedit.h     pitchedit.h pitchlabel.h tempolabel.h 
+#       slider.h  sliderbase.h doublelabel.h dentry.h    checkbox.h   combobox.h
+#       )
+# 
+#    add_library ( musewidgetsplugin SHARED
+#        sclif.cpp  scldiv.cpp mmath.cpp scldraw.cpp  dimap.cpp drange.cpp 
+#        
+#        posedit.cpp poslabel.cpp sigedit.cpp pitchedit.cpp pitchlabel.cpp tempolabel.cpp 
+#        slider.cpp sliderbase.cpp doublelabel.cpp dentry.cpp checkbox.cpp combobox.cpp
+#       
+#        musewidgetsplug.cpp 
+#        sigedit.h 
+#        ${PROJECT_SOURCE_DIR}/muse/xml.cpp ${PROJECT_SOURCE_DIR}/muse/tempo.cpp 
+#        ${PROJECT_SOURCE_DIR}/muse/sig.cpp ${PROJECT_SOURCE_DIR}/muse/pos.cpp
+#        
+#        ${moc_widgetsplugin_headers}
+#        ${PROJECT_BINARY_DIR}/all-pic.h.pch
+#        )
+# 
+#    set_target_properties( musewidgetsplugin
+#       PROPERTIES COMPILE_FLAGS
+#          "-D_GNU_SOURCE -D_REENTRANT -DHAVE_CONFIG_H -DQT_PLUGIN -DQT_SHARED -DQT_NO_DEBUG -include ${PROJECT_BINARY_DIR}/all-pic.h"
+#       )
+#    target_link_libraries( musewidgetsplugin
+#       # TODO: what do we need here?
+#       al pthread asound
+#       )
+# 
+#    # install( TARGETS awlplugin DESTINATION ${QT_PLUGINS_DIR}/designer/ )
+#    # install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/plugins/ musewidgetsplugin )
+#    install( TARGETS musewidgetsplugin DESTINATION ${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/plugins/ )
+#    
+# # 
+# #    add_executable( ltest ltest.cpp )
+# #    target_link_libraries ( ltest
+# #       musewidgetsplugin
+# #       ${QT_LIBRARIES}
+# #       )
+# # 
+#
+# ENDIF (APPLE)
+ 
+
+QT4_WRAP_CPP (widget_mocs
+      scrollscale.h  
+      view.h  
+      nentry.h  
+      mtscale.h  
+      sigscale.h  
+      hitscale.h  
+      intlabel.h  
+      doublelabel.h  
+      canvas.h  
+      noteinfo.h  
+      dentry.h  
+      siglabel.h  
+      ttoolbar.h  
+      ttoolbutton.h  
+      tb1.h  
+      lcombo.h  
+      swidget.h  
+      tempolabel.h  
+      tools.h  
+      popupmenu.h  
+      fontsel.h  
+      ctrlcombo.h  
+      sliderbase.h  
+      slider.h  
+      midisyncimpl.h  
+      header.h  
+      knob.h  
+      mlabel.h  
+      genset.h  
+      mixdowndialog.h  
+      spinboxFP.h  
+      spinbox.h  
+      comboQuant.h  
+      bigtime.h  
+      comment.h  
+      splitter.h  
+      gatetime.h  
+      velocity.h  
+      metronome.h  
+      posedit.h  
+      pitchedit.h  
+      pitchlabel.h  
+      poslabel.h  
+      filedialog.h  
+      sigedit.h  
+      shortcutconfig.h  
+      shortcutcapturedialog.h  
+      combobox.h  
+      aboutbox_impl.h 
+      aboutbox.h  
+      songinfo.h  
+      didyouknow.h  
+      checkbox.h  
+      vscale.h  
+      action.h
+      )
+
+#QT4_WRAP_UI (widget_ui_headers
+QT4_WRAP_UI3 (widget_ui_headers
+      midisync.ui  
+      gensetbase.ui  
+      mixdowndialogbase.ui  
+      transposebase.ui  
+      transformbase.ui  
+      appearancebase.ui  
+      itransformbase.ui  
+      commentbase.ui  
+      synthconfigbase.ui  
+      gatetimebase.ui  
+      velocitybase.ui  
+      metronomebase.ui  
+      mtrackinfobase.ui  
+      wtrackinfobase.ui  
+      editctrl7dialogbase.ui  
+      editmetadialogbase.ui  
+      editnotedialogbase.ui  
+      editsysexdialogbase.ui  
+      cliplisteditorbase.ui  
+      mittransposebase.ui  
+      fdialogbuttons.ui  
+      shortcutconfigbase.ui  
+      shortcutcapturedialogbase.ui  
+      aboutbox.ui  
+      songinfo.ui  
+      didyouknow.ui  
+      configmidifilebase.ui
+      )
+
+# add_custom_command(OUTPUT ui_midisync.h
+#      COMMAND ${QT_UIC_EXECUTABLE}
+#      ARGS -o ${CMAKE_CURRENT_BINARY_DIR}/ui_midisync.h ${CMAKE_CURRENT_SOURCE_DIR}/midisync.ui
+#      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/midisync.ui
+#      )
+
+# ADD_FILE_DEPENDENCIES(moc_midisync.cxx ${CMAKE_CURRENT_BINARY_DIR}/ui_midisync.h)
+
+add_library ( widgets STATIC 
+      ${widget_ui_headers}
+      ${widget_mocs}
+      utils.cpp 
+      citem.cpp
+      vscale.cpp
+      drange.cpp
+      sclif.cpp
+      dimap.cpp dimap.h  
+      scldiv.cpp scldiv.h  
+      mmath.cpp mmath.h  
+      scldraw.cpp scldraw.h  
+      action.h  
+      scrollscale.cpp  # scrollscale.h  
+      view.cpp  # view.h  
+      nentry.cpp # nentry.h  
+      mtscale.cpp # mtscale.h  
+      sigscale.cpp # sigscale.h  
+      hitscale.cpp # hitscale.h  
+      intlabel.cpp # intlabel.h  
+      doublelabel.cpp # doublelabel.h  
+      canvas.cpp # canvas.h  
+      noteinfo.cpp # noteinfo.h  
+      dentry.cpp # dentry.h  
+      siglabel.cpp # siglabel.h  
+      ttoolbar.cpp # ttoolbar.h  
+      ttoolbutton.cpp # ttoolbutton.h  
+      tb1.cpp # tb1.h  
+      lcombo.cpp # lcombo.h  
+      swidget.cpp # swidget.h  
+      tempolabel.cpp # tempolabel.h  
+      tools.cpp # tools.h  
+      fontsel.cpp # fontsel.h  
+      ctrlcombo.cpp # ctrlcombo.h  
+      sliderbase.cpp # sliderbase.h  
+      slider.cpp # slider.h  
+      midisyncimpl.cpp # midisyncimpl.h  
+      header.cpp # header.h  
+      knob.cpp # knob.h  
+      mlabel.cpp # mlabel.h  
+      genset.cpp # genset.h  
+      mixdowndialog.cpp # mixdowndialog.h  
+      spinboxFP.cpp # spinboxFP.h  
+      spinbox.cpp # spinbox.h  
+      comboQuant.cpp # comboQuant.h  
+      bigtime.cpp # bigtime.h  
+      comment.cpp # comment.h  
+      splitter.cpp # splitter.h  
+      gatetime.cpp # gatetime.h  
+      velocity.cpp # velocity.h  
+      metronome.cpp # metronome.h  
+      posedit.cpp section.h # posedit.h 
+      pitchedit.cpp # pitchedit.h  
+      pitchlabel.cpp # pitchlabel.h  
+      poslabel.cpp # poslabel.h  
+      filedialog.cpp # filedialog.h  
+      sigedit.cpp # sigedit.h  
+      shortcutconfig.cpp # shortcutconfig.h  
+      shortcutcapturedialog.cpp #shortcutcapturedialog.h  
+      combobox.cpp # combobox.h  
+      checkbox.cpp # checkbox.h  
+      aboutbox_impl.cpp # aboutbox_impl.h  aboutbox.h
+      didyouknow.h
+      popupmenu.cpp # popupmenu.h  
+      listitem.h  
+      menutitleitem.h  
+      )
+
+# AM_CXXFLAGS +=-DSVNVERSION=\"$(shell svnversion)\"
+EXEC_PROGRAM( svnversion
+      ARGS ${PROJECT_SOURCE_DIR}
+      OUTPUT_VARIABLE SVNVER )
+
+set_target_properties( widgets
+   PROPERTIES COMPILE_FLAGS "-DSVNVERSION='\"${SVNVER}\"' -include ${PROJECT_BINARY_DIR}/all.h ${MUSECXXFLAGS} -I../ -I${PROJECT_SOURCE_DIR}/synti "
+   )
+
+
+
diff --git a/muse2/muse/widgets/musewidgetsplug.cpp b/muse2/muse/widgets/musewidgetsplug.cpp
index 4a7f5f24..78376536 100644
--- a/muse2/muse/widgets/musewidgetsplug.cpp
+++ b/muse2/muse/widgets/musewidgetsplug.cpp
@@ -8,7 +8,10 @@
 // this file makes some of the MusE widgets available
 // to QT-Designer
 
-#include <qwidgetplugin.h>
+// #include <qwidgetplugin.h>
+#include <QtCore/QtPlugin>                             // p4.0.2
+#include <QtDesigner/QDesignerCustomWidgetInterface>   //
+
 //Added by qt3to4:
 #include <QPixmap>
 #include "posedit.h"
@@ -157,7 +160,7 @@ GlobalConfigValues config = {
       true,                         // useDenormalBias
       false,                        // useOutputLimiter
       true,                         // showDidYouKnow
-      false                         // vstInPlace  Enable VST in-place processing
+      false,                         // vstInPlace  Enable VST in-place processing
       44100,                        // Dummy audio preferred sample rate
       512                           // Dummy audio buffer size
       };
diff --git a/muse2/pch.txt b/muse2/pch.txt
new file mode 100644
index 00000000..11e9ab5f
--- /dev/null
+++ b/muse2/pch.txt
@@ -0,0 +1,68 @@
+#=============================================================================
+#  MusE
+#  Linux Music Editor
+#  $Id:$
+#
+#  Copyright (C) 2007 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.
+#=============================================================================
+
+add_custom_command(
+      OUTPUT ${PROJECT_BINARY_DIR}/all.h
+      COMMAND cp ${PROJECT_SOURCE_DIR}/all.h ${PROJECT_BINARY_DIR}/all.h
+      DEPENDS ${PROJECT_SOURCE_DIR}/all.h
+      WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+      )
+
+add_custom_command(
+      OUTPUT ${PROJECT_BINARY_DIR}/all-pic.h
+      COMMAND cp ${PROJECT_SOURCE_DIR}/all.h ${PROJECT_BINARY_DIR}/all-pic.h
+      DEPENDS ${PROJECT_SOURCE_DIR}/all.h
+      WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+      )
+
+add_custom_command(
+      OUTPUT ${PROJECT_BINARY_DIR}/all.h.pch
+      COMMAND ${CMAKE_CXX_COMPILER}
+         -g -Wextra -fno-exceptions -Wall
+         -I${QT_INCLUDE_DIR}
+         -I${QT_QTCORE_INCLUDE_DIR}
+         -I${QT_QTGUI_INCLUDE_DIR}
+         -o all.h.pch all.h
+      DEPENDS ${PROJECT_BINARY_DIR}/all.h
+      WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+      )
+
+add_custom_command(
+      OUTPUT ${PROJECT_BINARY_DIR}/all-pic.h.pch
+      COMMAND ${CMAKE_CXX_COMPILER}
+         -fPIC
+         -Dawlplugin_EXPORTS -DQT_CORE_LIB -DQT_GUI_LIB -DQT_XML_LIB
+         -DQT_PLUGIN -DQT_SHARED -DQT_NO_DEBUG
+         -g -Wextra -fno-exceptions -Wall
+         -I${QT_INCLUDE_DIR}
+         -I${QT_QTCORE_INCLUDE_DIR}
+         -I${QT_QTGUI_INCLUDE_DIR}
+         -o all-pic.h.pch all-pic.h
+      DEPENDS ${PROJECT_BINARY_DIR}/all-pic.h
+      WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+      )
+
+set_source_files_properties(
+      ${PROJECT_BINARY_DIR}/all.h
+      ${PROJECT_BINARY_DIR}/all.h.pch
+      ${PROJECT_BINARY_DIR}/all-pic.h.pch
+      PROPERTIES generated true
+      )
+
diff --git a/muse2/plugins/CMakeLists.txt b/muse2/plugins/CMakeLists.txt
new file mode 100644
index 00000000..1293902f
--- /dev/null
+++ b/muse2/plugins/CMakeLists.txt
@@ -0,0 +1,22 @@
+#=============================================================================
+#  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.
+#=============================================================================
+
+subdirs( freeverb doublechorus pandelay )
+
diff --git a/muse2/plugins/doublechorus/CMakeLists.txt b/muse2/plugins/doublechorus/CMakeLists.txt
new file mode 100644
index 00000000..ecb6dbe0
--- /dev/null
+++ b/muse2/plugins/doublechorus/CMakeLists.txt
@@ -0,0 +1,33 @@
+#=============================================================================
+#  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.
+#=============================================================================
+
+add_library ( doublechorus SHARED
+      doublechorus.cpp doublechorusmodel.cpp simplechorusmodel.cpp
+      )
+
+# tell cmake to name the target doublechorus.so instead of
+# libdoublechorus.so
+#
+set_target_properties (doublechorus
+      PROPERTIES PREFIX ""
+      #COMPILE_FLAGS "-O3"
+      )
+
+install_targets ( /lib/${MusE_INSTALL_NAME}/plugins doublechorus)
diff --git a/muse2/plugins/freeverb/CMakeLists.txt b/muse2/plugins/freeverb/CMakeLists.txt
new file mode 100644
index 00000000..0a86454f
--- /dev/null
+++ b/muse2/plugins/freeverb/CMakeLists.txt
@@ -0,0 +1,33 @@
+#=============================================================================
+#  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.
+#=============================================================================
+
+add_library ( freeverb SHARED
+      freeverb.cpp revmodel.cpp
+      )
+
+# tell cmake to name the target freeverb.so instead of
+# libfreeverb.so
+#
+set_target_properties (freeverb
+      PROPERTIES PREFIX ""
+      COMPILE_FLAGS "-O2"
+      )
+
+install_targets ( /lib/${MusE_INSTALL_NAME}/plugins freeverb)
diff --git a/muse2/plugins/pandelay/CMakeLists.txt b/muse2/plugins/pandelay/CMakeLists.txt
new file mode 100644
index 00000000..5ebb08a0
--- /dev/null
+++ b/muse2/plugins/pandelay/CMakeLists.txt
@@ -0,0 +1,33 @@
+#=============================================================================
+#  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.
+#=============================================================================
+
+add_library ( pandelay SHARED
+      pandelay.cpp ladspapandelay.cpp pandelaymodel.cpp
+      )
+
+# tell cmake to name the target pandelay.so instead of
+# libpandelay.so
+#
+set_target_properties (pandelay
+      PROPERTIES PREFIX ""
+      #COMPILE_FLAGS "-O3"
+      )
+
+install_targets ( /lib/${MusE_INSTALL_NAME}/plugins pandelay)
diff --git a/muse2/share/CMakeLists.txt b/muse2/share/CMakeLists.txt
new file mode 100644
index 00000000..bb923315
--- /dev/null
+++ b/muse2/share/CMakeLists.txt
@@ -0,0 +1,23 @@
+#=============================================================================
+#  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.
+#=============================================================================
+
+subdirs( drummaps html instruments locale plugins pybridge scripts templates wallpapers)
+# subdirs( drummaps instruments locale plugins pybridge scripts templates wallpapers)
+
diff --git a/muse2/share/drummaps/CMakeLists.txt b/muse2/share/drummaps/CMakeLists.txt
new file mode 100644
index 00000000..965ddac6
--- /dev/null
+++ b/muse2/share/drummaps/CMakeLists.txt
@@ -0,0 +1,22 @@
+#=============================================================================
+#  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.
+#=============================================================================
+
+install_files( /share/${MusE_INSTALL_NAME}/drummaps .*\\.map )
+
diff --git a/muse2/share/html/CMakeLists.txt b/muse2/share/html/CMakeLists.txt
new file mode 100644
index 00000000..e1a4f965
--- /dev/null
+++ b/muse2/share/html/CMakeLists.txt
@@ -0,0 +1,28 @@
+#=============================================================================
+#  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.
+#=============================================================================
+
+# FIXME: Won't work.
+#install_files( /share/${MusE_INSTALL_NAME}/html .*\\.html .*\\.txt .*\\.jpg )  
+
+install_files( /share/${MusE_INSTALL_NAME}/html .*\\.html )  
+install_files( /share/${MusE_INSTALL_NAME}/html .*\\.jpg )  
+# FIXME: Installs CMakeLists.txt !!!
+install_files( /share/${MusE_INSTALL_NAME}/html .*\\.txt )  
+
diff --git a/muse2/share/instruments/CMakeLists.txt b/muse2/share/instruments/CMakeLists.txt
new file mode 100644
index 00000000..64eb89ac
--- /dev/null
+++ b/muse2/share/instruments/CMakeLists.txt
@@ -0,0 +1,22 @@
+#=============================================================================
+#  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.
+#=============================================================================
+
+install_files( /share/${MusE_INSTALL_NAME}/instruments .*\\.idf )
+
diff --git a/muse2/share/locale/CMakeLists.txt b/muse2/share/locale/CMakeLists.txt
new file mode 100644
index 00000000..76aa7660
--- /dev/null
+++ b/muse2/share/locale/CMakeLists.txt
@@ -0,0 +1,21 @@
+#=============================================================================
+#  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.
+#=============================================================================
+
+install_files( /share/${MusE_INSTALL_NAME}/locale .*\\.qm )
diff --git a/muse2/share/plugins/CMakeLists.txt b/muse2/share/plugins/CMakeLists.txt
new file mode 100644
index 00000000..4df55561
--- /dev/null
+++ b/muse2/share/plugins/CMakeLists.txt
@@ -0,0 +1,22 @@
+#=============================================================================
+#  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.
+#=============================================================================
+
+install_files ( /share/${MusE_INSTALL_NAME}/plugins .*\\.ui )
+
diff --git a/muse2/share/pybridge/CMakeLists.txt b/muse2/share/pybridge/CMakeLists.txt
new file mode 100644
index 00000000..d38f1c60
--- /dev/null
+++ b/muse2/share/pybridge/CMakeLists.txt
@@ -0,0 +1,22 @@
+#=============================================================================
+#  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.
+#=============================================================================
+
+install_files( /share/${MusE_INSTALL_NAME}/pybridge .*\\.py )
+
diff --git a/muse2/share/scripts/CMakeLists.txt b/muse2/share/scripts/CMakeLists.txt
new file mode 100644
index 00000000..27046121
--- /dev/null
+++ b/muse2/share/scripts/CMakeLists.txt
@@ -0,0 +1,28 @@
+#=============================================================================
+#  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.
+#=============================================================================
+
+# FIXME: Won't work
+#install_files( /share/${MusE_INSTALL_NAME}/scripts DoNothing RemoveShortEvents DoubleSpeed ConstantLength SwingQuantize1 )
+
+install_files( /share/${MusE_INSTALL_NAME}/scripts DoNothing )
+install_files( /share/${MusE_INSTALL_NAME}/scripts RemoveShortEvents )
+install_files( /share/${MusE_INSTALL_NAME}/scripts DoubleSpeed )
+install_files( /share/${MusE_INSTALL_NAME}/scripts ConstantLength )
+install_files( /share/${MusE_INSTALL_NAME}/scripts SwingQuantize1 )
diff --git a/muse2/share/templates/CMakeLists.txt b/muse2/share/templates/CMakeLists.txt
new file mode 100644
index 00000000..92defd5c
--- /dev/null
+++ b/muse2/share/templates/CMakeLists.txt
@@ -0,0 +1,30 @@
+#=============================================================================
+#  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.
+#=============================================================================
+
+install_files ( /share/${MusE_INSTALL_NAME}/templates .*\\.med
+#    audio.med
+#    # empty.med 
+#    default.med
+#    midiGM.med
+#    monorecord.med
+#    synti.med 
+#    # ns5r.med
+   )
+
diff --git a/muse2/share/wallpapers/CMakeLists.txt b/muse2/share/wallpapers/CMakeLists.txt
new file mode 100644
index 00000000..f098c244
--- /dev/null
+++ b/muse2/share/wallpapers/CMakeLists.txt
@@ -0,0 +1,22 @@
+#=============================================================================
+#  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.
+#=============================================================================
+
+install_files ( /share/${MusE_INSTALL_NAME}/wallpapers .*\\.gif )
+install_files ( /share/${MusE_INSTALL_NAME}/wallpapers .*\\.jpg )
diff --git a/muse2/synti/CMakeLists.txt b/muse2/synti/CMakeLists.txt
new file mode 100644
index 00000000..ee358879
--- /dev/null
+++ b/muse2/synti/CMakeLists.txt
@@ -0,0 +1,39 @@
+#=============================================================================
+#  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_directories(
+   .
+   ${CMAKE_CURRENT_BINARY}
+   ${PROJECT_SOURCE_DIR}
+   ${PROJECT_SOURCE_DIR}/muse
+   ${PROJECT_SOURCE_DIR}/muse/widgets
+   ${PROJECT_SOURCE_DIR}/synti
+   )
+
+# set (SubDirs libsynti s1 organ deicsonze deicsonze2 simpledrums vam)
+set (SubDirs libsynti s1 organ deicsonze simpledrums vam)
+
+if (ENABLE_FLUID)
+      set (SubDirs ${SubDirs} fluid fluidsynth )
+endif (ENABLE_FLUID)
+
+subdirs(${SubDirs})
+
+
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))))))));
 }
 
 //--------------------------------------------------------------
diff --git a/muse2/synti/fluid/CMakeLists.txt b/muse2/synti/fluid/CMakeLists.txt
new file mode 100644
index 00000000..81cf1e18
--- /dev/null
+++ b/muse2/synti/fluid/CMakeLists.txt
@@ -0,0 +1,51 @@
+#=============================================================================
+#  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.
+#=============================================================================
+
+QT4_WRAP_CPP ( fluid_mocs fluidgui.h )
+# QT4_WRAP_UI (  fluid_uis fluidgui.ui )
+QT4_WRAP_UI3 (  fluid_uis fluidguibase.ui )
+
+add_library ( fluid SHARED 
+      fluid.cpp 
+      fluidgui.cpp
+      fluidgui.h
+      ${fluid_mocs}
+      ${fluid_uis}
+      )
+
+target_link_libraries( fluid synti )
+
+# - tell cmake to name target fluid.so instead of 
+#   libfluid.so
+# - use precompiled header files
+#
+set_target_properties ( fluid
+   PROPERTIES PREFIX ""
+   COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all-pic.h"
+   LINK_FLAGS "-L${FLUID_LIBDIR} ${FLUID_LIB}"
+   )
+target_link_libraries(fluid
+      synti
+      ${QT_LIBRARIES}
+      ${FLUID_LIB}
+      )
+
+install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/synthi/ fluid )
+
diff --git a/muse2/synti/fluidsynth/CMakeLists.txt b/muse2/synti/fluidsynth/CMakeLists.txt
new file mode 100644
index 00000000..7efa53d6
--- /dev/null
+++ b/muse2/synti/fluidsynth/CMakeLists.txt
@@ -0,0 +1,57 @@
+#=============================================================================
+#  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.
+#=============================================================================
+
+QT4_WRAP_CPP ( fluidsynth_mocs fluidsynthgui.h )
+# QT4_WRAP_UI (  fluidsynth_uis fluidsynthgui.ui )
+QT4_WRAP_UI3 (  fluidsynth_uis fluidsynthguibase.ui )
+
+add_library ( fluidsynth SHARED 
+      fluidsynti.cpp 
+      fluidsynthgui.cpp
+      fluidsynthgui.h
+      ${fluidsynth_mocs}
+      ${fluidsynth_uis}
+      )
+
+target_link_libraries( fluidsynth synti )
+
+# - tell cmake to name target fluidsynth.so instead of 
+#   libfluidsynth.so
+# - use precompiled header files
+#
+set_target_properties ( fluidsynth 
+   PROPERTIES PREFIX ""
+   COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all-pic.h"
+   LINK_FLAGS "-L${FLUID_LIBDIR} ${FLUID_LIB}"
+   )
+
+target_link_libraries(fluidsynth
+      synti
+      ${QT_LIBRARIES}
+      ${FLUID_LIB}
+      )
+
+install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/synthi/ fluidsynth )
+
+# FIXME: Won't work
+# install_files ( /${MusE_INSTALL_NAME}/synthi TODO README.txt )
+
+install_files ( /share/${MusE_INSTALL_NAME}/synthi TODO )
+install_files ( /share/${MusE_INSTALL_NAME}/synthi README.txt )
diff --git a/muse2/synti/libsynti/CMakeLists.txt b/muse2/synti/libsynti/CMakeLists.txt
new file mode 100644
index 00000000..10154a93
--- /dev/null
+++ b/muse2/synti/libsynti/CMakeLists.txt
@@ -0,0 +1,40 @@
+#=============================================================================
+#  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)
+
+add_library(synti
+      ${PROJECT_BINARY_DIR}/all-pic.h.pch
+      mess.cpp
+      # mess2.cpp
+      gui.cpp
+      mono.cpp
+      poly.cpp
+      # midievent.cpp
+      mpevent.cpp
+      )
+
+#
+# -fPIC is necessary for 64 bit systems
+#
+set_target_properties( synti
+   PROPERTIES COMPILE_FLAGS "-fPIC -include ${PROJECT_BINARY_DIR}/all-pic.h"
+   )
+
diff --git a/muse2/synti/libsynti/evdata.h b/muse2/synti/libsynti/evdata.h
index 29f6441e..4e529bec 100644
--- a/muse2/synti/libsynti/evdata.h
+++ b/muse2/synti/libsynti/evdata.h
@@ -9,7 +9,8 @@
 #ifndef __EVDATA_H__
 #define __EVDATA_H__
 
-#include <memory.h>
+//#include <memory.h>
+#include <string.h>    // p4.0.2  
 
 //---------------------------------------------------------
 //   EvData
diff --git a/muse2/synti/organ/CMakeLists.txt b/muse2/synti/organ/CMakeLists.txt
new file mode 100644
index 00000000..5bae641e
--- /dev/null
+++ b/muse2/synti/organ/CMakeLists.txt
@@ -0,0 +1,53 @@
+#=============================================================================
+#  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.
+#=============================================================================
+
+QT4_WRAP_CPP ( organ_mocs organgui.h )
+# QT4_WRAP_UI (  organ_uis organgui.ui )
+QT4_WRAP_UI3 (  organ_uis organguibase.ui )
+
+add_library ( organ SHARED
+      organ.cpp
+      # organgui.cpp
+      # reverb.cpp
+      # routing.cpp
+      # organgui.h
+      ${PROJECT_SOURCE_DIR}/muse/xml.cpp
+
+      ${organ_mocs}
+      ${organ_uis}
+      )
+
+# - tell cmake to name target organ.so instead of
+#   liborgan.so
+# - use precompiled header files
+#
+set_target_properties ( organ
+   PROPERTIES PREFIX ""
+   COMPILE_FLAGS "-O2 -include ${PROJECT_BINARY_DIR}/all-pic.h"
+   )
+
+target_link_libraries(organ
+      synti
+      # awl
+      ${QT_LIBRARIES}
+      )
+
+install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/synthi/ organ )
+
diff --git a/muse2/synti/s1/CMakeLists.txt b/muse2/synti/s1/CMakeLists.txt
new file mode 100644
index 00000000..fe5a3393
--- /dev/null
+++ b/muse2/synti/s1/CMakeLists.txt
@@ -0,0 +1,34 @@
+#=============================================================================
+#  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.
+#=============================================================================
+
+add_library ( s1 SHARED s1.cpp )
+
+target_link_libraries( s1 synti )
+
+# tell cmake to name target s1.so instead of 
+# libs1.so
+#
+set_target_properties ( s1 PROPERTIES PREFIX "" )
+
+target_link_libraries(s1
+      synti
+      )
+install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/synthi/ s1 )
+
diff --git a/muse2/synti/simpledrums/CMakeLists.txt b/muse2/synti/simpledrums/CMakeLists.txt
new file mode 100644
index 00000000..696389c6
--- /dev/null
+++ b/muse2/synti/simpledrums/CMakeLists.txt
@@ -0,0 +1,53 @@
+#=============================================================================
+#  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.
+#=============================================================================
+
+QT4_WRAP_CPP ( simpledrums_mocs simpledrumsgui.h ssplugingui.h )
+# QT4_WRAP_UI (  simpledrums_uis simpledrumsguibase.ui sspluginchooserbase.ui )
+QT4_WRAP_UI3 (  simpledrums_uis simpledrumsguibase.ui sspluginchooserbase.ui )
+
+add_library ( simpledrums SHARED
+      simpledrums.cpp
+      simpledrumsgui.cpp
+      simpledrums.h
+      ssplugin.cpp
+      ssplugingui.cpp
+      ssplugin.h
+      common.h
+      ${simpledrums_mocs}
+      ${simpledrums_uis}
+      )
+
+# - tell cmake to name target simpledrums.so instead of
+#   libsimpledrums.so
+# - use precompiled header files
+#
+set_target_properties ( simpledrums
+   PROPERTIES PREFIX ""
+   COMPILE_FLAGS "-O6 -include ${PROJECT_BINARY_DIR}/all-pic.h"
+   )
+
+target_link_libraries(simpledrums
+      synti
+#      awl
+      ${QT_LIBRARIES}
+      )
+
+install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/synthi/ simpledrums )
+
diff --git a/muse2/synti/vam/CMakeLists.txt b/muse2/synti/vam/CMakeLists.txt
new file mode 100644
index 00000000..f707dc43
--- /dev/null
+++ b/muse2/synti/vam/CMakeLists.txt
@@ -0,0 +1,51 @@
+#=============================================================================
+#  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.
+#=============================================================================
+
+QT4_WRAP_CPP ( vam_mocs vamgui.h )
+# QT4_WRAP_UI (  vam_uis vamgui.ui )
+QT4_WRAP_UI3 (  vam_uis vamguibase.ui ) 
+
+add_library ( vam SHARED 
+      vam.cpp 
+      vamgui.cpp
+      vamgui.h
+      ${vam_mocs}
+      ${vam_uis}
+      )
+
+target_link_libraries( vam synti )
+
+# - tell cmake to name target vam.so instead of 
+#   libvam.so
+# - use precompiled header files
+#
+set_target_properties ( vam 
+   PROPERTIES PREFIX ""
+   COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all-pic.h"
+   )
+
+target_link_libraries(vam
+      # al
+      synti
+      ${QT_LIBRARIES}
+      )
+
+install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/synthi/ vam )
+