mirrors/alsa-tools
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-tools.git synced 2025-10-31 22:25:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

updated to version 1.1

Browse source 
It fixes a small bug + an issue in card detection preventing it to work
with hdsp9652 cards. It fixes too FLTK detection in configure.
This commit is contained in:
Takashi Iwai 2003-07-28 12:58:10 +00:00
parent 7dc10adba2
commit 912758aebd
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hdspconf/configure.in
View file

@ -1,5 +1,5 @@
AC_INIT(src/hdspconf.cxx) AC_INIT(src/hdspconf.cxx)
AM_INIT_AUTOMAKE(hdspconf, 1.0) AM_INIT_AUTOMAKE(hdspconf, 1.1)
AC_PROG_CXX AC_PROG_CXX
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
@ -53,7 +53,7 @@ AC_PATH_PROG(FLTK_CONFIG, fltk-config, no)
if test "$FLTK_CONFIG" = "no"; then if test "$FLTK_CONFIG" = "no"; then
AC_MSG_ERROR(no fltk-config is found) AC_MSG_ERROR(no fltk-config is found)
fi fi
FLTK_CXXFLAGS=`$FLTK_CONFIG $fltk_config_args --cxxflags` FLTK_CXXFLAGS="`$FLTK_CONFIG $fltk_config_args --cxxflags` -fno-exceptions"
FLTK_LIBS=`$FLTK_CONFIG $fltk_config_args --ldflags` FLTK_LIBS=`$FLTK_CONFIG $fltk_config_args --ldflags`
CXXFLAGS="$CXXFLAGS $ALSA_CFLAGS $FLTK_CXXFLAGS" CXXFLAGS="$CXXFLAGS $ALSA_CFLAGS $FLTK_CXXFLAGS"

16
hdspconf/src/hdspconf.cxx
View file

@ -134,7 +134,7 @@ int main(int argc, char **argv)
HC_XpmRenderer *rme_logo; HC_XpmRenderer *rme_logo;
HC_AboutText *about_text; HC_AboutText *about_text;
Fl_Group *about_pane; Fl_Group *about_pane;
char **name; char *name;
int card; int card;
int hdsp_cards[4]; int hdsp_cards[4];
int alsa_index[4]; int alsa_index[4];
@ -152,24 +152,26 @@ int main(int argc, char **argv)
if (card < 0) { if (card < 0) {
break; break;
} else { } else {
snd_card_get_longname(card, name); snd_card_get_longname(card, &name);
printf("Card %d : %s\n", card, *name); printf("Card %d : %s\n", card, name);
if (!strncmp(*name, "RME Hammerfall DSP + Multiface", 30)) { if (!strncmp(name, "RME Hammerfall DSP + Multiface", 30)) {
printf("Multiface found !\n"); printf("Multiface found !\n");
hdsp_cards[cards] = MULTIFACE; hdsp_cards[cards] = MULTIFACE;
alsa_index[cards] = card; alsa_index[cards] = card;
cards++; cards++;
} else if (!strncmp(*name, "RME Hammerfall DSP + Digiface", 29)) { } else if (!strncmp(name, "RME Hammerfall DSP + Digiface", 29)) {
printf("Digiface found !\n"); printf("Digiface found !\n");
hdsp_cards[cards] = DIGIFACE; hdsp_cards[cards] = DIGIFACE;
alsa_index[cards] = card; alsa_index[cards] = card;
cards++; cards++;
} else if (!strncmp(*name, "RME HDSP 9652", 13)) { } else if (!strncmp(name, "RME Hammerfall HDSP 9652", 24)) {
printf("HDSP 9652 found !\n"); printf("HDSP 9652 found !\n");
hdsp_cards[cards] = HDSP9652; hdsp_cards[cards] = HDSP9652;
alsa_index[cards] = card; alsa_index[cards] = card;
cards++; cards++;
} } else if (!strncmp(name, "RME Hammerfall DSP", 18)) {
printf("Uninitialized HDSP card found. Use hdsploader to upload firmware.\n");
}
} }
} }
if (!cards) { if (!cards) {