See ChangeLog

29 files changed, 1388 insertions, 7 deletions

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
       };