diff options
author | reynaldo <reynaldo@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-11-05 21:44:20 +0000 |
---|---|---|
committer | reynaldo <reynaldo@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-11-05 21:44:20 +0000 |
commit | e524c836a07ee016bd3c2df458aadd26ab7d1ceb (patch) | |
tree | f6307b95ee2053fdfb50cbf1b866a79bdbad4597 /mplayer.c | |
parent | 9ea3354fbfd41d3905dcce292027ee683dfc386c (diff) | |
download | mpv-e524c836a07ee016bd3c2df458aadd26ab7d1ceb.tar.bz2 mpv-e524c836a07ee016bd3c2df458aadd26ab7d1ceb.tar.xz |
Replaces edl_mute_count with togle making code more understandable, other trivial list suggested changes too, Patch by Oded Shimon
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13883 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -361,9 +361,9 @@ edl_record_ptr next_edl_record = NULL; ///< only for traversing edl_records int edl_memory_slots = 0; ///< number of EDL entries (1 for skip + 2 for each mute) int edl_operations = 0; ///< number of EDL operations, skip + mute short user_muted = 0; ///< Stores whether User wanted muted mode. +short edl_muted = 0; ///< Stores whether EDL is currently in muted mode. short edl_decision = 0; ///< 1 when an EDL operation has been made FILE* edl_fd = NULL; ///< fd to write to when in -edlout mode -int edl_mute_count = 0; ///< even number when mute and unmute has been matched #endif static unsigned int inited_flags=0; @@ -2650,8 +2650,8 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still) mp_msg(MSGT_CPLAYER, MSGL_DBG4, "EDL_SKIP: start [%f], stop [%f], length [%f]\n", next_edl_record->start_sec, next_edl_record->stop_sec, next_edl_record->length_sec ); edl_decision = 1; } else if( next_edl_record->action == EDL_MUTE ) { - edl_mute_count++; // new EDL seek behavior needs this - if ((user_muted | (edl_mute_count & 1)) != mixer.muted) mixer_mute(&mixer); + edl_muted = !edl_muted; + if ((user_muted | edl_muted) != mixer.muted) mixer_mute(&mixer); mp_msg(MSGT_CPLAYER, MSGL_DBG4, "EDL_MUTE: [%f]\n", next_edl_record->start_sec ); } next_edl_record=next_edl_record->next; @@ -2845,7 +2845,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still) int abs = (cmd->nargs > 1) ? cmd->args[1].v.i : 0; #ifdef USE_EDL - if (edl_mute_count & 1) break; + if (edl_muted) break; user_muted = 0; #endif if( abs ) @@ -2871,8 +2871,8 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still) } break; case MP_CMD_MUTE: #ifdef USE_EDL - user_muted = user_muted ? 0 : 1; - if (((edl_mute_count & 1) | user_muted) != mixer.muted) + user_muted = !user_muted; + if ((edl_muted | user_muted) != mixer.muted) #endif mixer_mute(&mixer); break; @@ -3756,7 +3756,7 @@ if(rel_seek_secs || abs_seek_pos){ * and find the next EDL action to take care of. */ -edl_mute_count = 0; +edl_muted = 0; next_edl_record = edl_records; while (next_edl_record) @@ -3768,11 +3768,11 @@ while (next_edl_record) if (next_edl_record->start_sec >= sh_video->pts) break; - if (next_edl_record->action == EDL_MUTE) edl_mute_count++; + if (next_edl_record->action == EDL_MUTE) edl_muted = !edl_muted; next_edl_record = next_edl_record->next; } -if ((user_muted | (edl_mute_count & 1)) != mixer.muted) mixer_mute(&mixer); +if ((user_muted | edl_muted) != mixer.muted) mixer_mute(&mixer); #endif rel_seek_secs=0; abs_seek_pos=0; |