Update of /cvsroot/alsa/alsa-tools/hdspconf/src
In directory sc8-pr-cvs1:/tmp/cvs-serv14965/src
Modified Files:
HC_Aeb.cxx HC_AutoSyncRef.cxx HC_AutoSyncRef.h
HC_BreakoutCable.cxx HC_ClockSource.cxx HC_ClockSource.h
HC_InputLevel.cxx HC_OutputLevel.cxx HC_Phones.cxx
HC_PrefSyncRef.cxx HC_SpdifFreq.h HC_SpdifIn.cxx
HC_SystemClock.h Makefile.am hdspconf.cxx
Added Files:
labels.cxx labels.h
Log Message:
- updated to version 1.4
fixed compile warnings.
--- NEW FILE: labels.cxx ---
/*
* HDSPConf
*
* Copyright (C) 2003 Thomas Charbonnel ([EMAIL PROTECTED])
*
* 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"
};
--- NEW FILE: labels.h ---
/*
* HDSPConf
*
* Copyright (C) 2003 Thomas Charbonnel ([EMAIL PROTECTED])
*
* 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
Index: HC_Aeb.cxx
===================================================================
RCS file: /cvsroot/alsa/alsa-tools/hdspconf/src/HC_Aeb.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HC_Aeb.cxx 3 Nov 2003 19:09:32 -0000 1.1
+++ HC_Aeb.cxx 24 Nov 2003 18:16:27 -0000 1.2
@@ -57,7 +57,6 @@
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");
Index: HC_AutoSyncRef.cxx
===================================================================
RCS file: /cvsroot/alsa/alsa-tools/hdspconf/src/HC_AutoSyncRef.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HC_AutoSyncRef.cxx 3 Nov 2003 19:09:32 -0000 1.2
+++ HC_AutoSyncRef.cxx 24 Nov 2003 18:16:27 -0000 1.3
@@ -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.")
{
Index: HC_AutoSyncRef.h
===================================================================
RCS file: /cvsroot/alsa/alsa-tools/hdspconf/src/HC_AutoSyncRef.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HC_AutoSyncRef.h 2 Jul 2003 10:21:11 -0000 1.1
+++ HC_AutoSyncRef.h 24 Nov 2003 18:16:27 -0000 1.2
@@ -26,6 +26,7 @@
#include <FL/fl_draw.H>
#include <FL/Fl.H>
#include "HC_CardPane.h"
+#include "labels.h"
class HC_CardPane;
Index: HC_BreakoutCable.cxx
===================================================================
RCS file: /cvsroot/alsa/alsa-tools/hdspconf/src/HC_BreakoutCable.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HC_BreakoutCable.cxx 3 Nov 2003 19:09:32 -0000 1.1
+++ HC_BreakoutCable.cxx 24 Nov 2003 18:16:27 -0000 1.2
@@ -57,7 +57,6 @@
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");
Index: HC_ClockSource.cxx
===================================================================
RCS file: /cvsroot/alsa/alsa-tools/hdspconf/src/HC_ClockSource.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HC_ClockSource.cxx 3 Nov 2003 19:09:32 -0000 1.2
+++ HC_ClockSource.cxx 24 Nov 2003 18:16:27 -0000 1.3
@@ -25,11 +25,12 @@
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;
Index: HC_ClockSource.h
===================================================================
RCS file: /cvsroot/alsa/alsa-tools/hdspconf/src/HC_ClockSource.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HC_ClockSource.h 3 Nov 2003 19:09:32 -0000 1.2
+++ HC_ClockSource.h 24 Nov 2003 18:16:27 -0000 1.3
@@ -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;
Index: HC_InputLevel.cxx
===================================================================
RCS file: /cvsroot/alsa/alsa-tools/hdspconf/src/HC_InputLevel.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HC_InputLevel.cxx 3 Nov 2003 19:09:32 -0000 1.1
+++ HC_InputLevel.cxx 24 Nov 2003 18:16:27 -0000 1.2
@@ -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();
Index: HC_OutputLevel.cxx
===================================================================
RCS file: /cvsroot/alsa/alsa-tools/hdspconf/src/HC_OutputLevel.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HC_OutputLevel.cxx 3 Nov 2003 19:09:32 -0000 1.1
+++ HC_OutputLevel.cxx 24 Nov 2003 18:16:27 -0000 1.2
@@ -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();
Index: HC_Phones.cxx
===================================================================
RCS file: /cvsroot/alsa/alsa-tools/hdspconf/src/HC_Phones.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HC_Phones.cxx 3 Nov 2003 19:09:32 -0000 1.1
+++ HC_Phones.cxx 24 Nov 2003 18:16:27 -0000 1.2
@@ -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();
Index: HC_PrefSyncRef.cxx
===================================================================
RCS file: /cvsroot/alsa/alsa-tools/hdspconf/src/HC_PrefSyncRef.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HC_PrefSyncRef.cxx 3 Nov 2003 19:09:32 -0000 1.2
+++ HC_PrefSyncRef.cxx 24 Nov 2003 18:16:27 -0000 1.3
@@ -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;
Index: HC_SpdifFreq.h
===================================================================
RCS file: /cvsroot/alsa/alsa-tools/hdspconf/src/HC_SpdifFreq.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HC_SpdifFreq.h 2 Jul 2003 10:21:11 -0000 1.1
+++ HC_SpdifFreq.h 24 Nov 2003 18:16:27 -0000 1.2
@@ -26,6 +26,7 @@
#include <FL/fl_draw.H>
#include <FL/Fl.H>
#include "HC_CardPane.h"
+#include "labels.h"
class HC_CardPane;
Index: HC_SpdifIn.cxx
===================================================================
RCS file: /cvsroot/alsa/alsa-tools/hdspconf/src/HC_SpdifIn.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HC_SpdifIn.cxx 3 Nov 2003 19:09:32 -0000 1.2
+++ HC_SpdifIn.cxx 24 Nov 2003 18:16:27 -0000 1.3
@@ -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();
Index: HC_SystemClock.h
===================================================================
RCS file: /cvsroot/alsa/alsa-tools/hdspconf/src/HC_SystemClock.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HC_SystemClock.h 2 Jul 2003 10:21:11 -0000 1.1
+++ HC_SystemClock.h 24 Nov 2003 18:16:27 -0000 1.2
@@ -26,6 +26,7 @@
#include <FL/fl_draw.H>
#include <FL/Fl.H>
#include "HC_CardPane.h"
+#include "labels.h"
class HC_CardPane;
Index: Makefile.am
===================================================================
RCS file: /cvsroot/alsa/alsa-tools/hdspconf/src/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am 3 Nov 2003 19:09:32 -0000 1.2
+++ Makefile.am 24 Nov 2003 18:16:27 -0000 1.3
@@ -35,4 +35,6 @@
HC_AboutText.cxx \
HC_AboutText.h \
pixmaps.cxx \
- pixmaps.h
+ pixmaps.h \
+ labels.cxx \
+ labels.h
Index: hdspconf.cxx
===================================================================
RCS file: /cvsroot/alsa/alsa-tools/hdspconf/src/hdspconf.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hdspconf.cxx 3 Nov 2003 19:09:32 -0000 1.3
+++ hdspconf.cxx 24 Nov 2003 18:16:27 -0000 1.4
@@ -41,43 +41,6 @@
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 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;
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
