See ChangeLog

6 files changed, 43 insertions, 34 deletions

diff --git a/muse2/muse/CMakeLists.txt b/muse2/muse/CMakeLists.txt
index 192dc7e1..124c979c 100644
--- a/muse2/muse/CMakeLists.txt
+++ b/muse2/muse/CMakeLists.txt
@@ -280,9 +280,9 @@ add_executable ( muse
       )
 
 # AM_CXXFLAGS +=-DSVNVERSION=\"$(shell svnversion)\"
-EXEC_PROGRAM( svnversion
-      ARGS ${PROJECT_SOURCE_DIR}
-      OUTPUT_VARIABLE SVNVER )
+# 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)
@@ -297,7 +297,8 @@ include_directories(
 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 "
+      # PROPERTIES COMPILE_FLAGS "${PYREM_CPP_FLAGS} -DINSTPREFIX='\"${CMAKE_INSTALL_PREFIX}\"' -DINSTLIBDIR='\"${LIBRARY_OUTPUT_DIRECTORY}\"' -DSVNVERSION='\"${SVNVER}\"' -include ${PROJECT_BINARY_DIR}/all.h "
+      PROPERTIES COMPILE_FLAGS "${PYREM_CPP_FLAGS} -include ${PROJECT_BINARY_DIR}/all.h "
       OUTPUT_NAME muse2
       )
 
diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp
index a4df0d3f..4a3d79a3 100644
--- a/muse2/muse/app.cpp
+++ b/muse2/muse/app.cpp
@@ -3227,17 +3227,26 @@ int main(int argc, char* argv[])
             museGlobal = p;
 
       if (museGlobal.isEmpty()) {
-            QString museGlobal(INSTPREFIX);
-            QString museGlobalLibDir(INSTLIBDIR);
-            
+            //QString museGlobal(INSTPREFIX);
+            //QString museGlobalLibDir(INSTLIBDIR); 
+            //QString museGlobalLibDir(LIBINSTPREFIX); // This has no prefix.
             //museGlobalLib   =  museGlobalLibDir + "/muse";
             //museGlobalShare =  museGlobal + "/share/muse";
-            museGlobalLib   =  museGlobalLibDir + QString("/") + QString(INSTALL_NAME);   // p4.0.2
-            museGlobalShare =  museGlobal + QString("/share/") + QString(INSTALL_NAME);   //
+            
+            // p4.0.7
+            museGlobalLib   =  QString(INSTPREFIX) + QString("/") +
+                               QString(LIBINSTPREFIX) + QString("/") + 
+                               QString(INSTALL_NAME);   
+            //museGlobalShare =  museGlobal + QString("/share/") + QString(INSTALL_NAME);   
+            museGlobalShare =  QString(INSTPREFIX) + QString("/") +                                             
+                               QString(SHAREINSTPREFIX) + QString("/") +  // This has no prefix. Default is "share", set in top cmake script.
+                               QString(INSTALL_NAME);   
             }
       else {
-            museGlobalLib   = museGlobal + "/lib";
-            museGlobalShare = museGlobal + "/share";
+            //museGlobalLib   = museGlobal + "/lib";
+            //museGlobalShare = museGlobal + "/share";
+            museGlobalLib   = museGlobal + QString("/") + QString(LIBINSTPREFIX);    // p4.0.7
+            museGlobalShare = museGlobal + QString("/") + QString(SHAREINSTPREFIX);
             }
       museProject = museProjectInitPath; //getcwd(0, 0);
       configName  = QString(getenv("HOME")) + QString("/.MusE");
diff --git a/muse2/muse/midiedit/pianoroll.cpp b/muse2/muse/midiedit/pianoroll.cpp
index 4d2540d7..22d9c55e 100644
--- a/muse2/muse/midiedit/pianoroll.cpp
+++ b/muse2/muse/midiedit/pianoroll.cpp
@@ -278,7 +278,7 @@ PianoRoll::PianoRoll(PartList* pl, QWidget* parent, const char* name, unsigned i
       connect(hscroll, SIGNAL(scaleChanged(int)),  canvas,   SLOT(setXMag(int)));
       connect(hscroll, SIGNAL(scaleChanged(int)),  time,     SLOT(setXMag(int)));
 
-      connect(canvas, SIGNAL(pitchChanged(int)), piano, SLOT(setPitch(int)));
+      connect(canvas, SIGNAL(pitchChanged(int)), piano, SLOT(setPitch(int)));   
       connect(canvas, SIGNAL(verticalScroll(unsigned)), vscroll, SLOT(setPos(unsigned)));
       connect(canvas,  SIGNAL(horizontalScroll(unsigned)),hscroll, SLOT(setPos(unsigned)));
       connect(canvas,  SIGNAL(horizontalScrollNoLimit(unsigned)),hscroll, SLOT(setPosNoLimit(unsigned))); 
@@ -305,7 +305,7 @@ PianoRoll::PianoRoll(PartList* pl, QWidget* parent, const char* name, unsigned i
       
       updateHScrollRange();
       // connect to toolbar
-      connect(canvas,   SIGNAL(pitchChanged(int)), toolbar, SLOT(setPitch(int)));
+      connect(canvas,   SIGNAL(pitchChanged(int)), toolbar, SLOT(setPitch(int)));  
       connect(canvas,   SIGNAL(timeChanged(unsigned)),  SLOT(setTime(unsigned)));
       connect(piano,    SIGNAL(pitchChanged(int)), toolbar, SLOT(setPitch(int)));
       connect(time,     SIGNAL(timeChanged(unsigned)),  SLOT(setTime(unsigned)));
@@ -407,8 +407,8 @@ void PianoRoll::follow(int pos)
 
 void PianoRoll::setTime(unsigned tick)
       {
-      toolbar->setTime(tick);
-      time->setPos(3, tick, false);
+      toolbar->setTime(tick);                      
+      time->setPos(3, tick, false);               
       }
 
 //---------------------------------------------------------
diff --git a/muse2/muse/synth.cpp b/muse2/muse/synth.cpp
index f62a0627..4d377fb4 100644
--- a/muse2/muse/synth.cpp
+++ b/muse2/muse/synth.cpp
@@ -511,8 +511,7 @@ void initMidiSynth()
                   // load Synti dll
                   void* handle = dlopen(path, RTLD_NOW);
                   if (handle == 0) {
-                        //fprintf(stderr, "initMidiSynth: dlopen(%s) failed: %s\n",
-                        //  path, dlerror());
+                        fprintf(stderr, "initMidiSynth: MESS dlopen(%s) failed: %s\n", path, dlerror());
                         //undoSetuid();
                         //return 0;
                         ++it;
@@ -522,23 +521,25 @@ void initMidiSynth()
                   MESS_Function msynth = (MESS_Function)dlsym(handle, "mess_descriptor");
             
                   if (!msynth) {
-                        //const char *txt = dlerror();
-                        //if (txt) {
-                        //      fprintf(stderr,
-                        //        "Unable to find msynth_descriptor() function in plugin "
-                        //        "library file \"%s\": %s.\n"
-                        //        "Are you sure this is a MESS plugin file?\n",
-                        //        info.filePath().ascii(), txt);
+                        #if 1
+                        const char *txt = dlerror();
+                        if (txt) {
+                              fprintf(stderr,
+                                "Unable to find msynth_descriptor() function in plugin "
+                                "library file \"%s\": %s.\n"
+                                "Are you sure this is a MESS plugin file?\n",
+                                path, txt);
                               //undoSetuid();
                               //return 0;
-                        //      }
+                              }
+                        #endif      
                           dlclose(handle);
                           ++it;
                           continue;
                         }
                   const MESS* descr = msynth();
                   if (descr == 0) {
-                        //fprintf(stderr, "Synth::instantiate: no MESS descr found\n");
+                        fprintf(stderr, "initMidiSynth: no MESS descr found in %s\n", path);
                         //undoSetuid();
                         //return 0;
                         dlclose(handle);
diff --git a/muse2/muse/widgets/CMakeLists.txt b/muse2/muse/widgets/CMakeLists.txt
index b9ce1e55..e58d8c8e 100644
--- a/muse2/muse/widgets/CMakeLists.txt
+++ b/muse2/muse/widgets/CMakeLists.txt
@@ -125,9 +125,6 @@ QT4_WRAP_CPP (widget_mocs
       shortcutcapturedialog.h  
       combobox.h  
       aboutbox_impl.h 
-      # aboutbox.h  
-      # songinfo.h  
-      # didyouknow.h  
       checkbox.h  
       vscale.h  
       action.h
@@ -234,19 +231,19 @@ add_library ( widgets STATIC
       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 )
+# 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 "
+   # PROPERTIES COMPILE_FLAGS "-DSVNVERSION='\"${SVNVER}\"' -include ${PROJECT_BINARY_DIR}/all.h ${MUSECXXFLAGS} -I../ -I${PROJECT_SOURCE_DIR}/synti "
+   PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h ${MUSECXXFLAGS} -I../ -I${PROJECT_SOURCE_DIR}/synti "
    )
 
 
diff --git a/muse2/muse/widgets/mtscale.cpp b/muse2/muse/widgets/mtscale.cpp
index 42d04275..425c8bf1 100644
--- a/muse2/muse/widgets/mtscale.cpp
+++ b/muse2/muse/widgets/mtscale.cpp
@@ -155,6 +155,7 @@ void MTScale::viewMouseMoveEvent(QMouseEvent* event)
       x = sigmap.raster(x, *raster);
       if (x < 0)
             x = 0;
+      //printf("MTScale::viewMouseMoveEvent\n");  
       emit timeChanged(x);
       int i;
       switch (button) {