cmake updates

7 files changed, 68 insertions, 77 deletions

diff --git a/muse/CMakeLists.txt b/muse/CMakeLists.txt
index cfde7f08..2843094e 100644
--- a/muse/CMakeLists.txt
+++ b/muse/CMakeLists.txt
@@ -24,7 +24,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4.1)
 # set(CMAKE_BUILD_TYPE Debug)
 set(CMAKE_BUILD_TYPE Release)
 
-set(CMAKE_VERBOSE_MAKEFILE ON)
 set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
 set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
@@ -44,7 +43,7 @@ option ( ENABLE_VST    "enable VST/win support"                 OFF)
 option ( ENABLE_FLUID  "enable fluidsynth softsynth plugins"    ON)
 
 # for debugging the make system uncomment next line:
-set(CMAKE_VERBOSE_MAKEFILE ON)
+#set(CMAKE_VERBOSE_MAKEFILE ON)
 
 set(QT_USE_QTXML TRUE)
 set(QT_USE_QTDESIGNER TRUE)
diff --git a/muse/README b/muse/README
index a42f52ea..3117b592 100644
--- a/muse/README
+++ b/muse/README
@@ -1,3 +1,4 @@
+
 ====================================================================
       MusE  ---  Linux Music Editor
 ====================================================================
diff --git a/muse/al/sig.cpp b/muse/al/sig.cpp
index 345cd43e..3da44eb2 100644
--- a/muse/al/sig.cpp
+++ b/muse/al/sig.cpp
@@ -213,7 +213,7 @@ void SigList::tickValues(unsigned t, int* bar, int* beat, unsigned* tick) const
       {
       ciSigEvent e = upper_bound(t);
       if (e == end()) {
-            fprintf(stderr, "tickValues(0x%x) not found(%d)\n", t, size());
+            fprintf(stderr, "tickValues(0x%x) not found(%zd)\n", t, size());
 //DEBUG
 // abort();
             *bar = 0;
diff --git a/muse/muse/CMakeLists.txt b/muse/muse/CMakeLists.txt
index 2490cdb8..d3bb0d5c 100644
--- a/muse/muse/CMakeLists.txt
+++ b/muse/muse/CMakeLists.txt
@@ -98,7 +98,7 @@ WRAP_CPP(muse_mocCPP ${muse_mocs})
 WRAP_UI(muse_uiUI ${muse_uics})
 
 QT4_WRAP_CPP (muse_moc_headers ${muse_mocH})
-QT4_WRAP_UI (ui_headers ${muse_uiUI})
+QT4_WRAP_UI  (ui_headers ${muse_uiUI})
 QT4_ADD_RESOURCES (qrc_files muse.qrc)
 
 add_executable ( muse
@@ -122,6 +122,7 @@ add_executable ( muse
 
       ${muse_mocCPP}
       ${muse_moc_headers}
+      ${ui_headers}
       )
 
 set_target_properties( muse
diff --git a/muse/muse/instruments/CMakeLists.txt b/muse/muse/instruments/CMakeLists.txt
index 87a691c5..4aa0b60d 100644
--- a/muse/muse/instruments/CMakeLists.txt
+++ b/muse/muse/instruments/CMakeLists.txt
@@ -1,45 +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.
+#=============================================================================
 
-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
-      minstrument editinstrument
-      )
-
-WRAP_H(mocH ${mocs})
-WRAP_CPP(mocCPP ${mocs})
-
-QT4_WRAP_CPP (moc_headers ${mocH})
+QT4_WRAP_CPP ( instruments_mocs
+   minstrument.h editinstrument.h
+   )
 
-set (uics
-      editinstrument
+QT4_WRAP_UI ( instruments_ui_headers 
+      editinstrument.ui 
       )
 
-WRAP_UI(uiUI ${uics})
-QT4_WRAP_UI (ui_headers ${uiUI})
-
-set ( instruments_src ${mocCPP} ${moc_headers})
+add_library ( instruments STATIC 
+   minstrument.cpp 
+   editinstrument.cpp
+   minstrument.h 
+   editinstrument.h
+   ${instruments_mocs}
+   ${instruments_ui_headers}
+   )
 
-add_library ( instruments STATIC ${instruments_src})
 set_target_properties( instruments
    PROPERTIES COMPILE_FLAGS "-include ${PROJECT_SOURCE_DIR}/all.h"
    )
diff --git a/muse/muse/liste/CMakeLists.txt b/muse/muse/liste/CMakeLists.txt
index a56df4b0..ad2be64c 100644
--- a/muse/muse/liste/CMakeLists.txt
+++ b/muse/muse/liste/CMakeLists.txt
@@ -1,45 +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.
 #
-
-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
-      listedit editevent
+#  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 editevent.h 
+#      editnotedialog.h
       )
 
-WRAP_H(mocH ${mocs})
-WRAP_CPP(mocCPP ${mocs})
-
-QT4_WRAP_CPP (moc_headers ${mocH})
-
-set (uics
-      editnotedialog
+QT4_WRAP_UI ( liste_ui_headers 
+      editnotedialog.ui 
       )
 
-WRAP_UI(uiUI ${uics})
-QT4_WRAP_UI (ui_headers ${uiUI})
-
-set ( liste_src ${mocCPP} ${moc_headers})
-
-add_library ( liste STATIC ${liste_src})
+add_library ( liste STATIC 
+      listedit.h editevent.h 
+#      editnotedialog.h
+#      editnotedialog.cpp
+      listedit.cpp editevent.cpp 
+      ${liste_mocs}
+      ${liste_ui_headers}
+      )
 set_target_properties( liste
    PROPERTIES COMPILE_FLAGS "-include ${PROJECT_SOURCE_DIR}/all.h"
    )
diff --git a/muse/muse/muse.cpp b/muse/muse/muse.cpp
index 6812a9f9..3656a773 100644
--- a/muse/muse/muse.cpp
+++ b/muse/muse/muse.cpp
@@ -211,13 +211,13 @@ bool MusE::seqStart()
       //
       //  create midi thread with a higher priority than JACK
       //
-      midiSeq->start(realTimePriority ? realTimePriority + 1 : 0);
+      midiSeq->start(realTimePriority ? realTimePriority + 2 : 0);
 
       if (realTimePriority) {
             //
             //  create watchdog thread with realTimePriority+2
             //
-            int priority = realTimePriority + 2;
+            int priority = realTimePriority + 3;
             struct sched_param rt_param;
             memset(&rt_param, 0, sizeof(rt_param));
             rt_param.sched_priority = priority;
@@ -248,15 +248,15 @@ bool MusE::seqStart()
       // start audio prefetch threads with realtime
       // priority
       //
-      audioPrefetch->start(0);
-      audioWriteback->start(0);
+      audioPrefetch->start(realTimePriority-5);
+      audioWriteback->start(realTimePriority-5);
 #else
       //
       // start audio prefetch threads as normal
       // (non realtime) threads
       //
-      audioPrefetch->start(realTimePriority-5);
-      audioWriteback->start(realTimePriority-5);
+      audioPrefetch->start(0);
+      audioWriteback->start(0);
 #endif
       audioState = AUDIO_RUNNING;
       //