Remove audiomixer-test.diff
This commit is contained in:
parent
bac9973354
commit
fa5d2b9920
|
@ -1,37 +0,0 @@
|
|||
diff --git a/audio/audio_driver.c b/audio/audio_driver.c
|
||||
index 10dcbc5b3..0d2bb4d85 100644
|
||||
--- a/audio/audio_driver.c
|
||||
+++ b/audio/audio_driver.c
|
||||
@@ -464,6 +464,8 @@ static bool audio_driver_init_internal(bool audio_cb_inited)
|
||||
|
||||
audio_driver_free_samples_count = 0;
|
||||
|
||||
+ audio_mixer_init(48000);
|
||||
+
|
||||
/* Threaded driver is initially stopped. */
|
||||
if (
|
||||
audio_driver_active
|
||||
@@ -597,6 +599,8 @@ static bool audio_driver_flush(const int16_t *data, size_t samples)
|
||||
|
||||
audio_driver_resampler->process(audio_driver_resampler_data, &src_data);
|
||||
|
||||
+ audio_mixer_mix(audio_driver_output_samples_buf, src_data.output_frames);
|
||||
+
|
||||
output_data = audio_driver_output_samples_buf;
|
||||
output_frames = (unsigned)src_data.output_frames;
|
||||
|
||||
diff --git a/runloop.c b/runloop.c
|
||||
index 0e3a8dc44..4f79b2ed7 100644
|
||||
--- a/runloop.c
|
||||
+++ b/runloop.c
|
||||
@@ -1021,7 +1021,10 @@ static enum runloop_state runloop_check_state(
|
||||
command_event(CMD_EVENT_DISK_PREV, NULL);
|
||||
|
||||
if (runloop_cmd_triggered(trigger_input, RARCH_RESET))
|
||||
+ {
|
||||
command_event(CMD_EVENT_RESET, NULL);
|
||||
+ audio_mixer_load_ogg("/home/squarepusher/SumertimeBlues.ogg");
|
||||
+ }
|
||||
|
||||
cheat_manager_state_checks(
|
||||
runloop_cmd_triggered(trigger_input, RARCH_CHEAT_INDEX_PLUS),
|
Loading…
Reference in New Issue