mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-24 15:02:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor more code

Browse Source
This commit is contained in:
twinaphex 2014-08-02 01:28:06 +02:00
parent 12471729f4
commit bccf887c44
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
retroarch.c
View File

@ -2076,18 +2076,23 @@ static void check_stateslots(void)
static inline void flush_rewind_audio(void) static inline void flush_rewind_audio(void)
{ {
if (g_extern.frame_is_reverse) // We just rewound. Flush rewind audio buffer. if (!g_extern.frame_is_reverse)
{ return;
g_extern.audio_active = audio_flush(g_extern.audio_data.rewind_buf + g_extern.audio_data.rewind_ptr,
g_extern.audio_data.rewind_size - g_extern.audio_data.rewind_ptr) && g_extern.audio_active; // We just rewound. Flush rewind audio buffer.
} g_extern.audio_active = audio_flush(g_extern.audio_data.rewind_buf + g_extern.audio_data.rewind_ptr,
g_extern.audio_data.rewind_size - g_extern.audio_data.rewind_ptr) && g_extern.audio_active;
g_extern.frame_is_reverse = false;
} }
static inline void setup_rewind_audio(void) static inline void setup_rewind_audio(void)
{ {
unsigned i; unsigned i;
// Push audio ready to be played. // Push audio ready to be played.
g_extern.audio_data.rewind_ptr = g_extern.audio_data.rewind_size; g_extern.audio_data.rewind_ptr = g_extern.audio_data.rewind_size;
for (i = 0; i < g_extern.audio_data.data_ptr; i += 2) for (i = 0; i < g_extern.audio_data.data_ptr; i += 2)
{ {
g_extern.audio_data.rewind_buf[--g_extern.audio_data.rewind_ptr] = g_extern.audio_data.rewind_buf[--g_extern.audio_data.rewind_ptr] =
@ -2103,7 +2108,6 @@ static inline void setup_rewind_audio(void)
static void check_rewind(void) static void check_rewind(void)
{ {
flush_rewind_audio(); flush_rewind_audio();
g_extern.frame_is_reverse = false;
static bool first = true; static bool first = true;
if (first) if (first)
@ -2166,16 +2170,20 @@ static void check_rewind(void)
static void check_slowmotion(void) static void check_slowmotion(void)
{ {
g_extern.is_slowmotion = input_key_pressed_func(RARCH_SLOWMOTION); g_extern.is_slowmotion = input_key_pressed_func(RARCH_SLOWMOTION);
if (g_extern.is_slowmotion)
{ if (!g_extern.is_slowmotion)
msg_queue_clear(g_extern.msg_queue); return;
msg_queue_push(g_extern.msg_queue, g_extern.frame_is_reverse ? "Slow motion rewind." : "Slow motion.", 0, 30);
} msg_queue_clear(g_extern.msg_queue);
msg_queue_push(g_extern.msg_queue, g_extern.frame_is_reverse ? "Slow motion rewind." : "Slow motion.", 0, 30);
} }
#ifdef HAVE_BSV_MOVIE #ifdef HAVE_BSV_MOVIE
static void movie_record_toggle(void) static void check_movie_record(bool pressed)
{ {
if (!pressed)
return;
if (g_extern.bsv.movie) if (g_extern.bsv.movie)
{ {
msg_queue_clear(g_extern.msg_queue); msg_queue_clear(g_extern.msg_queue);
@ -2185,9 +2193,10 @@ static void movie_record_toggle(void)
} }
else else
{ {
char path[PATH_MAX], msg[PATH_MAX];
g_settings.rewind_granularity = 1; g_settings.rewind_granularity = 1;
char path[PATH_MAX];
if (g_settings.state_slot > 0) if (g_settings.state_slot > 0)
{ {
snprintf(path, sizeof(path), "%s%u.bsv", snprintf(path, sizeof(path), "%s%u.bsv",
@ -2199,7 +2208,6 @@ static void movie_record_toggle(void)
g_extern.bsv.movie_path); g_extern.bsv.movie_path);
} }
char msg[PATH_MAX];
snprintf(msg, sizeof(msg), "Starting movie record to \"%s\".", path); snprintf(msg, sizeof(msg), "Starting movie record to \"%s\".", path);
g_extern.bsv.movie = bsv_movie_init(path, RARCH_MOVIE_RECORD); g_extern.bsv.movie = bsv_movie_init(path, RARCH_MOVIE_RECORD);
@ -2213,12 +2221,6 @@ static void movie_record_toggle(void)
} }
} }
static void check_movie_record(bool pressed)
{
if (pressed)
movie_record_toggle();
}
static void check_movie_playback(bool pressed) static void check_movie_playback(bool pressed)
{ {
if (g_extern.bsv.movie_end || pressed) if (g_extern.bsv.movie_end || pressed)