[MPlayer-dev-eng] [PATCH] Set default Blu-ray device

[Brad Smith]

Submitting a local patch from our OpenBSD ports tree to set
a default Blu-ray device.


Index: configure
===================================================================
--- configure	(revision 36233)
+++ configure	(working copy)
@@ -5853,7 +5853,7 @@
 fi #if os2
 
 
-# set default CD/DVD devices
+# set default CD/DVD/Blu-ray devices
 if win32 || os2 ; then
   default_cdrom_device="D:"
 elif darwin ; then
@@ -5876,10 +5876,13 @@
 
 if win32 || os2 || dragonfly || freebsd || openbsd || sunos || amigaos ; then
   default_dvd_device=$default_cdrom_device
+  default_bluray_device=$default_cdrom_device
 elif darwin ; then
   default_dvd_device="/dev/rdiskN"
+  default_bluray_device="/dev/rdiskN"
 else
   default_dvd_device="/dev/dvd"
+  default_bluray_device="/dev/dvd"
 fi
 
 
@@ -8758,6 +8761,7 @@
 /* Blu-ray/DVD/VCD/CD */
 #define DEFAULT_CDROM_DEVICE "$default_cdrom_device"
 #define DEFAULT_DVD_DEVICE   "$default_dvd_device"
+#define DEFAULT_BLURAY_DEVICE "$default_bluray_device"
 $def_bluray
 $def_cddb
 $def_cdparanoia
Index: stream/stream_bluray.c
===================================================================
--- stream/stream_bluray.c	(revision 36233)
+++ stream/stream_bluray.c	(working copy)
@@ -254,6 +254,8 @@
         device = p->device;
     else if (bluray_device)
         device = bluray_device;
+    else
+        device = DEFAULT_BLURAY_DEVICE;
 
     if (!device) {
         mp_msg(MSGT_OPEN, MSGL_ERR, MSGTR_BlurayNoDevice);

-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.