Added abstraction layer to controls. Added client/server support to controls. Cleaned...

diff --git a/alsactl/alsactl.c b/alsactl/alsactl.c
index f00f7bef68f8eed4e1fbd2b808b6f19f37ed27ea..9e63e5a49663c280689a8ddccfb5d9dac9016013 100644 (file)
--- a/alsactl/alsactl.c
+++ b/alsactl/alsactl.c
@@ -424,7 +424,7 @@ static int get_controls(int cardno, snd_config_t *top)
        snd_control_list_t list;
        int idx, err;
 
-       err = snd_ctl_open(&handle, cardno);
+       err = snd_ctl_hw_open(&handle, cardno);
        if (err < 0) {
                error("snd_ctl_open error: %s", snd_strerror(err));
                return err;
@@ -852,7 +852,7 @@ static int set_controls(int card, snd_config_t *top)
        snd_config_iterator_t i;
        int err;
 
-       err = snd_ctl_open(&handle, card);
+       err = snd_ctl_hw_open(&handle, card);
        if (err < 0) {
                error("snd_ctl_open error: %s", snd_strerror(err));
                return err;

diff --git a/alsamixer/alsamixer.c b/alsamixer/alsamixer.c
index a1f5533ee1158aa4aab711af17a690a1c88c8570..05bb2341f14b90e6efed6f840cb88162a7689f27 100644 (file)
--- a/alsamixer/alsamixer.c
+++ b/alsamixer/alsamixer.c
@@ -178,7 +178,7 @@ static int   mixer_ofs_x = 0;
 static float    mixer_extra_space = 0;
 static int      mixer_cbar_height = 0;
 
-static int      card_id = 0;
+static char*    card_id = "0";
 static snd_mixer_t *mixer_handle;
 static char     mixer_card_name[128];
 static char     mixer_device_name[128];
@@ -399,7 +399,7 @@ mixer_abort (ErrType     error,
     {
     case ERR_OPEN:
       fprintf (stderr,
-              PRGNAME ": failed to open mixer #%i: %s\n",
+              PRGNAME ": failed to open mixer %s: %s\n",
               card_id,
               snd_strerror (xerrno));
       break;
@@ -1712,10 +1712,10 @@ main (int    argc,
        case '?':
        case 'h':
          fprintf (stderr, "%s %s\n", PRGNAME_UPPER, VERSION);
-         fprintf (stderr, "Usage: %s [-c <card: 0..%i>] [-z]\n", PRGNAME, snd_cards () - 1);
+         fprintf (stderr, "Usage: %s [-c <card: 0...%i>] [-z]\n", PRGNAME, snd_cards () - 1);
          mixer_abort (ERR_NONE, "", 0);
        case 'c':
-         card_id = snd_card_get_index(optarg);
+         card_id = optarg;
          break;
        case 'g':
          mixer_do_color = !mixer_do_color;

diff --git a/amixer/amixer.c b/amixer/amixer.c
index e938cde2abdd91c30761d0aba8cdd62b3eb7ce2e..8118e0631d055fac7ca611fa96a6e7789270db84 100644 (file)
--- a/amixer/amixer.c
+++ b/amixer/amixer.c
@@ -40,7 +40,7 @@
 
 int quiet = 0;
 int debugflag = 0;
-int card;
+char *card = "0";
 
 static void error(const char *fmt,...)
 {
@@ -58,7 +58,7 @@ static int help(void)
        printf("Usage: amixer <options> command\n");
        printf("\nAvailable options:\n");
        printf("  -h,--help       this help\n");
-       printf("  -c,--card #     use a card number (0-%i) or the card name, default %i\n", snd_cards() - 1, card);
+       printf("  -c,--card #     use a card number (0-%i) or the card name, default %s\n", snd_cards() - 1, card);
        printf("  -D,--debug      debug mode\n");
        printf("  -v,--version    print version of this program\n");
        printf("\nAvailable commands:\n");
@@ -90,7 +90,7 @@ static int info(void)
                error("Control device %i hw info error: %s", card, snd_strerror(err));
                return err;
        }
-       printf("Card #%i '%s'/'%s'\n", card, info.id, info.longname);
+       printf("Card %s '%s'/'%s'\n", card, info.id, info.longname);
        printf("  Mixer ID      : '%s'\n", info.mixerid);
        printf("  Mixer name    : '%s'\n", info.mixername);
        memset(&clist, 0, sizeof(clist));
@@ -1058,11 +1058,6 @@ int main(int argc, char *argv[])
        };
 
        morehelp = 0;
-       card = snd_defaults_mixer_card();
-       if (card < 0) {
-               fprintf(stderr, "The ALSA sound driver was not detected in this system.\n");
-               return 1;
-       }
        while (1) {
                int c;
 
@@ -1075,7 +1070,7 @@ int main(int argc, char *argv[])
                        break;
                case 'c':
                case HELPID_CARD:
-                       card = snd_card_get_index(optarg);
+                       card = optarg;
                        break;
                case 'q':
                case HELPID_QUIET:

diff --git a/aplay/aplay.c b/aplay/aplay.c
index c90c1eba563ed554536122b9585757078aa6ea59..2225a50942718c6280c494383e718658a8ea2508 100644 (file)
--- a/aplay/aplay.c
+++ b/aplay/aplay.c
@@ -238,7 +238,7 @@ static void device_list(void)
        for (card = 0; card < SND_CARDS; card++) {
                if (!(mask & (1 << card)))
                        continue;
-               if ((err = snd_ctl_open(&handle, card)) < 0) {
+               if ((err = snd_ctl_hw_open(&handle, card)) < 0) {
                        error("control open (%i): %s", card, snd_strerror(err));
                        continue;
                }