From ac54fcdac2c055070b2e0c16dbfde137cb8ce342 Mon Sep 17 00:00:00 2001
From: Lukas W <lukaswhl@googlemail.com>
Date: Fri, 24 Jan 2014 22:04:37 +0100
Subject: [PATCH] Fix some warnings

---
 CMakeLists.txt                               | 1 +
 include/debug.h                              | 8 +++++---
 plugins/midi_import/portsmf/allegro.cpp      | 9 +++++----
 plugins/midi_import/portsmf/allegro.h        | 2 +-
 plugins/midi_import/portsmf/allegrord.cpp    | 2 +-
 plugins/midi_import/portsmf/allegrosmfrd.cpp | 2 +-
 plugins/midi_import/portsmf/allegrowr.cpp    | 2 +-
 7 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 92e5d6b67..33834d041 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -335,6 +335,7 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/plugins/zynaddsubfx/zynaddsubfx.rc.in ${CMAKE
 SET(WERROR_FLAGS "-Wall -Werror -Werror=unused-function -Wno-sign-compare -Wno-strict-overflow")
 SET(CMAKE_C_FLAGS "-O2 -g ${WERROR_FLAGS} ${CMAKE_C_FLAGS}")
 SET(CMAKE_CXX_FLAGS "-O2 -g -fno-exceptions ${WERROR_FLAGS} ${CMAKE_CXX_FLAGS}")
+set(CMAKE_C_FLAGS_DEBUG "-DLMMS_DEBUG")
 
 
 # people simply updating git will still have this and mess up build with it
diff --git a/include/debug.h b/include/debug.h
index 1b2b3b2bc..64b1a8886 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -31,10 +31,12 @@
 // set whether debug-stuff (like messages on the console, asserts and other
 // additional range-checkings) should be compiled
 
-/*#ifdef LMMS_DEBUG*/
-#include <assert.h>
+#ifdef LMMS_DEBUG
+	#include <assert.h>
+#else
+	#define assert(x) ((void)(x))
+#endif
 #include <cstdio>
-/*#endif*/
 
 
 #endif
diff --git a/plugins/midi_import/portsmf/allegro.cpp b/plugins/midi_import/portsmf/allegro.cpp
index d193a3c9d..c05f279e9 100644
--- a/plugins/midi_import/portsmf/allegro.cpp
+++ b/plugins/midi_import/portsmf/allegro.cpp
@@ -9,7 +9,7 @@
 04 apr 03 -- fixed bug in add_track that caused infinite loop
 */
 
-#include "assert.h"
+#include "debug.h"
 #include "stdlib.h"
 #include "stdio.h"
 #include "string.h"
@@ -727,8 +727,8 @@ void Alg_event_list::set_start_time(Alg_event *event, double t)
     // For Alg_track, change the time and move the event to the right place
     // For Alg_seq, find the track and do the update there
     
-    long index, i;
-    Alg_track_ptr track_ptr;
+	long index = 0, i;
+	Alg_track_ptr track_ptr = Alg_track_ptr();
     if (type == 'e') { // this is an Alg_event_list
         // make sure the owner has not changed its event set
         assert(events_owner && 
@@ -2283,6 +2283,7 @@ Alg_track_ptr Alg_seq::track(int i)
 }
 
 
+#pragma GCC diagnostic ignored "-Wreturn-type" // ok not to return a value here
 Alg_event_ptr &Alg_seq::operator[](int i) 
 {
     int ntracks = track_list.length();
@@ -2296,7 +2297,7 @@ Alg_event_ptr &Alg_seq::operator[](int i)
         }
         tr++;
     }
-    assert(false); // out of bounds
+	assert(false); // out of bounds
 }
 
 
diff --git a/plugins/midi_import/portsmf/allegro.h b/plugins/midi_import/portsmf/allegro.h
index 51a7b29c0..e83d4b463 100644
--- a/plugins/midi_import/portsmf/allegro.h
+++ b/plugins/midi_import/portsmf/allegro.h
@@ -48,7 +48,7 @@
 
 #ifndef __ALLEGRO__
 #define __ALLEGRO__
-#include <assert.h>
+#include "debug.h"
 
 #include "lmmsconfig.h"
 
diff --git a/plugins/midi_import/portsmf/allegrord.cpp b/plugins/midi_import/portsmf/allegrord.cpp
index 9d6b9f2c1..7a1f5beed 100644
--- a/plugins/midi_import/portsmf/allegrord.cpp
+++ b/plugins/midi_import/portsmf/allegrord.cpp
@@ -1,4 +1,4 @@
-#include "assert.h"
+#include "debug.h"
 #include "stdlib.h"
 #include "string.h"
 #include "ctype.h"
diff --git a/plugins/midi_import/portsmf/allegrosmfrd.cpp b/plugins/midi_import/portsmf/allegrosmfrd.cpp
index 813ecd79f..49e2ef03e 100644
--- a/plugins/midi_import/portsmf/allegrosmfrd.cpp
+++ b/plugins/midi_import/portsmf/allegrosmfrd.cpp
@@ -3,7 +3,7 @@
 #include "stdlib.h"
 #include "stdio.h"
 #include "string.h"
-#include "assert.h"
+#include "debug.h"
 #include <string>
 #include <fstream>
 #include "allegro.h"
diff --git a/plugins/midi_import/portsmf/allegrowr.cpp b/plugins/midi_import/portsmf/allegrowr.cpp
index f4a76f18a..3b266f84c 100644
--- a/plugins/midi_import/portsmf/allegrowr.cpp
+++ b/plugins/midi_import/portsmf/allegrowr.cpp
@@ -1,6 +1,6 @@
 // allegrowr.cpp -- write sequence to an Allegro file (text)
 
-#include "assert.h"
+#include "debug.h"
 #include "stdlib.h"
 #include <iostream>
 #include <fstream>