# HG changeset patch
# User reimar
# Date 1285789414 0
# Node ID 4189a89515685badf2d04628d35d7da87e04ff14
# Parent  0ba9d1a85eb4b78113d574c20eea9ce1c1cb5e80
Use bluray_device variable also for bd:// instead of dvd_device
which does not make sense.

diff -r 0ba9d1a85eb4 -r 4189a8951568 cfg-common.h
--- a/cfg-common.h	Wed Sep 29 19:06:03 2010 +0000
+++ b/cfg-common.h	Wed Sep 29 19:43:34 2010 +0000
@@ -335,12 +335,11 @@
     {"dvd-speed", "MPlayer was compiled without libdvdread support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
     {"dvd", "MPlayer was compiled without libdvdread support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif /* CONFIG_DVDREAD */
+    {"bluray-device",  &bluray_device,  CONF_TYPE_STRING, 0,          0,  0, NULL},
 #ifdef CONFIG_LIBBLURAY
-    {"bluray-device",  &bluray_device,  CONF_TYPE_STRING, 0,          0,  0, NULL},
     {"bluray-angle",   &bluray_angle,   CONF_TYPE_INT,    CONF_RANGE, 0, 999, NULL},
     {"bluray-chapter", &bluray_chapter, CONF_TYPE_INT,    CONF_RANGE, 0, 999, NULL},
 #else
-    {"bluray-device",  "MPlayer was compiled without libbluray support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
     {"bluray-angle",   "MPlayer was compiled without libbluray support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
     {"bluray-chapter", "MPlayer was compiled without libbluray support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif /* CONFIG_LIBBLURAY */
diff -r 0ba9d1a85eb4 -r 4189a8951568 stream/open.c
--- a/stream/open.c	Wed Sep 29 19:06:03 2010 +0000
+++ b/stream/open.c	Wed Sep 29 19:43:34 2010 +0000
@@ -44,6 +44,7 @@
 int dvd_last_chapter=0;
 char* dvd_device=NULL;
 int dvd_title=0;
+char *bluray_device=NULL;
 
 // Open a new stream  (stdin/file/vcd/url)
 
diff -r 0ba9d1a85eb4 -r 4189a8951568 stream/stream_bd.c
--- a/stream/stream_bd.c	Wed Sep 29 19:06:03 2010 +0000
+++ b/stream/stream_bd.c	Wed Sep 29 19:43:34 2010 +0000
@@ -452,8 +452,8 @@
 
     if (p->device)
         bd->device = p->device;
-    else if (dvd_device)
-        bd->device = dvd_device;
+    else if (bluray_device)
+        bd->device = bluray_device;
     else
         bd->device = DEFAULT_BD_DEVICE;
 
diff -r 0ba9d1a85eb4 -r 4189a8951568 stream/stream_bluray.c
--- a/stream/stream_bluray.c	Wed Sep 29 19:06:03 2010 +0000
+++ b/stream/stream_bluray.c	Wed Sep 29 19:43:34 2010 +0000
@@ -46,7 +46,6 @@
 #define BLURAY_DEFAULT_CHAPTER    0
 #define BLURAY_DEFAULT_TITLE      0
 
-char *bluray_device  = NULL;
 int   bluray_angle   = 0;
 int   bluray_chapter = 0;