diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-10-25 15:09:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-25 15:09:11 +0200 |
| commit | 9de724f327c21a4c03300798b9dc2f8df29d553a (patch) | |
| tree | 1c4d78ef656d97a2609a3b6b2b6da44f89115fdf /drivers/rtaudio/audio_driver_rtaudio.cpp | |
| parent | ece9a0f40080e7e4f97733473ed7bddf846afa57 (diff) | |
| parent | dc2e73499a3264c6c77eb4ddadb6961d684c2941 (diff) | |
Merge pull request #23091 from aaronfranke/mingw-warnings
Fix some compile warnings for Windows from Linux
Diffstat (limited to 'drivers/rtaudio/audio_driver_rtaudio.cpp')
| -rw-r--r-- | drivers/rtaudio/audio_driver_rtaudio.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/rtaudio/audio_driver_rtaudio.cpp b/drivers/rtaudio/audio_driver_rtaudio.cpp index 9353128333..bc6ceb1e7e 100644 --- a/drivers/rtaudio/audio_driver_rtaudio.cpp +++ b/drivers/rtaudio/audio_driver_rtaudio.cpp @@ -114,11 +114,12 @@ Error AudioDriverRtAudio::init() { unsigned int buffer_frames = closest_power_of_2(latency * mix_rate / 1000); print_verbose("Audio buffer frames: " + itos(buffer_frames) + " calculated latency: " + itos(buffer_frames * 1000 / mix_rate) + "ms"); - short int tries = 2; + short int tries = 4; - while (tries >= 0) { + while (tries > 0) { switch (speaker_mode) { case SPEAKER_MODE_STEREO: parameters.nChannels = 2; break; + case SPEAKER_SURROUND_31: parameters.nChannels = 4; break; case SPEAKER_SURROUND_51: parameters.nChannels = 6; break; case SPEAKER_SURROUND_71: parameters.nChannels = 8; break; }; @@ -133,7 +134,9 @@ Error AudioDriverRtAudio::init() { ERR_PRINT("Unable to open audio, retrying with fewer channels..."); switch (speaker_mode) { - case SPEAKER_SURROUND_51: speaker_mode = SPEAKER_MODE_STEREO; break; + case SPEAKER_MODE_STEREO: break; // Required to silence unhandled enum value warning. + case SPEAKER_SURROUND_31: speaker_mode = SPEAKER_MODE_STEREO; break; + case SPEAKER_SURROUND_51: speaker_mode = SPEAKER_SURROUND_31; break; case SPEAKER_SURROUND_71: speaker_mode = SPEAKER_SURROUND_51; break; } |