fixed -c option

diff --git a/ac3dec/ac3dec.c b/ac3dec/ac3dec.c
index 37d4ad35cee054ec6d640f2438165c557c70f091..13d2bea610f48bb590f29773a5e019a4d8375b18 100644 (file)
--- a/ac3dec/ac3dec.c
+++ b/ac3dec/ac3dec.c
@@ -101,7 +101,7 @@ int main(int argc,char *argv[])
                {"device", 1, NULL, 'D'},
                {"4ch", 0, NULL, '4'},
                {"6ch", 0, NULL, '6'},
-               {"card", 0, NULL, 'c'},
+               {"card", 1, NULL, 'c'},
                {"iec958c", 0, NULL, 'C'},
                {"spdif", 0, NULL, 'C'},
                {"iec958p", 0, NULL, 'P'},
@@ -131,7 +131,7 @@ int main(int argc,char *argv[])
        while (1) {
                int c;
 
-               if ((c = getopt_long(argc, argv, "hvcD:46CPRZ:q", long_option, NULL)) < 0)
+               if ((c = getopt_long(argc, argv, "hvc:D:46CPRZ:q", long_option, NULL)) < 0)
                        break;
                switch (c) {
                case 'h':

diff --git a/ac3dec/output.c b/ac3dec/output.c
index 125de28d5a4b32dda6de5b8ab32f489912e418d8..5d5494f5f5756c2c21a86c8df0ed971db9bf184a 100644 (file)
--- a/ac3dec/output.c
+++ b/ac3dec/output.c
@@ -52,7 +52,6 @@ int output_open(output_t *output)
                switch (output->channels) {
                case 1:
                case 2:
-                       sprintf(devstr, "default");
                        if (output->spdif != SPDIF_NONE) {
                                unsigned char s[4];
                                if (output->spdif == SPDIF_PRO) {
@@ -76,6 +75,11 @@ int output_open(output_t *output)
                                sprintf(devstr, "iec958:AES0=0x%x,AES1=0x%x,AES2=0x%x,AES3=0x%x", s[0], s[1], s[2], s[3]);
                                if (out_config.card)
                                        sprintf(devstr + strlen(devstr), ",CARD=%s", out_config.card);
+                       } else {
+                               if (out_config.card)
+                                       sprintf(devstr, "plughw:%s", out_config.card);
+                               else
+                                       sprintf(devstr, "default");
                        }
                        break;
                case 4: