fix(sim): simulator volume (#7302)
This commit is contained in:
@@ -58,6 +58,18 @@ void audioConsumeCurrentBuffer()
|
||||
auto nextBuffer = fifo.getNextFilledBuffer();
|
||||
if (!nextBuffer) return;
|
||||
|
||||
#if !defined(SOFTWARE_VOLUME)
|
||||
// Simulate the hardware volume chip: scale samples in place.
|
||||
int volume = simuAudioGetVolume();
|
||||
if (volume < VOLUME_LEVEL_MAX) {
|
||||
auto* buf = const_cast<AudioBuffer*>(nextBuffer);
|
||||
for (uint16_t i = 0; i < buf->size; ++i) {
|
||||
buf->data[i] = (audio_data_t)(
|
||||
((int32_t)buf->data[i] * volume) / VOLUME_LEVEL_MAX);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
auto data = (const uint8_t*)nextBuffer->data;
|
||||
uint32_t len = nextBuffer->size * sizeof(audio_data_t);
|
||||
simuQueueAudio(data, len);
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
#include "audio.h"
|
||||
#include "hal/audio_driver.h"
|
||||
#include "simuaudio.h"
|
||||
#include "simulib.h"
|
||||
|
||||
@@ -32,11 +32,6 @@ static SDL_AudioDeviceID _sdl_audio_device = 0;
|
||||
|
||||
void simuQueueAudio(const uint8_t* data, uint32_t len)
|
||||
{
|
||||
#if !defined(SOFTWARE_VOLUME)
|
||||
int volume = (simuAudioGetVolume() * SDL_MIX_MAXVOLUME ) / VOLUME_LEVEL_MAX;
|
||||
SDL_MixAudioFormat((uint8_t*)data, data, AUDIO_FMT, len, volume);
|
||||
#endif
|
||||
|
||||
SDL_QueueAudio(_sdl_audio_device, data, len);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user