Mercurial > mplayer.hg

diff cfg-common.h @ 32326:4189a8951568

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use bluray_device variable also for bd:// instead of dvd_device which does not make sense.
author reimar
date Wed, 29 Sep 2010 19:43:34 +0000
parents 4614728cab25
children fbe5c829c69b
line wrap: on
line diff
--- 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 */