audio_driver_ctl - cleanups

This commit is contained in:
twinaphex 2016-03-04 22:10:47 +01:00
parent 508d849fa5
commit d56bde43e8
1 changed files with 13 additions and 13 deletions

View File

@ -805,25 +805,25 @@ bool audio_driver_ctl(enum rarch_audio_ctl_state state, void *data)
audio_driver_context_audio_data = NULL; audio_driver_context_audio_data = NULL;
break; break;
case RARCH_AUDIO_CTL_DEINIT: case RARCH_AUDIO_CTL_DEINIT:
if (uninit_audio()) if (!uninit_audio())
return true; return false;
break; break;
case RARCH_AUDIO_CTL_SETUP_REWIND: case RARCH_AUDIO_CTL_SETUP_REWIND:
audio_driver_setup_rewind(); audio_driver_setup_rewind();
return true; break;
case RARCH_AUDIO_CTL_SET_CALLBACK_ENABLE: case RARCH_AUDIO_CTL_SET_CALLBACK_ENABLE:
if (!audio_driver_ctl(RARCH_AUDIO_CTL_HAS_CALLBACK, NULL)) if (!audio_driver_ctl(RARCH_AUDIO_CTL_HAS_CALLBACK, NULL))
return false; return false;
if (audio_callback.set_state) if (audio_callback.set_state)
audio_callback.set_state(true); audio_callback.set_state(true);
return true; break;
case RARCH_AUDIO_CTL_SET_CALLBACK_DISABLE: case RARCH_AUDIO_CTL_SET_CALLBACK_DISABLE:
if (!audio_driver_ctl(RARCH_AUDIO_CTL_HAS_CALLBACK, NULL)) if (!audio_driver_ctl(RARCH_AUDIO_CTL_HAS_CALLBACK, NULL))
return false; return false;
if (audio_callback.set_state) if (audio_callback.set_state)
audio_callback.set_state(false); audio_callback.set_state(false);
return true; break;
case RARCH_AUDIO_CTL_HAS_CALLBACK: case RARCH_AUDIO_CTL_HAS_CALLBACK:
return audio_callback.callback; return audio_callback.callback;
case RARCH_AUDIO_CTL_CALLBACK: case RARCH_AUDIO_CTL_CALLBACK:
@ -832,11 +832,11 @@ bool audio_driver_ctl(enum rarch_audio_ctl_state state, void *data)
if (audio_callback.callback) if (audio_callback.callback)
audio_callback.callback(); audio_callback.callback();
return true; break;
case RARCH_AUDIO_CTL_UNSET_CALLBACK: case RARCH_AUDIO_CTL_UNSET_CALLBACK:
audio_callback.callback = NULL; audio_callback.callback = NULL;
audio_callback.set_state = NULL; audio_callback.set_state = NULL;
return true; break;
case RARCH_AUDIO_CTL_SET_CALLBACK: case RARCH_AUDIO_CTL_SET_CALLBACK:
{ {
const struct retro_audio_callback *cb = const struct retro_audio_callback *cb =
@ -855,10 +855,10 @@ bool audio_driver_ctl(enum rarch_audio_ctl_state state, void *data)
if (cb) if (cb)
audio_callback = *cb; audio_callback = *cb;
} }
return true; break;
case RARCH_AUDIO_CTL_MONITOR_ADJUST_SYSTEM_RATES: case RARCH_AUDIO_CTL_MONITOR_ADJUST_SYSTEM_RATES:
audio_monitor_adjust_system_rates(); audio_monitor_adjust_system_rates();
return true; break;
case RARCH_AUDIO_CTL_MONITOR_SET_REFRESH_RATE: case RARCH_AUDIO_CTL_MONITOR_SET_REFRESH_RATE:
{ {
double new_src_ratio = (double)settings->audio.out_rate / double new_src_ratio = (double)settings->audio.out_rate /
@ -867,7 +867,7 @@ bool audio_driver_ctl(enum rarch_audio_ctl_state state, void *data)
audio_driver_data.orig_src_ratio = new_src_ratio; audio_driver_data.orig_src_ratio = new_src_ratio;
audio_driver_data.src_ratio = new_src_ratio; audio_driver_data.src_ratio = new_src_ratio;
} }
return true; break;
case RARCH_AUDIO_CTL_MUTE_TOGGLE: case RARCH_AUDIO_CTL_MUTE_TOGGLE:
if (!audio_driver_context_audio_data) if (!audio_driver_context_audio_data)
return false; return false;
@ -883,7 +883,7 @@ bool audio_driver_ctl(enum rarch_audio_ctl_state state, void *data)
audio_driver_ctl(RARCH_AUDIO_CTL_UNSET_ACTIVE, NULL); audio_driver_ctl(RARCH_AUDIO_CTL_UNSET_ACTIVE, NULL);
return false; return false;
} }
return true; break;
case RARCH_AUDIO_CTL_ALIVE: case RARCH_AUDIO_CTL_ALIVE:
if (!current_audio || !current_audio->alive if (!current_audio || !current_audio->alive
|| !audio_driver_context_audio_data) || !audio_driver_context_audio_data)
@ -922,11 +922,11 @@ bool audio_driver_ctl(enum rarch_audio_ctl_state state, void *data)
audio_driver_flush( audio_driver_flush(
audio_driver_data.rewind.buf + audio_driver_data.rewind.ptr, audio_driver_data.rewind.buf + audio_driver_data.rewind.ptr,
audio_driver_data.rewind.size - audio_driver_data.rewind.ptr); audio_driver_data.rewind.size - audio_driver_data.rewind.ptr);
return true; break;
case RARCH_AUDIO_CTL_NONE: case RARCH_AUDIO_CTL_NONE:
default: default:
break; break;
} }
return false; return true;
} }