1 files changed, 10 insertions, 1 deletions
diff --git a/libmpdemux/cdda.c b/libmpdemux/cdda.c
index d33e5a5dba..6d46e1aab3 100644
--- a/libmpdemux/cdda.c
+++ b/libmpdemux/cdda.c
@@ -12,6 +12,8 @@
 
 #include "cdd.h"
 
+extern char *cdrom_device;
+
 static struct cdda_params {
   int speed;
   int paranoia_mode;
@@ -32,7 +34,7 @@ static struct cdda_params {
   0,
   0,
   0,
-  DEFAULT_CDROM_DEVICE,
+  NULL,
   { 0, 0 }
 };
 
@@ -101,6 +103,13 @@ static int open_cdda(stream_t *st,int m, void* opts, int* file_format) {
     return STREAM_UNSUPORTED;
   }
 
+  if(!p->device) {
+    if (cdrom_device)
+      p->device = strdup(cdrom_device);
+    else
+      p->device = strdup(DEFAULT_CDROM_DEVICE);
+  }
+
 #ifdef MPLAYER_NETWORK
   if(strncmp(st->url,"cddb",4) == 0) {
     i = cddb_resolve(p->device, &xmcd_file);