summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/input/input_cdda.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c
index 5985b36fe..135748ab3 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.50 2004/04/10 17:41:44 valtri Exp $
+ * $Id: input_cdda.c,v 1.51 2004/04/21 16:43:18 komadori Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -547,6 +547,13 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
tocentry.cdte_addr.msf.frame;
}
+ if (tocentry.cdte_ctrl | CDROM_DATA_TRACK) {
+ toc->ignore_last_track = 1;
+ }
+ else {
+ toc->ignore_last_track = 0;
+ }
+
/* fetch the leadout as well */
memset(&tocentry, 0, sizeof(tocentry));
@@ -1746,7 +1753,7 @@ static int cdda_open(cdda_input_plugin_t *this_gen,
if (this_gen)
this_gen->fd = -1;
- fd = open (cdda_device, O_RDONLY|O_EXCL);
+ fd = open (cdda_device, O_RDONLY);
if (fd == -1) {
return -1;
}