summaryrefslogtreecommitdiffstats
path: root/command.c
diff options
context:
space:
mode:
authorwm4 <wm4@mplayer2.org>2012-01-07 18:16:12 +0100
committerwm4 <wm4@mplayer2.org>2012-01-18 04:21:45 +0100
commitad18a33f5876be0c791bc394348a8333c50317b5 (patch)
treee6605588b266aef95e3eda8e1bbf9dea51ba83fb /command.c
parentb338b16be7fe902723fc9c5c20f88959264e67d7 (diff)
downloadmpv-ad18a33f5876be0c791bc394348a8333c50317b5.tar.bz2
mpv-ad18a33f5876be0c791bc394348a8333c50317b5.tar.xz
core: remove EDL muting
I'm not sure what's the point of this feature. Aside from that, the EDL code is relatively buggy anyway, and I see no reason why such an obscure feature should be left in, if it possibly causes bugs.
Diffstat (limited to 'command.c')
-rw-r--r--command.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/command.c b/command.c
index 414fd1e33b..1234c0847d 100644
--- a/command.c
+++ b/command.c
@@ -721,10 +721,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) {
case M_PROPERTY_SET:
if (!arg)
@@ -758,27 +754,14 @@ 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;
mixer_setmuted(&mpctx->mixer, *(int *) arg);
- mpctx->user_muted = mixer_getmuted(&mpctx->mixer);
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 = mixer_getmuted(&mpctx->mixer);
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_ro(prop, action, arg,
mixer_getmuted(&mpctx->mixer));