Buildfix
This commit is contained in:
parent
660d0c8de9
commit
a51acb8377
|
@ -634,13 +634,9 @@ static void audio_driver_flush(const int16_t *data, size_t samples)
|
||||||
src_data.data_out = NULL;
|
src_data.data_out = NULL;
|
||||||
src_data.output_frames = 0;
|
src_data.output_frames = 0;
|
||||||
|
|
||||||
recording_driver_lock();
|
|
||||||
|
|
||||||
if (recording_data)
|
if (recording_data)
|
||||||
recording_push_audio(data, samples);
|
recording_push_audio(data, samples);
|
||||||
|
|
||||||
recording_driver_unlock();
|
|
||||||
|
|
||||||
runloop_get_status(&is_paused, &is_idle, &is_slowmotion,
|
runloop_get_status(&is_paused, &is_idle, &is_slowmotion,
|
||||||
&is_perfcnt_enable);
|
&is_perfcnt_enable);
|
||||||
|
|
||||||
|
|
|
@ -92,7 +92,6 @@ void main_exit(void *args)
|
||||||
driver_ctl(RARCH_DRIVER_CTL_DEINIT, NULL);
|
driver_ctl(RARCH_DRIVER_CTL_DEINIT, NULL);
|
||||||
ui_companion_driver_free();
|
ui_companion_driver_free();
|
||||||
frontend_driver_free();
|
frontend_driver_free();
|
||||||
recording_driver_lock_free();
|
|
||||||
|
|
||||||
#if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__)
|
#if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__)
|
||||||
CoUninitialize();
|
CoUninitialize();
|
||||||
|
|
|
@ -1414,8 +1414,6 @@ bool video_driver_cached_frame(void)
|
||||||
{
|
{
|
||||||
void *recording = recording_driver_get_data_ptr();
|
void *recording = recording_driver_get_data_ptr();
|
||||||
|
|
||||||
recording_driver_lock();
|
|
||||||
|
|
||||||
/* Cannot allow recording when pushing duped frames. */
|
/* Cannot allow recording when pushing duped frames. */
|
||||||
recording_data = NULL;
|
recording_data = NULL;
|
||||||
|
|
||||||
|
@ -1427,8 +1425,6 @@ bool video_driver_cached_frame(void)
|
||||||
|
|
||||||
recording_data = recording;
|
recording_data = recording;
|
||||||
|
|
||||||
recording_driver_unlock();
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -37,10 +37,6 @@
|
||||||
#include "../list_special.h"
|
#include "../list_special.h"
|
||||||
#include "../paths.h"
|
#include "../paths.h"
|
||||||
|
|
||||||
#ifdef HAVE_THREADS
|
|
||||||
#include <rthreads/rthreads.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static const record_driver_t *record_drivers[] = {
|
static const record_driver_t *record_drivers[] = {
|
||||||
#ifdef HAVE_FFMPEG
|
#ifdef HAVE_FFMPEG
|
||||||
&record_ffmpeg,
|
&record_ffmpeg,
|
||||||
|
@ -59,51 +55,6 @@ static bool streaming_enable = false;
|
||||||
static const record_driver_t *recording_driver = NULL;
|
static const record_driver_t *recording_driver = NULL;
|
||||||
void *recording_data = NULL;
|
void *recording_data = NULL;
|
||||||
|
|
||||||
#ifdef HAVE_THREADS
|
|
||||||
static slock_t *s_recording_driver_lock = NULL;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
bool recording_driver_lock_inited(void)
|
|
||||||
{
|
|
||||||
#ifdef HAVE_THREADS
|
|
||||||
return s_recording_driver_lock != NULL;
|
|
||||||
#else
|
|
||||||
return false;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
void recording_driver_lock_init(void)
|
|
||||||
{
|
|
||||||
#ifdef HAVE_THREADS
|
|
||||||
s_recording_driver_lock = slock_new();
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
void recording_driver_lock_free(void)
|
|
||||||
{
|
|
||||||
#ifdef HAVE_THREADS
|
|
||||||
if (s_recording_driver_lock)
|
|
||||||
slock_free(s_recording_driver_lock);
|
|
||||||
s_recording_driver_lock = NULL;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
void recording_driver_lock(void)
|
|
||||||
{
|
|
||||||
#ifdef HAVE_THREADS
|
|
||||||
if (s_recording_driver_lock)
|
|
||||||
slock_lock(s_recording_driver_lock);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
void recording_driver_unlock(void)
|
|
||||||
{
|
|
||||||
#ifdef HAVE_THREADS
|
|
||||||
if (s_recording_driver_lock)
|
|
||||||
slock_unlock(s_recording_driver_lock);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* record_driver_find_ident:
|
* record_driver_find_ident:
|
||||||
* @idx : index of driver to get handle to.
|
* @idx : index of driver to get handle to.
|
||||||
|
|
|
@ -214,16 +214,6 @@ bool streaming_is_enabled(void);
|
||||||
|
|
||||||
void recording_driver_update_streaming_url(void);
|
void recording_driver_update_streaming_url(void);
|
||||||
|
|
||||||
bool recording_driver_lock_inited(void);
|
|
||||||
|
|
||||||
void recording_driver_lock_init(void);
|
|
||||||
|
|
||||||
void recording_driver_lock(void);
|
|
||||||
|
|
||||||
void recording_driver_unlock(void);
|
|
||||||
|
|
||||||
void recording_driver_lock_free(void);
|
|
||||||
|
|
||||||
extern void *recording_data;
|
extern void *recording_data;
|
||||||
|
|
||||||
RETRO_END_DECLS
|
RETRO_END_DECLS
|
||||||
|
|
|
@ -1406,10 +1406,6 @@ bool retroarch_main_init(int argc, char *argv[])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (recording_driver_lock_inited())
|
|
||||||
recording_driver_lock_free();
|
|
||||||
recording_driver_lock_init();
|
|
||||||
|
|
||||||
command_event(CMD_EVENT_CHEATS_INIT, NULL);
|
command_event(CMD_EVENT_CHEATS_INIT, NULL);
|
||||||
drivers_init(DRIVERS_CMD_ALL);
|
drivers_init(DRIVERS_CMD_ALL);
|
||||||
command_event(CMD_EVENT_COMMAND_INIT, NULL);
|
command_event(CMD_EVENT_COMMAND_INIT, NULL);
|
||||||
|
|
Loading…
Reference in New Issue