diff options
| author |  wm4 <wm4@nowhere> | 2014-06-10 22:09:27 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-06-11 00:39:06 +0200 |
| commit | 35e6d1abe0315caee3f21ca3853d76423baa0c91 (patch) | |
| tree | e17f0f7f035cf8c5ee3cd5aab741bddc1a134b36 /player | |
| parent | 959b718957527710b4bcf6e7227a0beaeb034137 (diff) | |
stream_dvd, stream_dvdnav, stream_bluray: remove global option variables
Diffstat (limited to 'player')
| -rw-r--r-- | player/configfiles.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/player/configfiles.c b/player/configfiles.c index fd0a8231c0..94b8e33f85 100644 --- a/player/configfiles.c +++ b/player/configfiles.c @@ -31,6 +31,7 @@ #include "osdep/io.h" +#include "common/global.h" #include "common/msg.h" #include "options/path.h" #include "options/m_config.h" @@ -175,6 +176,7 @@ void mp_load_auto_profiles(struct MPContext *mpctx) static char *mp_get_playback_resume_config_filename(struct mpv_global *global, const char *fname) { + struct MPOpts *opts = global->opts; char *res = NULL; void *tmp = talloc_new(NULL); const char *realpath = fname; @@ -185,15 +187,11 @@ static char *mp_get_playback_resume_config_filename(struct mpv_global *global, goto exit; realpath = mp_path_join(tmp, bstr0(cwd), bstr0(fname)); } -#if HAVE_DVDREAD || HAVE_DVDNAV if (bstr_startswith0(bfname, "dvd://")) - realpath = talloc_asprintf(tmp, "%s - %s", realpath, dvd_device); -#endif -#if HAVE_LIBBLURAY + realpath = talloc_asprintf(tmp, "%s - %s", realpath, opts->dvd_device); if (bstr_startswith0(bfname, "br://") || bstr_startswith0(bfname, "bd://") || bstr_startswith0(bfname, "bluray://")) - realpath = talloc_asprintf(tmp, "%s - %s", realpath, bluray_device); -#endif + realpath = talloc_asprintf(tmp, "%s - %s", realpath, opts->bluray_device); uint8_t md5[16]; av_md5_sum(md5, realpath, strlen(realpath)); char *conf = talloc_strdup(tmp, ""); |