Revert "Cleanups"

This reverts commit a4963d2a19ffd01951977cfbb70257e2eae63c14.
This commit is contained in:
twinaphex 2017-04-23 15:10:34 +02:00
parent a4963d2a19
commit 299b72e208

View File

@ -554,6 +554,8 @@ static bool audio_driver_flush(const int16_t *data, size_t samples)
} }
} }
src_data.data_out = audio_driver_output_samples_buf;
if (audio_driver_control) if (audio_driver_control)
{ {
/* Readjust the audio input rate. */ /* Readjust the audio input rate. */
@ -582,27 +584,24 @@ static bool audio_driver_flush(const int16_t *data, size_t samples)
#endif #endif
} }
src_data.data_out = audio_driver_output_samples_buf; src_data.ratio = audio_source_ratio_current;
src_data.ratio = audio_source_ratio_current;
if (is_slowmotion) if (is_slowmotion)
src_data.ratio *= settings->slowmotion_ratio; src_data.ratio *= settings->slowmotion_ratio;
audio_driver_resampler->process(audio_driver_resampler_data, &src_data); audio_driver_resampler->process(audio_driver_resampler_data, &src_data);
output_data = audio_driver_output_samples_buf;
output_frames = (unsigned)src_data.output_frames; output_frames = (unsigned)src_data.output_frames;
if (audio_driver_use_float) if (audio_driver_use_float)
{
output_data = audio_driver_output_samples_buf;
output_frames *= sizeof(float); output_frames *= sizeof(float);
}
else else
{ {
convert_float_to_s16(audio_driver_output_samples_conv_buf, convert_float_to_s16(audio_driver_output_samples_conv_buf,
(const float*)output_data, output_frames * 2); (const float*)output_data, output_frames * 2);
output_data = audio_driver_output_samples_conv_buf; output_data = audio_driver_output_samples_conv_buf;
output_frames *= sizeof(int16_t); output_frames *= sizeof(int16_t);
} }