diff options
author | wm4 <wm4@mplayer2.org> | 2012-01-07 18:16:12 +0100 |
---|---|---|
committer | wm4 <wm4@mplayer2.org> | 2012-01-18 04:21:45 +0100 |
commit | ad18a33f5876be0c791bc394348a8333c50317b5 (patch) | |
tree | e6605588b266aef95e3eda8e1bbf9dea51ba83fb /mplayer.c | |
parent | b338b16be7fe902723fc9c5c20f88959264e67d7 (diff) | |
download | mpv-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 'mplayer.c')
-rw-r--r-- | mplayer.c | 25 |
1 files changed, 1 insertions, 24 deletions
@@ -3107,25 +3107,6 @@ static void pause_loop(struct MPContext *mpctx) } } - -// Find the right mute status and record position for new file position -static void edl_seek_reset(MPContext *mpctx) -{ - mpctx->edl_muted = 0; - next_edl_record = edl_records; - - while (next_edl_record) { - if (next_edl_record->start_sec >= get_current_time(mpctx)) - break; - - if (next_edl_record->action == EDL_MUTE) - mpctx->edl_muted = !mpctx->edl_muted; - next_edl_record = next_edl_record->next; - } - mixer_setmuted(&mpctx->mixer, mpctx->edl_muted || mpctx->user_muted); -} - - // Execute EDL command for the current position if one exists static void edl_update(MPContext *mpctx) { @@ -3149,9 +3130,7 @@ static void edl_update(MPContext *mpctx) "[%f], length [%f]\n", next_edl_record->start_sec, next_edl_record->stop_sec, next_edl_record->length_sec); } else if (next_edl_record->action == EDL_MUTE) { - mpctx->edl_muted = !mpctx->edl_muted; - mixer_setmuted(&mpctx->mixer, mpctx->edl_muted || mpctx->user_muted); - mp_msg(MSGT_CPLAYER, MSGL_DBG4, "EDL_MUTE: [%f]\n", + mp_msg(MSGT_CPLAYER, MSGL_DBG4, "EDL_MUTE: [%f] ignored\n", next_edl_record->start_sec); } next_edl_record = next_edl_record->next; @@ -3205,8 +3184,6 @@ static void seek_reset(struct MPContext *mpctx, bool reset_ao) vobsub_seek(vo_vobsub, mpctx->sh_video->pts); } - edl_seek_reset(mpctx); - mpctx->hrseek_active = false; mpctx->hrseek_framedrop = false; mpctx->total_avsync_change = 0; |