mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 12:40:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't reset volume settings on driver reinit.

Browse Source
This commit is contained in:
Themaister 2014-02-08 16:24:21 +01:00
parent c9b8bfdbbc
commit 4653174cf5
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
driver.c
View File

@ -1111,9 +1111,6 @@ void init_audio(void)
RARCH_WARN("Audio rate control was desired, but driver does not support needed features.\n"); RARCH_WARN("Audio rate control was desired, but driver does not support needed features.\n");
} }
g_extern.audio_data.volume_db = g_settings.audio.volume;
g_extern.audio_data.volume_gain = db_to_gain(g_settings.audio.volume);
#ifdef HAVE_DYLIB #ifdef HAVE_DYLIB
init_dsp_plugin(); init_dsp_plugin();
#endif #endif

4
settings.c
View File

@ -286,6 +286,8 @@ void config_set_defaults(void)
g_settings.audio.rate_control = rate_control; g_settings.audio.rate_control = rate_control;
g_settings.audio.rate_control_delta = rate_control_delta; g_settings.audio.rate_control_delta = rate_control_delta;
g_settings.audio.volume = audio_volume; g_settings.audio.volume = audio_volume;
g_extern.audio_data.volume_db = g_settings.audio.volume;
g_extern.audio_data.volume_gain = db_to_gain(g_settings.audio.volume);
g_settings.rewind_enable = rewind_enable; g_settings.rewind_enable = rewind_enable;
g_settings.rewind_buffer_size = rewind_buffer_size; g_settings.rewind_buffer_size = rewind_buffer_size;
@ -884,6 +886,8 @@ bool config_load_file(const char *path, bool set_defaults)
CONFIG_GET_BOOL(audio.rate_control, "audio_rate_control"); CONFIG_GET_BOOL(audio.rate_control, "audio_rate_control");
CONFIG_GET_FLOAT(audio.rate_control_delta, "audio_rate_control_delta"); CONFIG_GET_FLOAT(audio.rate_control_delta, "audio_rate_control_delta");
CONFIG_GET_FLOAT(audio.volume, "audio_volume"); CONFIG_GET_FLOAT(audio.volume, "audio_volume");
g_extern.audio_data.volume_db = g_settings.audio.volume;
g_extern.audio_data.volume_gain = db_to_gain(g_settings.audio.volume);
#ifdef HAVE_CAMERA #ifdef HAVE_CAMERA
CONFIG_GET_STRING(camera.device, "camera_device"); CONFIG_GET_STRING(camera.device, "camera_device");