ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Expand rarch_main_command

This commit is contained in:
twinaphex 2014-10-03 11:33:58 +02:00
parent 154e7caf17
commit 16fd8b227e
2 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
general.h
View File

@ -111,6 +111,7 @@ enum basic_event
RARCH_CMD_OVERLAY_SET_ALPHA_MOD, RARCH_CMD_OVERLAY_SET_ALPHA_MOD,
RARCH_CMD_DSP_FILTER_INIT, RARCH_CMD_DSP_FILTER_INIT,
RARCH_CMD_DSP_FILTER_DEINIT, RARCH_CMD_DSP_FILTER_DEINIT,
RARCH_CMD_GPU_RECORD_DEINIT,
RARCH_CMD_RECORD_INIT, RARCH_CMD_RECORD_INIT,
RARCH_CMD_RECORD_DEINIT, RARCH_CMD_RECORD_DEINIT,
RARCH_CMD_HISTORY_DEINIT, RARCH_CMD_HISTORY_DEINIT,

55
retroarch.c
View File

@ -199,30 +199,6 @@ static void take_screenshot(void)
rarch_render_cached_frame(); rarch_render_cached_frame();
} }
static void rarch_deinit_gpu_recording(void)
{
if (g_extern.record_gpu_buffer)
free(g_extern.record_gpu_buffer);
g_extern.record_gpu_buffer = NULL;
}
static void rarch_deinit_recording(void)
{
if (!driver.recording_data || !driver.recording)
return;
if (driver.recording->finalize)
driver.recording->finalize(driver.recording_data);
if (driver.recording->free)
driver.recording->free(driver.recording_data);
driver.recording_data = NULL;
driver.recording = NULL;
rarch_deinit_gpu_recording();
}
void rarch_recording_dump_frame(const void *data, unsigned width, void rarch_recording_dump_frame(const void *data, unsigned width,
unsigned height, size_t pitch) unsigned height, size_t pitch)
{ {
@ -243,7 +219,7 @@ void rarch_recording_dump_frame(const void *data, unsigned width,
if (!vp.width || !vp.height) if (!vp.width || !vp.height)
{ {
RARCH_WARN("Viewport size calculation failed! Will continue using raw data. This will probably not work right ...\n"); RARCH_WARN("Viewport size calculation failed! Will continue using raw data. This will probably not work right ...\n");
rarch_deinit_gpu_recording(); rarch_main_command(RARCH_CMD_GPU_RECORD_DEINIT);
rarch_recording_dump_frame(data, width, height, pitch); rarch_recording_dump_frame(data, width, height, pitch);
return; return;
@ -258,7 +234,7 @@ void rarch_recording_dump_frame(const void *data, unsigned width,
msg_queue_clear(g_extern.msg_queue); msg_queue_clear(g_extern.msg_queue);
msg_queue_push(g_extern.msg_queue, msg, 1, 180); msg_queue_push(g_extern.msg_queue, msg, 1, 180);
rarch_deinit_recording(); rarch_main_command(RARCH_CMD_RECORD_DEINIT);
return; return;
} }
@ -405,7 +381,7 @@ static void init_recording(void)
if (!ffemu_init_first(&driver.recording, &driver.recording_data, &params)) if (!ffemu_init_first(&driver.recording, &driver.recording_data, &params))
{ {
RARCH_ERR(RETRO_LOG_INIT_RECORDING_FAILED); RARCH_ERR(RETRO_LOG_INIT_RECORDING_FAILED);
rarch_deinit_gpu_recording(); rarch_main_command(RARCH_CMD_GPU_RECORD_DEINIT);
} }
} }
@ -2434,7 +2410,7 @@ static void main_clear_state_extern(void)
*/ */
deinit_temporary_content(); deinit_temporary_content();
deinit_subsystem_fullpaths(); deinit_subsystem_fullpaths();
rarch_deinit_recording(); rarch_main_command(RARCH_CMD_RECORD_DEINIT);
deinit_log_file(); deinit_log_file();
history_playlist_free(); history_playlist_free();
@ -2656,7 +2632,7 @@ int rarch_main_init(int argc, char *argv[])
init_rewind(); init_rewind();
init_controllers(); init_controllers();
init_recording(); rarch_main_command(RARCH_CMD_RECORD_INIT);
init_sram(); init_sram();
@ -3049,11 +3025,28 @@ void rarch_main_command(unsigned cmd)
rarch_dsp_filter_free(g_extern.audio_data.dsp); rarch_dsp_filter_free(g_extern.audio_data.dsp);
g_extern.audio_data.dsp = NULL; g_extern.audio_data.dsp = NULL;
break; break;
case RARCH_CMD_GPU_RECORD_DEINIT:
if (g_extern.record_gpu_buffer)
free(g_extern.record_gpu_buffer);
g_extern.record_gpu_buffer = NULL;
break;
case RARCH_CMD_RECORD_INIT: case RARCH_CMD_RECORD_INIT:
init_recording(); init_recording();
break; break;
case RARCH_CMD_RECORD_DEINIT: case RARCH_CMD_RECORD_DEINIT:
rarch_deinit_recording(); if (!driver.recording_data || !driver.recording)
return;
if (driver.recording->finalize)
driver.recording->finalize(driver.recording_data);
if (driver.recording->free)
driver.recording->free(driver.recording_data);
driver.recording_data = NULL;
driver.recording = NULL;
rarch_main_command(RARCH_CMD_GPU_RECORD_DEINIT);
break; break;
case RARCH_CMD_HISTORY_INIT: case RARCH_CMD_HISTORY_INIT:
history_playlist_new(); history_playlist_new();
@ -3343,7 +3336,7 @@ void rarch_main_deinit(void)
deinit_autosave(); deinit_autosave();
#endif #endif
rarch_deinit_recording(); rarch_main_command(RARCH_CMD_RECORD_DEINIT);
save_files(); save_files();