vlc | branch: master | Thomas Guillem <[email protected]> | Wed Aug 7 13:33:12 2019 +0200| [42eabf728974d90e94b70b63124c21b03c005ae5] | committer: Thomas Guillem
player: move function up No functional changes. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=42eabf728974d90e94b70b63124c21b03c005ae5 --- src/input/player.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/input/player.c b/src/input/player.c index 0764d4cd1e..085ea09926 100644 --- a/src/input/player.c +++ b/src/input/player.c @@ -739,6 +739,24 @@ vlc_player_input_Delete(struct vlc_player_input *input) free(input); } +static void +vlc_player_HandleAtoBLoop(vlc_player_t *player) +{ + struct vlc_player_input *input = vlc_player_get_input_locked(player); + assert(input); + assert(input->abloop_state[0].set && input->abloop_state[1].set); + + if (input->time != VLC_TICK_INVALID + && input->abloop_state[0].time != VLC_TICK_INVALID + && input->abloop_state[1].time != VLC_TICK_INVALID) + { + if (input->time >= input->abloop_state[1].time) + vlc_player_SetTime(player, input->abloop_state[0].time); + } + else if (input->position >= input->abloop_state[1].pos) + vlc_player_SetPosition(player, input->abloop_state[0].pos); +} + static int vlc_player_input_Start(struct vlc_player_input *input) { @@ -2153,24 +2171,6 @@ vlc_player_input_HandleStateEvent(struct vlc_player_input *input, } static void -vlc_player_HandleAtoBLoop(vlc_player_t *player) -{ - struct vlc_player_input *input = vlc_player_get_input_locked(player); - assert(input); - assert(input->abloop_state[0].set && input->abloop_state[1].set); - - if (input->time != VLC_TICK_INVALID - && input->abloop_state[0].time != VLC_TICK_INVALID - && input->abloop_state[1].time != VLC_TICK_INVALID) - { - if (input->time >= input->abloop_state[1].time) - vlc_player_SetTime(player, input->abloop_state[0].time); - } - else if (input->position >= input->abloop_state[1].pos) - vlc_player_SetPosition(player, input->abloop_state[0].pos); -} - -static void input_thread_Events(input_thread_t *input_thread, const struct vlc_input_event *event, void *user_data) { _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
