- updated to version 1.4

  fixed compile warnings.

diff --git a/hdspconf/ChangeLog b/hdspconf/ChangeLog
index c396ad82dd0af4b231437cd52f6467906ee75bc7..1adeefd8ea994aa120b84fe2d9c566a4d0c581bd 100644 (file)
--- a/hdspconf/ChangeLog
+++ b/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

diff --git a/hdspconf/configure.in b/hdspconf/configure.in
index bbc2da5abc5ccebe7d67ee99aca1d41c02649205..74cc928301a9de990615e6bb306aeee0ede43629 100644 (file)
--- a/hdspconf/configure.in
+++ b/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

diff --git a/hdspconf/src/HC_Aeb.cxx b/hdspconf/src/HC_Aeb.cxx
index 571ad4d83e4ee87369c2338377b9bbce8caadb83..ba7b76a8f784e3b2880756028b2d091472c775c6 100644 (file)
--- a/hdspconf/src/HC_Aeb.cxx
+++ b/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");

diff --git a/hdspconf/src/HC_AutoSyncRef.cxx b/hdspconf/src/HC_AutoSyncRef.cxx
index ff4f29ca4ca4e94324abea7a82cc569539a402f8..f20bbadaa76af7814d26cdd61a5fbd75f6781f44 100644 (file)
--- a/hdspconf/src/HC_AutoSyncRef.cxx
+++ b/hdspconf/src/HC_AutoSyncRef.cxx
@@ -20,9 +20,7 @@
 
 #pragma implementation
 #include "HC_AutoSyncRef.h"
-
-extern char *freqs[10];
-extern char *ref[7];
+#include "labels.h"
 
 HC_AutoSyncRef::HC_AutoSyncRef(int x, int y, int w, int h):Fl_Widget(x, y, w, h, "AutoSync Ref.")
 {

diff --git a/hdspconf/src/HC_AutoSyncRef.h b/hdspconf/src/HC_AutoSyncRef.h
index 2ce0921d9f654bef6bcb0c0eab23f2e428a0d8a8..497d1d746df4a7e015f124bddfe3a65a497541db 100644 (file)
--- a/hdspconf/src/HC_AutoSyncRef.h
+++ b/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;
 

diff --git a/hdspconf/src/HC_BreakoutCable.cxx b/hdspconf/src/HC_BreakoutCable.cxx
index e0baa92cc3e61213798baa8b80e3f31147e0d4d0..229f9b82641c916f4840cde1dad7d4644f64acf4 100644 (file)
--- a/hdspconf/src/HC_BreakoutCable.cxx
+++ b/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");

diff --git a/hdspconf/src/HC_ClockSource.cxx b/hdspconf/src/HC_ClockSource.cxx
index ac99800bb3f07b818e5fb7e2c9914d4864ef34a8..f442c0ed7c179badb072231260ee01819590f63f 100644 (file)
--- a/hdspconf/src/HC_ClockSource.cxx
+++ b/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;

diff --git a/hdspconf/src/HC_ClockSource.h b/hdspconf/src/HC_ClockSource.h
index 27b3619e270553ffb8be1b5b381204fa532e9a76..c1c527ca02384a509a5d7adee3a564425ed4da5f 100644 (file)
--- a/hdspconf/src/HC_ClockSource.h
+++ b/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;
 

diff --git a/hdspconf/src/HC_InputLevel.cxx b/hdspconf/src/HC_InputLevel.cxx
index 157cd1300e00fd99779b18f922550986034cb6ac..deef8dcc78875dd025f2515368d7c1d18846178c 100644 (file)
--- a/hdspconf/src/HC_InputLevel.cxx
+++ b/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();

diff --git a/hdspconf/src/HC_OutputLevel.cxx b/hdspconf/src/HC_OutputLevel.cxx
index 9523ab62a87f96a758eee107511dbcff61be2069..f42e71ac5ca7694b1a5dfe54b0713366f6528f91 100644 (file)
--- a/hdspconf/src/HC_OutputLevel.cxx
+++ b/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();

diff --git a/hdspconf/src/HC_Phones.cxx b/hdspconf/src/HC_Phones.cxx
index 7c5f30a1f40efa5f15b07d36d5d8d2191e7f29cb..fb1c60030cdc94de868e3810a5f87dc1c41b3403 100644 (file)
--- a/hdspconf/src/HC_Phones.cxx
+++ b/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();

diff --git a/hdspconf/src/HC_PrefSyncRef.cxx b/hdspconf/src/HC_PrefSyncRef.cxx
index bfd3096001f8446efafdd4c5afa5d87616492ff0..3fd636afc2c3cfb57bdc23abc36881afd4b53750 100644 (file)
--- a/hdspconf/src/HC_PrefSyncRef.cxx
+++ b/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;

diff --git a/hdspconf/src/HC_SpdifFreq.h b/hdspconf/src/HC_SpdifFreq.h
index ca9c81e75f3ef545061dd12d632ca2597751cb0f..ef1b1dea2bf52543da2fa2d16e843480b0e01b88 100644 (file)
--- a/hdspconf/src/HC_SpdifFreq.h
+++ b/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;
 

diff --git a/hdspconf/src/HC_SpdifIn.cxx b/hdspconf/src/HC_SpdifIn.cxx
index 343479f8675bda6fb66d3c299ed19e90201a1afa..211af0580d305edaf2f2156fd09fef791a84bc64 100644 (file)
--- a/hdspconf/src/HC_SpdifIn.cxx
+++ b/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();

diff --git a/hdspconf/src/HC_SystemClock.h b/hdspconf/src/HC_SystemClock.h
index 8102e865b1f5642e597d3ba08c893bc6badaa07f..c4822ddfdf941e97120477da97df5a3afc700d8c 100644 (file)
--- a/hdspconf/src/HC_SystemClock.h
+++ b/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;
 

diff --git a/hdspconf/src/Makefile.am b/hdspconf/src/Makefile.am
index 907fadd947df695993c049de3073ec8ee7f81550..9f29a4d02c04e9aa05f1645c196bfe9784c99e00 100644 (file)
--- a/hdspconf/src/Makefile.am
+++ b/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

diff --git a/hdspconf/src/hdspconf.cxx b/hdspconf/src/hdspconf.cxx
index 22e4fa25c354bfeee223144ada2346a91a7fdeaf..b56eab405f1e97485235dfb68ec420f4edb400c7 100644 (file)
--- a/hdspconf/src/hdspconf.cxx
+++ b/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;

diff --git a/hdspconf/src/labels.cxx b/hdspconf/src/labels.cxx
new file mode 100644 (file)
index 0000000..59880b6
--- /dev/null
+++ b/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"
+};
+

diff --git a/hdspconf/src/labels.h b/hdspconf/src/labels.h
new file mode 100644 (file)
index 0000000..42964c0
--- /dev/null
+++ b/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
+