From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 28 Jul 2003 12:58:10 +0000 (+0000)
Subject: updated to version 1.1
X-Git-Tag: v1.0.3~61
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=912758aebdad3571ce39f3a86153294b3ab7afda;p=alsa-tools.git

updated to version 1.1

It fixes a small bug + an issue in card detection preventing it to work
with hdsp9652 cards. It fixes too FLTK detection in configure.
---

diff --git a/hdspconf/configure.in b/hdspconf/configure.in
index 32a448c..4ff0181 100644
--- a/hdspconf/configure.in
+++ b/hdspconf/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(src/hdspconf.cxx)
-AM_INIT_AUTOMAKE(hdspconf, 1.0)
+AM_INIT_AUTOMAKE(hdspconf, 1.1)
 
 AC_PROG_CXX
 AC_PROG_MAKE_SET
@@ -53,7 +53,7 @@ AC_PATH_PROG(FLTK_CONFIG, fltk-config, no)
 if test "$FLTK_CONFIG" = "no"; then
   AC_MSG_ERROR(no fltk-config is found)
 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`
 
 CXXFLAGS="$CXXFLAGS $ALSA_CFLAGS $FLTK_CXXFLAGS"
diff --git a/hdspconf/src/hdspconf.cxx b/hdspconf/src/hdspconf.cxx
index fb43d0d..e5c31d2 100644
--- a/hdspconf/src/hdspconf.cxx
+++ b/hdspconf/src/hdspconf.cxx
@@ -134,7 +134,7 @@ int main(int argc, char **argv)
     HC_XpmRenderer *rme_logo;
     HC_AboutText *about_text;
     Fl_Group  *about_pane;
-    char **name;
+    char *name;
     int card;
     int hdsp_cards[4];
     int alsa_index[4];
@@ -152,24 +152,26 @@ int main(int argc, char **argv)
 	if (card < 0) {
 	    break;
 	} else {
-	    snd_card_get_longname(card, name);
-	    printf("Card %d : %s\n", card, *name);
-	    if (!strncmp(*name, "RME Hammerfall DSP + Multiface", 30)) {
+	    snd_card_get_longname(card, &name);
+	    printf("Card %d : %s\n", card, name);
+	    if (!strncmp(name, "RME Hammerfall DSP + Multiface", 30)) {
 		printf("Multiface found !\n");
 		hdsp_cards[cards] = MULTIFACE;
 		alsa_index[cards] = card;
 		cards++;
-	    } else if (!strncmp(*name, "RME Hammerfall DSP + Digiface", 29)) {
+	    } else if (!strncmp(name, "RME Hammerfall DSP + Digiface", 29)) {
 		printf("Digiface found !\n");
 		hdsp_cards[cards] = DIGIFACE;
 		alsa_index[cards] = card;
 		cards++;
-	    } else if (!strncmp(*name, "RME HDSP 9652", 13)) {
+	    } else if (!strncmp(name, "RME Hammerfall HDSP 9652", 24)) {
 		printf("HDSP 9652 found !\n");
 		hdsp_cards[cards] = HDSP9652;
 		alsa_index[cards] = card;
 		cards++;
-	    } 
+	    } else if (!strncmp(name, "RME Hammerfall DSP", 18)) {
+		printf("Uninitialized HDSP card found. Use hdsploader to upload firmware.\n");
+	    }
 	}
     }
     if (!cards) {