preparatory work for 0.1.3 release

Author: James Morris

.gitignore

@@ -15,6 +15,7 @@ Makefile.in
 *.wav
 *.petri-foo
 *.orig
+*.bz2
 
 aclocal.m4
 autom4te.cache/

CMakeLists.txt

@@ -6,7 +6,7 @@ endif (COMMAND CMAKE_POLICY)
 
 project(Petri-Foo)
 
-set(Petri-Foo_VERSION_MAJOR 0)
+set(Petri-Foo_VERSION_MAJOR 1)
 set(Petri-Foo_VERSION_MINOR 3)
 set(BINDIR  "bin" CACHE STRING "Where to install binaries")
 set(DATADIR "share/petri-foo" CACHE STRING "Where to install data files")
@@ -15,12 +15,15 @@ set(PIXMAPS_DIR "share/pixmaps" CACHE STRING "Where to install icons")
 set(MIME_DIR "share/mime" CACHE STRING "Where MIME definitions are located")
 set(UpdateMime "ON" CACHE BOOL "Update Mime Database")
 
+set(PROJECT_VERSION "0.2.3")
+set(ARCHIVE_NAME petri-foo-0.${Petri-Foo_VERSION_MAJOR}.${Petri-Foo_VERSION_MINOR})
+
 mark_as_advanced(EXECUTABLE_OUTPUT_PATH)
 mark_as_advanced(LIBRARY_OUTPUT_PATH)
 mark_as_advanced(CMAKE_BUILD_TYPE)
 mark_as_advanced(CMAKE_INSTALL_PREFIX)
 
-option (BuildForDebug "Include gdb debugging support" ON)
+option (BuildForDebug "Include gdb debugging support" OFF)
 
 # DEBUG
 set (BuildOptionsDebug "-O0 -ggdb" CACHE STRING "Debug build flags")
@@ -156,4 +159,8 @@ if (UpdateMime)
     )
 endif (UpdateMime)
 
+add_custom_target(dist
+    COMMAND git archive --prefix=${ARCHIVE_NAME}/ HEAD
+        | bzip2 > ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.bz2
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
 

ChangeLog

@@ -1,3 +1,15 @@
+2012-06-11 James Morris <[email protected]>
+
+	Preparatory Work for 0.1.3 Release
+	==================================
+
+	* added dist target
+	* removed obsolete source files
+	* changed default build to release
+	* fixed some warnings caused by not-#defined debug
+	* fixed some warnings about unused variables/parameters
+	  (grep why is this still here)
+
 2012-06-09 James Morris <[email protected]>
 
 	* libpetrifoo/patch_private/patch_data.c, patch_copy:

NEWS

@@ -1 +1,13 @@
-See the Changelog and/or mailing list.
+After some time a new release of Petri-Foo is now available...
+
+Petri-Foo-0.1.3
+
+* Moved build configuration system to cmake
+* Removed external dependency on PHAT and replaced with a custom
+  version called Phin included with Petri-Foo
+* Mousewheel waveform zooming
+* Auto-preview (with optional resampling) in sample selector dialog
+* Numerous bugs squashed unsquashed and squashed again
+* Minor GUI updates/fixes
+* Removed obsolete source files
+

gui/gui.c

@@ -417,7 +417,6 @@ void cb_menu_patch_remove(GtkWidget* menu_item, gpointer data)
 {
     (void)menu_item;(void)data;
 
-    int val;
     int cp;
     int index;
 
@@ -448,6 +447,8 @@ void cb_menu_view_log_display_showing(gboolean active)
 
 static void cb_menu_view_log_display(GtkWidget* widget, gpointer data)
 {
+    (void)widget; (void)data;
+
     if (gtk_check_menu_item_get_active(
         GTK_CHECK_MENU_ITEM(menu_view_log_display)))
     {
@@ -803,7 +804,6 @@ gui_menu_check_add(GtkWidget* menu, const char* label,  gboolean active,
                                                         gpointer data)
 {
     GtkWidget* item = 0;
-    GtkWidget* submenu = 0;
 
     item = gtk_check_menu_item_new_with_label(label);
     gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), active);
@@ -816,12 +816,12 @@ gui_menu_check_add(GtkWidget* menu, const char* label,  gboolean active,
 /* recent items menu */
 void gui_recent_files_load(void) 
 {
-    GtkWidget* menuitem_to_append_to = NULL;
     GtkRecentFilter *recent_filter;
     GtkWidget *menuitem_file_recent_items;
     recent_manager = gtk_recent_manager_get_default();
     recent_filter = gtk_recent_filter_new();
-    gtk_recent_filter_add_mime_type(recent_filter, "application/x-petri-foo");
+    gtk_recent_filter_add_mime_type(recent_filter,
+                                    "application/x-petri-foo");
     menuitem_file_recent_items = 
             gtk_recent_chooser_menu_new_for_manager(recent_manager);
     gtk_recent_chooser_add_filter(
@@ -837,7 +837,8 @@ void gui_recent_files_load(void)
             GTK_RECENT_CHOOSER(menuitem_file_recent_items), FALSE);
     gtk_recent_chooser_menu_set_show_numbers(
             GTK_RECENT_CHOOSER_MENU(menuitem_file_recent_items), TRUE);
-    g_signal_connect(GTK_OBJECT(menuitem_file_recent_items), "item-activated",
+    g_signal_connect(GTK_OBJECT(menuitem_file_recent_items),
+                    "item-activated",
                      G_CALLBACK(cb_recent_chooser_item_activated), window);
     gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem_file_recent), 
             menuitem_file_recent_items);

gui/lfotab.c

@@ -545,7 +545,7 @@ static void update_lfo(LfoTabPrivate* p)
 {
     LFOShape lfoshape;
     int shape;
-    float freq, beats, delay, attack;
+    float freq, beats, delay = 0, attack = 0;
     bool active, sync, positive;
     GtkTreeIter iter;
 

gui/log_display.c

@@ -89,6 +89,7 @@ void log_display_hide(void)
 
 void log_display_init(GtkWidget* parent)
 {
+    (void)parent; /* why is this still here? */
     GtkWidget* swindow;
     GtkWidget* vbox;
 

gui/mod_section.c

@@ -438,10 +438,10 @@ GtkWidget* mod_section_new(void)
 void mod_section_set_patch(ModSection* self, int patch_id)
 {
     ModSectionPrivate* p = MOD_SECTION_GET_PRIVATE(self);
-    float param1;
+    float param1 = 0;
     float param2 = 0;
-    float vel_amt;
-    float key_trk;
+    float vel_amt = 0;
+    float key_trk = 0;
 
     int     i;
     int     last_slot = MAX_MOD_SLOTS;

libpetrifoo/adsr.c

@@ -123,6 +123,7 @@ void adsr_init(ADSR* env)
 
 void adsr_trigger(ADSR* env, float key, float vel)
 {
+    (void)vel; /* why is this still here? */
     env->state = ADSR_STATE_DELAY;
     env->ticks = 0;
     env->aval = env->val;

libpetrifoo/jackdriver.c

@@ -326,20 +326,28 @@ static int start(void)
         if (ports[0] != NULL)
         {
             if (jack_connect(client, jack_port_name(lport), ports[0]) == 0)
+            {
                 debug("JACK failed to connect left output port\n");
+            }
 
             if (ports[1] != NULL)
             {
                 if (jack_connect(client, jack_port_name (rport), ports[1]))
+                {
                     debug("JACK failed to connect right output port\n");
+                }
             }
             else
+            {
                 debug("JACK failed to connect right output port\n");
+            }
 
             free (ports);
         }
         else
+        {
             debug("JACK failed to connect output ports\n");
+        }
     }
 
     debug("JACK Initialization complete\n");

libpetrifoo/patch.c

@@ -491,6 +491,7 @@ pitchscale (Patch * p, PatchVoice * v, float *l, float *r)
 inline static void
 pan (Patch * p, PatchVoice * v, int index, float *l, float *r)
 {
+    (void)index; /* how come this is no longer used? why is it here? */
     int i;
     float pan;
 
@@ -535,8 +536,9 @@ pan (Patch * p, PatchVoice * v, int index, float *l, float *r)
 inline static void
 filter (Patch* p, PatchVoice* v, int index,  float* l, float* r)
 {
+    (void)index; /* how come this is no longer used? why is it here? */
     int i;
-    float ffreq, freso, logreso;
+    float ffreq, freso;
 
     /* get filter cutoff frequency */
     ffreq = p->ffreq.val;
@@ -612,9 +614,10 @@ filter (Patch* p, PatchVoice* v, int index,  float* l, float* r)
 inline static int
 gain (Patch* p, PatchVoice* v, int index, float* l, float* r)
 {
+    (void)index; /* how come this is no longer used? why is it here? */
     int i;
     float amp = 0.0;
-    float logamp = 0.0;
+    /*float logamp = 0.0;*/
 
     /* first, we use our set value as a base */
     amp = p->amp.val;
@@ -717,6 +720,7 @@ inline static void advance_fwd(int* posi,  uint32_t* posf,
  * returned if we are out of samples after doing our work) */
 inline static int advance (Patch* p, PatchVoice* v, int index)
 {
+    (void)index; /* how come this is no longer used? why is it here? */
     int i,j;
     double pitch;
     double scale;

libpetrifoo/patch_util.c

@@ -167,7 +167,6 @@ int patch_create(void)
 
 int patch_duplicate(int src_id)
 {
-    Patch* p;
     int id;
 
     assert(patchok(src_id));

libpetrifoo/sample.c

@@ -255,6 +255,7 @@ static SNDFILE* open_sample(SF_INFO* sfinfo, const char* name,
 
     if (raw)
     {
+        #if DEBUG
         id_name* idnames = names_sample_raw_format_get();
         char* fmt_name = 0;
         int i;
@@ -271,6 +272,7 @@ static SNDFILE* open_sample(SF_INFO* sfinfo, const char* name,
                                 name, raw_samplerate,
                                 (raw_channels == 2)? "stereo" : "mono",
                                 fmt_name);
+        #endif
 
         if (!sf_format_check(sfinfo))
         {
@@ -279,7 +281,9 @@ static SNDFILE* open_sample(SF_INFO* sfinfo, const char* name,
         }
     }
     else
+    {
         debug("Reading sample %s\n", name);
+    }
 
     if ((sfp = sf_open(name, SFM_READ, sfinfo)) == NULL)
     {

petri-foo.spec

@@ -1,10 +1,10 @@
 Summary: A midi controlled audio sampler
 Name: petri-foo
-Version: 0.0.2
+Version: 0.1.3
 Release: 1
 License: GPL
 Group: Applications/Multimedia
-URL: http://www.gazuga.net
+URL: http://petri-foo.sourceforge.net
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Requires: libsamplerate libsndfile gtk2 libxml2 alsa-lib jack-audio-connection-kit

petri-foo.spec.in

@@ -4,7 +4,7 @@ Version: @VERSION@
 Release: 1
 License: GPL
 Group: Applications/Multimedia
-URL: http://www.gazuga.net
+URL: http://petri-foo.sourceforge.net
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Requires: libsamplerate libsndfile gtk2 libxml2 alsa-lib jack-audio-connection-kit