diff options
| author | wm4 <wm4@nowhere> | 2013-09-22 03:04:57 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-09-22 03:31:25 +0200 |
| commit | cc7f8ee6204ffbeac195623a6be59ab9bcc32622 (patch) | |
| tree | 5a7026d8d36ffe1168c1d1ed70d27f98ad912732 /mpvcore/options.c | |
| parent | b0f7a26f1a6dc061db0a60908842371e7a010db2 (diff) | |
| download | mpv-cc7f8ee6204ffbeac195623a6be59ab9bcc32622.tar.bz2 mpv-cc7f8ee6204ffbeac195623a6be59ab9bcc32622.tar.xz | |
mplayer: attempt to make playback resume work with DVD/BD
The problem with DVD/BD and playback resume is that most often, the
filename is just "dvd://", while the actual path to the DVD disk image
is given with --dvd-device. But playback resume works on the filename
only.
Add a pretty bad hack that includes the path to the disk image if the
filename starts with dvd://, and the same for BD respectively. (It's a
bad hack, but I want to go to bed, so here we go. I might revert or
improve it later, depending on user feedback.)
We have to cleanup the global variable mess around the dvd_device.
Ideally, this should go into MPOpts, but it isn't yet. Make the code
paths in mplayer.c take MPOpts anyway.
Diffstat (limited to 'mpvcore/options.c')
| -rw-r--r-- | mpvcore/options.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/mpvcore/options.c b/mpvcore/options.c index afeb7e80fa..658003492e 100644 --- a/mpvcore/options.c +++ b/mpvcore/options.c @@ -53,8 +53,6 @@ extern char *lirc_configfile; extern int mp_msg_color; extern int mp_msg_module; -extern int dvd_speed; /* stream/stream_dvd.c */ - /* defined in demux: */ extern const m_option_t demux_rawaudio_opts[]; extern const m_option_t demux_rawvideo_opts[]; @@ -178,8 +176,6 @@ static const m_option_t scaler_filter_conf[]={ {NULL, NULL, 0, 0, 0, 0, NULL} }; -extern char *dvd_device, *cdrom_device; - extern double mf_fps; extern char * mf_type; extern const struct m_obj_list vf_obj_list; |