Merge pull request #134 from Lukas-W/stable-0.4-travis

Set build type to RelWithDebInfo

.travis.yml

@@ -3,4 +3,4 @@ compiler: gcc
 before_install: sudo apt-get update
 install: sudo apt-get install libqt4-dev libsndfile-dev fftw3-dev libvorbis-dev libogg-dev libasound2-dev libjack-dev libsdl-dev libsamplerate0-dev libstk0-dev libfluidsynth-dev portaudio19-dev wine-dev g++-multilib
 before_script: mkdir build && cd build
-script: cmake .. && make -j8
+script: cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .. && make -j8

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

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

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
 }
 
 

plugins/midi_import/portsmf/allegro.h

@@ -48,7 +48,7 @@
 
 #ifndef __ALLEGRO__
 #define __ALLEGRO__
-#include <assert.h>
+#include "debug.h"
 
 #include "lmmsconfig.h"
 

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"

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"

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>