summaryrefslogtreecommitdiffstats
path: root/mp_core.h
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2012-01-19 06:49:47 +0200
committerUoti Urpala <uau@mplayer2.org>2012-03-09 20:48:54 +0200
commit7576885677764a71fe03cec5f697f8a28f9365c8 (patch)
treee93b5c8469cbfc1ac6fc60684f5564a8f6a95be8 /mp_core.h
parent8a6b0b813a1431ca50986c90d97b72fa6640dbea (diff)
downloadmpv-7576885677764a71fe03cec5f697f8a28f9365c8.tar.bz2
mpv-7576885677764a71fe03cec5f697f8a28f9365c8.tar.xz
core: remove old EDL mode (--edl option)
Remove the old EDL implementation that was activated with the --edl option. It is mostly redundant and inferior compared to the newer demux_edl support, though currently there's no support for using the same EDL files with the new implementation and the mute functionality of the old implementation is not supported. The main reason to remove the old implementation at this point is that the mute functionality would conflict with following audio volume handling changes, and working on the old code would be a wasted effort in the long run as at some point it would be removed anyway. The --edlout functionality is kept for now, even though after this commit there is no code that could directly read its output.
Diffstat (limited to 'mp_core.h')
-rw-r--r--mp_core.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/mp_core.h b/mp_core.h
index e46d3d77d2..1796f1b7f2 100644
--- a/mp_core.h
+++ b/mp_core.h
@@ -187,8 +187,7 @@ typedef struct MPContext {
double last_chapter_pts;
float begin_skip; ///< start time of the current skip while on edlout mode
- // audio is muted if either EDL or user activates mute
- short edl_muted; ///< Stores whether EDL is currently in muted mode.
+
short user_muted; ///< Stores whether user wanted muted mode.
int global_sub_size; // this encompasses all subtitle sources