summaryrefslogtreecommitdiffstats
path: root/command.c
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 /command.c
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 'command.c')
-rw-r--r--command.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/command.c b/command.c
index 5551da715c..48f0ecb013 100644
--- a/command.c
+++ b/command.c
@@ -719,8 +719,6 @@ static int mp_property_volume(m_option_t *prop, int action, void *arg,
return M_PROPERTY_NOT_IMPLEMENTED;
}
- if (mpctx->edl_muted)
- return M_PROPERTY_DISABLED;
mpctx->user_muted = 0;
switch (action) {
@@ -756,8 +754,6 @@ static int mp_property_mute(m_option_t *prop, int action, void *arg,
switch (action) {
case M_PROPERTY_SET:
- if (mpctx->edl_muted)
- return M_PROPERTY_DISABLED;
if (!arg)
return M_PROPERTY_ERROR;
if ((!!*(int *) arg) != mpctx->mixer.muted)
@@ -766,18 +762,9 @@ static int mp_property_mute(m_option_t *prop, int action, void *arg,
return M_PROPERTY_OK;
case M_PROPERTY_STEP_UP:
case M_PROPERTY_STEP_DOWN:
- if (mpctx->edl_muted)
- return M_PROPERTY_DISABLED;
mixer_mute(&mpctx->mixer);
mpctx->user_muted = mpctx->mixer.muted;
return M_PROPERTY_OK;
- case M_PROPERTY_PRINT:
- if (!arg)
- return M_PROPERTY_ERROR;
- if (mpctx->edl_muted) {
- *(char **) arg = talloc_strdup(NULL, mp_gtext("enabled (EDL)"));
- return M_PROPERTY_OK;
- }
default:
return m_property_flag(prop, action, arg, &mpctx->mixer.muted);