NDEBUG/assert fix + misc minor fixes

CMakeLists.txt

@@ -7,7 +7,7 @@ endif (COMMAND CMAKE_POLICY)
 project(Petri-Foo)
 
 set(Petri-Foo_VERSION_MAJOR 1)
-set(Petri-Foo_VERSION_MINOR 86)
+set(Petri-Foo_VERSION_MINOR 87)
 set(BINDIR  "bin" CACHE STRING "Where to install binaries")
 set(DATADIR "share/petri-foo" CACHE STRING "Where to install data files")
 set(APPLICATIONS_DIR "share/applications" CACHE STRING "Where to install desktop files")
@@ -34,6 +34,11 @@ mark_as_advanced(CMAKE_INSTALL_PREFIX)
 option (BuildForDebug "Include gdb debugging support" OFF)
 option (GtkDeprecatedChecks "Check against use of API deprecated in GTK3" OFF)
 
+if (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/sandbox )
+    option (BuildSandbox "Build sandbox test code " OFF)
+endif (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/sandbox )
+
+
 # DEBUG
 set (BuildOptionsDebug "-O0 -ggdb" CACHE STRING "Debug build flags")
 
@@ -56,7 +61,13 @@ else (BuildForDebug)
 endif (BuildForDebug)
 
 if (GtkDeprecatedChecks)
-    add_definitions(-DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGSEAL_ENABLE -DGTK_DISABLE_SINGLE_INCLUDES)
+    add_definitions(
+        -DGDK_PIXBUF_DISABLE_DEPRECATED
+        -DGTK_DISABLE_DEPRECATED
+        -DGDK_DISABLE_DEPRECATED
+        -DGSEAL_ENABLE
+        -DGTK_DISABLE_SINGLE_INCLUDES)
+    message (STATUS "Building with GTK_DISABLE_DEPRECATED...")
 endif (GtkDeprecatedChecks)
 
 
@@ -75,7 +86,6 @@ endif (JACK_FOUND)
 include (FindALSA)
 
 
-
 # SNDFILE
 pkg_check_modules (SNDFILE REQUIRED sndfile)
 if (SNDFILE_FOUND)
@@ -160,12 +170,12 @@ ADD_SUBDIRECTORY( libphin )
 ADD_SUBDIRECTORY( gui )
 
 
-if (BuildForDebug)
+if (BuildSandbox)
     if (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/sandbox )
         message( STATUS "Will build sandbox test target" )
         ADD_SUBDIRECTORY( sandbox )
     endif (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/sandbox )
-endif (BuildForDebug)
+endif (BuildSandbox)
 
 #ADD_SUBDIRECTORY( pixmaps )
 

ChangeLog

@@ -1,3 +1,35 @@
+2012-08-06 James Morris <james@jwm-art.net>
+
+	* patch_set_and_get.c, lfopar_from_id: found nasty side
+	  effect where an lfo id was calculated from a modulation
+	  source id from within an assert... eeek!
+
+	* gui/mod_section.[ch]: remove mod_section_set_list_*
+	  these two functions were unused.
+
+	* midi.c: replace some debug with errmsg.
+
+	* patch_private/ move initialization of adsr parameters
+	  from within patch_data.c to patch_voice.c
+
+	* make building of "sandbox test code" into an option
+	  no longer dependant on debug build.
+
+
+2012-08-05 James Morris <james@jwm-art.net>
+
+	* only get port data when auto-connect, plus
+	  free data obtained.
+
+	* don't resample audio files when JACK is not
+	  running (for debug/test).
+
+	* remove MODAL property from audio-settings
+	  dialog.
+
+	* #define NDEBUG so assert are disabled when
+	  building for release.
+
 2012-08-02 James Morris <james@jwm-art.net>
 
 	* dish_file.c: call xmlFreeDoc on sucessful read.

config.h.in

@@ -11,6 +11,10 @@
 
 #cmakedefine DEBUG 1
 
+#if !DEBUG
+#define NDEBUG
+#endif
+
 #cmakedefine HAVE_MALLOC_H 1
 #cmakedefine HAVE_JACK_SESSION_H 1
 #cmakedefine HAVE_CAIRO_OPERATOR_HSL 1

gui/audio-settings.c

@@ -98,7 +98,7 @@ void audio_settings_init (GtkWidget* parent)
     window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
     gtk_window_set_title(GTK_WINDOW (window), "Audio Settings");
     gtk_window_set_transient_for(GTK_WINDOW(window), GTK_WINDOW(parent));
-    gtk_window_set_modal (GTK_WINDOW (window), TRUE);
+    gtk_window_set_modal (GTK_WINDOW (window), FALSE);
     g_signal_connect(GTK_WINDOW(window), "delete-event",
                                 G_CALLBACK(cb_close), NULL);
 

gui/lfotab.c

@@ -410,6 +410,7 @@ static void lfo_tab_init(LfoTab* self)
                     ID_SELECTOR_V);
 
     mod_src_free(lfo_ids);
+    lfo_ids = 0;
 
     gui_pack(selfbox, p->idsel);
     gui_pack(selfbox, gui_hpad_new(GUI_SECSPACE));

gui/mod_section.c

@@ -409,29 +409,6 @@ void mod_section_set_param(ModSection* self, PatchParamType param)
 }
 
 
-void mod_section_set_list_global(ModSection* self)
-{
-    ModSectionPrivate* p = MOD_SECTION_GET_PRIVATE(self);
-    int i;
-
-    for (i = 0; i < MAX_MOD_SLOTS; ++i)
-        mod_src_combo_set_model(GTK_COMBO_BOX(p->mod_combo[i]),
-                                    MOD_SRC_GLOBALS);
-}
-
-
-void mod_section_set_list_all(ModSection* self)
-{
-    ModSectionPrivate* p = MOD_SECTION_GET_PRIVATE(self);
-
-    int i;
-
-    for (i = 0; i < MAX_MOD_SLOTS; ++i)
-        mod_src_combo_set_model(GTK_COMBO_BOX(p->mod_combo[i]),
-                                    MOD_SRC_ALL);
-}
-
-
 GtkWidget* mod_section_new(void)
 {
     return (GtkWidget*)g_object_new(MOD_SECTION_TYPE, NULL);

gui/mod_section.h

@@ -66,8 +66,6 @@ void        mod_section_set_mod_only(ModSection*);
 void        mod_section_set_param(ModSection*, PatchParamType);
 
 void        mod_section_set_lfo_id(ModSection*, int lfo_id);
-void        mod_section_set_list_global(ModSection*);
-void        mod_section_set_list_all(ModSection*);
 
 void        mod_section_set_patch(ModSection*, int patch_id);
 

gui/mod_src_gui.c

@@ -56,7 +56,6 @@ static void mod_src_create_models(void)
     mod_src_list_global = gtk_list_store_new(N_COLUMNS,
                                              G_TYPE_STRING,
                                              G_TYPE_INT);
-
     mod_src_ids = mod_src_get(MOD_SRC_ALL);
 
     for (msp = mod_src_ids; msp->name; ++msp)
@@ -84,7 +83,7 @@ static void mod_src_create_models(void)
 }
 
 
-GtkWidget* mod_src_new_combo_with_cell()
+GtkWidget* mod_src_new_combo_with_cell(void)
 {
     GtkWidget*          combo;
     GtkCellRenderer*    cell;

gui/mod_src_gui.h

@@ -32,7 +32,7 @@ enum {
 
 
 
-GtkWidget*      mod_src_new_combo_with_cell();
+GtkWidget*      mod_src_new_combo_with_cell(void);
 
 /*  mod_src_new_pitch_adjustment
         creates a phin slider button with semitones label within.

libpetrifoo/jackdriver.c

@@ -62,8 +62,8 @@ static jack_port_t*     rport;
 static jack_port_t*     midiport;
 
 
-static jack_client_t*   client;
-static float*           buffer;
+static jack_client_t*   client = 0;
+static float*           buffer = 0;
 static int              rate = 44100;
 static int              periodsize = 2048;
 static int              running = 0;
@@ -244,7 +244,6 @@ static void init(void)
 
 static int start(void)
 {
-    const char** ports;
     const char* instancename = get_instance_name();
     jack_status_t status;
 
@@ -279,7 +278,7 @@ static int start(void)
 
     mixer_set_jack_client(jackdriver_get_client());
 
-    jack_set_process_callback (client, process, 0);
+    jack_set_process_callback(client, process, 0);
 
     #if HAVE_JACK_SESSION_H
     if (!disable_jacksession && jack_set_session_callback)
@@ -292,7 +291,7 @@ static int start(void)
     }
     #endif
 
-    jack_on_shutdown (client, shutdown, 0);
+    jack_on_shutdown(client, shutdown, 0);
 
     lport = jack_port_register( client,
                                 "out_left",
@@ -338,35 +337,31 @@ static int start(void)
         return -1;
     }
 
-    ports = jack_get_ports(client, NULL, NULL,
-                            JackPortIsInput | JackPortIsPhysical);
-
     if (autoconnect)
     {
-        if (ports[0] != NULL)
+        const char** ports = jack_get_ports(client, NULL, NULL,
+                                    JackPortIsInput | JackPortIsPhysical);
+        if (ports)
         {
-            if (jack_connect(client, jack_port_name(lport), ports[0]))
+            if (!ports[0]
+             || jack_connect(client, jack_port_name(lport), ports[0]) != 0)
             {
-                debug("JACK failed to connect left output port\n");
+                free(ports);
+                goto ac_full_fail;
             }
 
-            if (ports[1] != NULL)
-            {
-                if (jack_connect(client, jack_port_name (rport), ports[1]))
-                {
-                    debug("JACK failed to connect right output port\n");
-                }
-            }
-            else
+            if (!ports[1]
+             || jack_connect(client, jack_port_name(rport), ports[1]) != 0)
             {
-                debug("JACK failed to connect right output port\n");
+                printf("failed to auto-connect to stereo h/w ports\n");
             }
 
-            free (ports);
+            free(ports);
         }
         else
         {
-            debug("JACK failed to connect output ports\n");
+            ac_full_fail:
+            printf("failed to auto-connect to h/w ports\n");
         }
     }
 
@@ -386,10 +381,10 @@ static int stop(void)
 
     if (running)
     {
-        debug("JACK shutting down...\n");
+        debug("JACK deactivate...\n");
         jack_deactivate (client);
+        debug("JACK close..\n");
         jack_client_close (client);
-
         debug("JACK stopped\n");
 
         if (buffer != NULL)

libpetrifoo/midi.c

@@ -167,7 +167,7 @@ static int open_seq(snd_seq_t** handle)
 
     if (snd_seq_open(handle, "default", SND_SEQ_OPEN_INPUT, 0) < 0)
     {
-        debug ("Failed to open ALSA sequencer\n");
+        errmsg("Failed to open ALSA sequencer\n");
         return MIDI_ERR_SEQ;
     }
 
@@ -179,7 +179,7 @@ static int open_seq(snd_seq_t** handle)
                                 SND_SEQ_PORT_CAP_SUBS_WRITE,
                                 SND_SEQ_PORT_TYPE_APPLICATION)) < 0)
     {
-        debug ("Failed to create ALSA sequencer port\n");
+        errmsg("Failed to create ALSA sequencer port\n");
         return MIDI_ERR_PORT;
     }
 

libpetrifoo/patch_private/patch_data.c

@@ -161,12 +161,7 @@ Patch* patch_new(void)
 
     for (i = 0; i < PATCH_VOICE_COUNT; ++i)
     {
-        int j;
-
         p->voices[i] = patch_voice_new();
-
-        for (j = 0; j < VOICE_MAX_ENVS; ++j)
-            adsr_init(p->voices[i]->env[j]);
     }
 
     p->last_note = -1;

libpetrifoo/patch_private/patch_voice.c

@@ -69,10 +69,16 @@ PatchVoice* patch_voice_new(void)
     }
 
     for (i = 0; i < VOICE_MAX_ENVS; i++)
+    {
         pv->env[i] = adsr_new();
+        adsr_init(pv->env[i]);
+    }
 
     for (i = 0; i < VOICE_MAX_LFOS; i++)
+    {
         pv->lfo[i] = lfo_new();
+        lfo_init(pv->lfo[i]);
+    }
 
     pv->fll =           0;
     pv->fbl =           0;

libpetrifoo/patch_set_and_get.c

@@ -299,11 +299,13 @@ static LFOParams* lfopar_from_id(int patch_id, int id, LFO** lfo)
 
     if (id & MOD_SRC_VLFO)
     {
-        assert ((id -= MOD_SRC_VLFO) < VOICE_MAX_LFOS);
+        id -= MOD_SRC_VLFO;
+        assert (id < VOICE_MAX_LFOS);
         return &patches[patch_id]->vlfo_params[id];
     }
 
-    assert((id -= MOD_SRC_GLFO) < PATCH_MAX_LFOS);
+    id -= MOD_SRC_GLFO;
+    assert(id < PATCH_MAX_LFOS);
 
     if (lfo)
         *lfo = patches[patch_id]->glfo[id];

libpetrifoo/petri-foo.h

@@ -54,7 +54,7 @@
     fprintf(stderr, __VA_ARGS__);           \
 }
 #else
-# define debug(...)
+#define debug(...)
 #endif
 
 

libpetrifoo/sample.c

@@ -362,8 +362,9 @@ int sample_load_file(Sample* sample, const char* name,
     }
 
     if (resample_sndfile)
-    {
-        if (sfinfo.samplerate != rate)
+    {   /*  ignore resample if rate is invalid (ie rate == -1 when
+            JACK is not running, useful under debug conditions. */
+        if (rate > 0 && sfinfo.samplerate != rate)
         {
             float* tmp2 = resample(tmp, rate, &sfinfo);
 

sandbox/CMakeLists.txt

@@ -19,6 +19,5 @@ add_definitions (
 
 add_executable(test ${TEST_SOURCES})
 
-
-target_link_Libraries(test petrifoo petrifui pthread phin )
+target_link_Libraries( test petrifoo petrifui pthread phin )