Small cleanup

This commit is contained in:
twinaphex 2017-01-22 16:54:33 +01:00
parent a9a3f6b078
commit 5bc611c885
3 changed files with 2 additions and 5 deletions

View File

@ -370,7 +370,7 @@ int16_t input_state(unsigned port, unsigned device,
} }
} }
if (!input_driver_flushing_input if ( !input_driver_flushing_input
&& !input_driver_block_libretro_input) && !input_driver_block_libretro_input)
{ {
if (((id < RARCH_FIRST_META_KEY) || (device == RETRO_DEVICE_KEYBOARD))) if (((id < RARCH_FIRST_META_KEY) || (device == RETRO_DEVICE_KEYBOARD)))

View File

@ -379,8 +379,6 @@ bool bsv_movie_ctl(enum bsv_ctl_state state, void *data)
case BSV_MOVIE_CTL_UNSET_START_PLAYBACK: case BSV_MOVIE_CTL_UNSET_START_PLAYBACK:
bsv_movie_state.movie_start_playback = false; bsv_movie_state.movie_start_playback = false;
break; break;
case BSV_MOVIE_CTL_END:
return bsv_movie_state.movie_end;
case BSV_MOVIE_CTL_SET_END_EOF: case BSV_MOVIE_CTL_SET_END_EOF:
bsv_movie_state.eof_exit = true; bsv_movie_state.eof_exit = true;
break; break;
@ -468,7 +466,7 @@ bool bsv_movie_init_handle(const char *path,
/* Checks if movie is being played back. */ /* Checks if movie is being played back. */
static bool runloop_check_movie_playback(void) static bool runloop_check_movie_playback(void)
{ {
if (!bsv_movie_ctl(BSV_MOVIE_CTL_END, NULL)) if (!bsv_movie_state.movie_end)
return false; return false;
runloop_msg_queue_push( runloop_msg_queue_push(

View File

@ -64,7 +64,6 @@ enum bsv_ctl_state
BSV_MOVIE_CTL_INIT, BSV_MOVIE_CTL_INIT,
BSV_MOVIE_CTL_END_EOF, BSV_MOVIE_CTL_END_EOF,
BSV_MOVIE_CTL_SET_END_EOF, BSV_MOVIE_CTL_SET_END_EOF,
BSV_MOVIE_CTL_END,
BSV_MOVIE_CTL_SET_END, BSV_MOVIE_CTL_SET_END,
BSV_MOVIE_CTL_UNSET_END BSV_MOVIE_CTL_UNSET_END
}; };