Mercurial > mplayer.hg
changeset 32326:4189a8951568
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 | 0ba9d1a85eb4 |
| children | d1745cd88563 |
| files | cfg-common.h stream/open.c stream/stream_bd.c stream/stream_bluray.c |
| diffstat | 4 files changed, 4 insertions(+), 5 deletions(-) [+] |
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 */
--- 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)
--- 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;