[MPlayer-cvslog] r32412 - in trunk: cfg-common.h stream/open.c stream/stream_bd.c stream/stream_bluray.c

[reimar]

Author: reimar
Date: Wed Sep 29 21:43:34 2010
New Revision: 32412

Log:
Use bluray_device variable also for bd:// instead of dvd_device
which does not make sense.

Modified:
   trunk/cfg-common.h
   trunk/stream/open.c
   trunk/stream/stream_bd.c
   trunk/stream/stream_bluray.c

Modified: trunk/cfg-common.h
==============================================================================
--- trunk/cfg-common.h	Wed Sep 29 21:06:03 2010	(r32411)
+++ trunk/cfg-common.h	Wed Sep 29 21:43:34 2010	(r32412)
@@ -335,12 +335,11 @@ const m_option_t common_opts[] = {
     {"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 */
-#ifdef CONFIG_LIBBLURAY
     {"bluray-device",  &bluray_device,  CONF_TYPE_STRING, 0,          0,  0, NULL},
+#ifdef CONFIG_LIBBLURAY
     {"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 */

Modified: trunk/stream/open.c
==============================================================================
--- trunk/stream/open.c	Wed Sep 29 21:06:03 2010	(r32411)
+++ trunk/stream/open.c	Wed Sep 29 21:43:34 2010	(r32412)
@@ -44,6 +44,7 @@ int dvd_chapter=1;
 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)
 

Modified: trunk/stream/stream_bd.c
==============================================================================
--- trunk/stream/stream_bd.c	Wed Sep 29 21:06:03 2010	(r32411)
+++ trunk/stream/stream_bd.c	Wed Sep 29 21:43:34 2010	(r32412)
@@ -452,8 +452,8 @@ static int bd_stream_open(stream_t *s, i
 
     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;
 

Modified: trunk/stream/stream_bluray.c
==============================================================================
--- trunk/stream/stream_bluray.c	Wed Sep 29 21:06:03 2010	(r32411)
+++ trunk/stream/stream_bluray.c	Wed Sep 29 21:43:34 2010	(r32412)
@@ -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;