- updated to version 1.4

fixed compile warnings.

hdspconf/ChangeLog

@@ -1,2 +1,8 @@
+Version 1.4 (24/11/2003) :
+    * Fix compilation warnings
+    
+Version 1.3 (21/11/2003) :
+    * Added a .desktop file and icon
+    
 Version 1.2 (01/11/2003) :
     * added support for HDSP 9652 and HDSP 9632 specific features

hdspconf/configure.in

@@ -1,5 +1,5 @@
 AC_INIT(src/hdspconf.cxx)
-AM_INIT_AUTOMAKE(hdspconf, 1.3)
+AM_INIT_AUTOMAKE(hdspconf, 1.4)
 
 AC_PROG_CXX
 AC_PROG_MAKE_SET

hdspconf/src/HC_Aeb.cxx

@@ -57,7 +57,6 @@ void adat_internal_cb(Fl_Widget *w, void *arg)
 
 HC_Aeb::HC_Aeb(int x, int y, int w, int h):Fl_Group(x, y, w, h, "AEB")
 {
-	int i = 0;
 	lock = 0;
 	box(FL_ENGRAVED_FRAME);
 	label("AEB");

hdspconf/src/HC_AutoSyncRef.cxx

@@ -20,9 +20,7 @@
 
 #pragma implementation
 #include "HC_AutoSyncRef.h"
-
+#include "labels.h"
-extern char *freqs[10];
-extern char *ref[7];
 
 HC_AutoSyncRef::HC_AutoSyncRef(int x, int y, int w, int h):Fl_Widget(x, y, w, h, "AutoSync Ref.")
 {

hdspconf/src/HC_AutoSyncRef.h

@@ -26,6 +26,7 @@
 #include <FL/fl_draw.H>
 #include <FL/Fl.H>
 #include "HC_CardPane.h"
+#include "labels.h"
 
 class HC_CardPane;
 

hdspconf/src/HC_BreakoutCable.cxx

@@ -57,7 +57,6 @@ void xlr_cb(Fl_Widget *w, void *arg)
 
 HC_BreakoutCable::HC_BreakoutCable(int x, int y, int w, int h):Fl_Group(x, y, w, h, "Breakout Cable")
 {
-	int i = 0;
 	lock = 0;
 	box(FL_ENGRAVED_FRAME);
 	label("Breakout Cable");

hdspconf/src/HC_ClockSource.cxx

@@ -25,11 +25,12 @@ extern char *freqs[10];
 
 void clock_source_cb(Fl_Widget *w, void *arg)
 {
-	int src, err;
+	int err;
 	char card_name[6];
 	snd_ctl_elem_value_t *ctl;
 	snd_ctl_elem_id_t *id;
 	snd_ctl_t *handle;
+	int src = 0;
 	HC_ClockSource *cs = (HC_ClockSource *)arg;
 	HC_CardPane *pane = (HC_CardPane *)(cs->parent());
 	Fl_Round_Button *source = (Fl_Round_Button *)w;

hdspconf/src/HC_ClockSource.h

@@ -22,10 +22,12 @@
 #ifndef HC_CLOCKSOURCE_H
 #define HC_CLOCKSOURCE_H
 
+
 #include <FL/Fl_Group.H>
 #include <FL/Fl_Round_Button.H>
 #include <alsa/asoundlib.h>
 #include "HC_CardPane.h"
+#include "labels.h"
 
 class HC_CardPane;
 

hdspconf/src/HC_InputLevel.cxx

@@ -23,11 +23,12 @@
 
 void input_level_cb(Fl_Widget *w, void *arg)
 {
-    int gain, err;
+    int err;
     char card_name[6];
     snd_ctl_elem_value_t *ctl;
     snd_ctl_elem_id_t *id;
     snd_ctl_t *handle;
+    int gain = 0;
     Fl_Round_Button *source = (Fl_Round_Button *)w;
     HC_InputLevel *il = (HC_InputLevel *)arg;
     HC_CardPane *pane = (HC_CardPane *)il->parent();

hdspconf/src/HC_OutputLevel.cxx

@@ -23,11 +23,12 @@
 
 void output_level_cb(Fl_Widget *w, void *arg)
 {
-    int gain, err;
+    int err;
     char card_name[6];
     snd_ctl_elem_value_t *ctl;
     snd_ctl_elem_id_t *id;
     snd_ctl_t *handle;
+    int gain = 0;
     Fl_Round_Button *source = (Fl_Round_Button *)w;
     HC_OutputLevel *ol = (HC_OutputLevel *)arg;
     HC_CardPane *pane = (HC_CardPane *)ol->parent();

hdspconf/src/HC_Phones.cxx

@@ -23,11 +23,12 @@
 
 void phones_cb(Fl_Widget *w, void *arg)
 {
-    int gain, err;
+    int err;
     char card_name[6];
     snd_ctl_elem_value_t *ctl;
     snd_ctl_elem_id_t *id;
     snd_ctl_t *handle;
+    int gain = 0;
     Fl_Round_Button *source = (Fl_Round_Button *)w;
     HC_Phones *ph = (HC_Phones *)arg;
     HC_CardPane *pane = (HC_CardPane *)ph->parent();

hdspconf/src/HC_PrefSyncRef.cxx

@@ -23,11 +23,12 @@
 
 void pref_sync_ref_cb(Fl_Widget *w, void *arg)
 {
-    int ref, err;
+    int err;
     char card_name[6];
     snd_ctl_elem_value_t *ctl;
     snd_ctl_elem_id_t *id;
     snd_ctl_t *handle;
+    int ref = 0;
     HC_PrefSyncRef *psr = (HC_PrefSyncRef *)arg;
     HC_CardPane *pane = (HC_CardPane *)(psr->parent());
     Fl_Round_Button *source = (Fl_Round_Button *)w;

hdspconf/src/HC_SpdifFreq.h

@@ -26,6 +26,7 @@
 #include <FL/fl_draw.H>
 #include <FL/Fl.H>
 #include "HC_CardPane.h"
+#include "labels.h"
 
 class HC_CardPane;
 

hdspconf/src/HC_SpdifIn.cxx

@@ -23,11 +23,12 @@
 
 void spdif_in_cb(Fl_Widget *w, void *arg)
 {
-    int in, err;
+    int err;
     char card_name[6];
     snd_ctl_elem_value_t *ctl;
     snd_ctl_elem_id_t *id;
     snd_ctl_t *handle;
+    int in = 0;
     Fl_Round_Button *source = (Fl_Round_Button *)w;
     HC_SpdifIn *si = (HC_SpdifIn *)arg;
     HC_CardPane *pane = (HC_CardPane *)si->parent();

hdspconf/src/HC_SystemClock.h

@@ -26,6 +26,7 @@
 #include <FL/fl_draw.H>
 #include <FL/Fl.H>
 #include "HC_CardPane.h"
+#include "labels.h"
 
 class HC_CardPane;
 

hdspconf/src/Makefile.am

@@ -35,4 +35,6 @@ hdspconf_SOURCES = \
 	HC_AboutText.cxx \
 	HC_AboutText.h \
 	pixmaps.cxx \
-	pixmaps.h
+	pixmaps.h \
+	labels.cxx \
+	labels.h

hdspconf/src/hdspconf.cxx

@@ -41,43 +41,6 @@ class HC_CardPane;
 class HC_XpmRenderer;
 class HC_AboutText;
 
-char *card_names[5] = {
-    "Digiface",
-    "Multiface",
-    "HDSP9652",
-    "HDSP9632",
-    "Undefined",
-};
-
-char *freqs[10] = {
-    "32.0 kHz",
-    "44.1 kHz",
-    "48.0 kHz",
-    "64.0 kHz",
-    "88.2 kHz",
-    "96.0 kHz",
-    "-----",
-    "128.0 kHz",
-    "176.4 kHz",
-    "192.0 kHz",
-};
-
-char *ref[7] = {
-    "Word Clock",
-    "ADAT Sync",
-    "SPDIF",
-    "-----",
-    "ADAT1",
-    "ADAT2",
-    "ADAT3"
-};
-
-char *lock_status[3] = {
-    "No Lock",
-    "Lock",
-    "Sync"
-};
-
 static void refresh_cb(void *arg)
 {
     Fl_Tabs *tabs = (Fl_Tabs *)arg;
@@ -159,7 +122,6 @@ int main(int argc, char **argv)
     int card;
     HDSP_IO_Type hdsp_cards[4];
     int alsa_index[4];
-    snd_ctl_t *handle;
     snd_ctl_card_info_t *info;
     snd_pcm_info_t *pcminfo;
     int cards = 0;

hdspconf/src/labels.cxx

@@ -0,0 +1,59 @@
+/*
+ *   HDSPConf
+ *    
+ *   Copyright (C) 2003 Thomas Charbonnel (thomas@undata.org)
+ *    
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "labels.h"
+
+char *card_names[5] = {
+    "Digiface",
+    "Multiface",
+    "HDSP9652",
+    "HDSP9632",
+    "Undefined",
+};
+
+char *freqs[10] = {
+    "32.0 kHz",
+    "44.1 kHz",
+    "48.0 kHz",
+    "64.0 kHz",
+    "88.2 kHz",
+    "96.0 kHz",
+    "-----",
+    "128.0 kHz",
+    "176.4 kHz",
+    "192.0 kHz",
+};
+
+char *ref[7] = {
+    "Word Clock",
+    "ADAT Sync",
+    "SPDIF",
+    "-----",
+    "ADAT1",
+    "ADAT2",
+    "ADAT3"
+};
+
+char *lock_status[3] = {
+    "No Lock",
+    "Lock",
+    "Sync"
+};
+

hdspconf/src/labels.h

@@ -0,0 +1,30 @@
+/*
+ *   HDSPConf
+ *    
+ *   Copyright (C) 2003 Thomas Charbonnel (thomas@undata.org)
+ *    
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef LABELS_H
+#define LABELS_H
+
+extern char *card_names[5];
+extern char *freqs[10];
+extern char *ref[7];
+extern char *lock_status[3];
+
+#endif
+