diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2003-01-08 00:03:58 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2003-01-08 00:03:58 +0000 |
| commit | 183830cbd2d23d2e616b617b1f5c7ab6867882b1 (patch) | |
| tree | 7bd0870ed4e36aaf2dad310b2cc837960a4eecae | |
| parent | 29ac9d5f16d5ecb34c36782534a2a4b687fdddc9 (diff) | |
| download | xine-lib-183830cbd2d23d2e616b617b1f5c7ab6867882b1.tar.gz xine-lib-183830cbd2d23d2e616b617b1f5c7ab6867882b1.tar.bz2 | |
wow, time to sleep i guess. revert and fix
CVS patchset: 3817
CVS date: 2003/01/08 00:03:58
| -rw-r--r-- | src/input/input_cdda.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c index affa26859..1ae66225f 100644 --- a/src/input/input_cdda.c +++ b/src/input/input_cdda.c @@ -20,7 +20,7 @@ * Compact Disc Digital Audio (CDDA) Input Plugin * by Mike Melanson (melanson@pcisys.net) * - * $Id: input_cdda.c,v 1.3 2003/01/07 23:54:35 f1rmb Exp $ + * $Id: input_cdda.c,v 1.4 2003/01/08 00:03:58 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -326,10 +326,14 @@ static input_plugin_t *open_plugin (input_class_t *cls_gen, xine_stream_t *strea int track; /* fetch the CD track to play */ - if((strncasecmp (data, "cdda:", 5)) || - (((sscanf(data, "cdda:/%d", &track)) != 1) && ((sscanf(data, "cdda:%d", &track)) != 1))) + if (!strncasecmp (data, "cdda:", 5)) { + if (data[5] != '/') + track = atoi(&data[5]); + else + track = atoi(&data[6]); + } else return NULL; - + /* get the CD TOC */ init_cdrom_toc(&toc); fd = open ("/dev/cdrom", O_RDONLY); |