From 760c21462a1fe1bd460cc98ea5209e8a270c411e Mon Sep 17 00:00:00 2001
From: Robert Jonsson <spamatica@gmail.com>
Date: Sun, 17 Feb 2013 21:25:55 +0000
Subject: patch from Willy Foobar

---
 muse2/ChangeLog             | 2 ++
 muse2/muse/driver/jack.cpp  | 4 ++--
 muse2/muse/remote/pyapi.cpp | 2 +-
 muse2/muse/song.cpp         | 2 +-
 muse2/synti/s1/s1.cpp       | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'muse2')

diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index 8cfe3cd2..0da8cdcb 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -1,3 +1,5 @@
+17.02.2013
+         - Added patch from Willy Foobar to remove warnings from compilation (rj)
 13.02.2013:
          * Added basic theme support selection, currently two themes selectable, light and dark (rj)
 07.02.2013:
diff --git a/muse2/muse/driver/jack.cpp b/muse2/muse/driver/jack.cpp
index f3e6be20..3deaf160 100644
--- a/muse2/muse/driver/jack.cpp
+++ b/muse2/muse/driver/jack.cpp
@@ -229,7 +229,7 @@ static int processSync(jack_transport_state_t state, jack_position_t* pos, void*
               
               audioState = Audio::START_PLAY;
             break;  
-            //case JackTransportNetStarting:  
+            //case JackTransportNetStarting: -- only available in Jack-2!
             // FIXME: Quick and dirty hack to support both Jack-1 and Jack-2
             // Really need a config check of version...
             case 4:  
@@ -1603,7 +1603,7 @@ int JackAudioDevice::getState()
               //printf("JackAudioDevice::getState JackTransportStarting\n");
               
               return Audio::START_PLAY;
-            //case JackTransportNetStarting:  
+            //case JackTransportNetStarting: -- only available in Jack-2!
             // FIXME: Quick and dirty hack to support both Jack-1 and Jack-2
             // Really need a config check of version...
             case 4:  
diff --git a/muse2/muse/remote/pyapi.cpp b/muse2/muse/remote/pyapi.cpp
index 2a10afa4..7e03fa0e 100644
--- a/muse2/muse/remote/pyapi.cpp
+++ b/muse2/muse/remote/pyapi.cpp
@@ -980,7 +980,7 @@ PyMethodDef g_methodDefinitions[] =
 
       { "getDivision", getDivision, METH_VARARGS, "Number of ticks per 1/4 (?)" },
 
-      {NULL, NULL, NULL, NULL}
+      {NULL, NULL, 0, NULL}
 };
 
 /**
diff --git a/muse2/muse/song.cpp b/muse2/muse/song.cpp
index 1ef45cd1..412b52f1 100644
--- a/muse2/muse/song.cpp
+++ b/muse2/muse/song.cpp
@@ -1385,7 +1385,7 @@ void Song::update(MusECore::SongChangedFlags_t flags, bool allowRecursion)
       if (level && !allowRecursion) {
             printf("THIS SHOULD NEVER HAPPEN: unallowed recursion in Song::update(%08lx), level %d!\n"
                    "                          the songChanged() signal is NOT emitted. this will\n"
-                   "                          probably cause windows being not up-to-date.\n", flags, level);
+                   "                          probably cause windows being not up-to-date.\n", (unsigned long)flags, level);
             return;
             }
       ++level;
diff --git a/muse2/synti/s1/s1.cpp b/muse2/synti/s1/s1.cpp
index ceec6de6..8dd40ff8 100644
--- a/muse2/synti/s1/s1.cpp
+++ b/muse2/synti/s1/s1.cpp
@@ -227,7 +227,7 @@ int S1::getControllerInfo(int id, const char** name, int* ctrl, int* min, int* m
 class QWidget;
 
 
-static Mess* instantiate(int sr, QWidget*, QString* projectPathPtr, const char*)
+static Mess* instantiate(int sr, QWidget*, QString* /* projectPathPtr */, const char*)
       {
       S1* s1 = new S1();
       s1->setSampleRate(sr);
-- 
cgit v1.2.3