diff options
| author | Hein-Pieter van Braam <hp@tmm.cx> | 2017-09-12 20:59:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-12 20:59:35 +0200 |
| commit | 7f40734a1ca7d00f5b1224bb37cb933fb5ba0b44 (patch) | |
| tree | cac0bb1df13f83318447de68ea4c1591c6783711 /drivers/wasapi/audio_driver_wasapi.cpp | |
| parent | fe33ef5a1948af7c89a6d71de3580341cf2c0d6a (diff) | |
| parent | 730d36f350274a055a612d39307b02b43dd59eb2 (diff) | |
Merge pull request #10568 from marcelofg55/surround_fixes
Fixed issues with surround sound on audio server
Diffstat (limited to 'drivers/wasapi/audio_driver_wasapi.cpp')
| -rw-r--r-- | drivers/wasapi/audio_driver_wasapi.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/wasapi/audio_driver_wasapi.cpp b/drivers/wasapi/audio_driver_wasapi.cpp index 29d1e5deed..eb86491dec 100644 --- a/drivers/wasapi/audio_driver_wasapi.cpp +++ b/drivers/wasapi/audio_driver_wasapi.cpp @@ -67,12 +67,13 @@ Error AudioDriverWASAPI::init_device() { switch (channels) { case 2: // Stereo + case 4: // Surround 3.1 case 6: // Surround 5.1 case 8: // Surround 7.1 break; default: - ERR_PRINT("WASAPI: Unsupported number of channels"); + ERR_PRINTS("WASAPI: Unsupported number of channels: " + itos(channels)); ERR_FAIL_V(ERR_CANT_OPEN); break; } @@ -119,7 +120,8 @@ Error AudioDriverWASAPI::init_device() { samples_in.resize(buffer_size); if (OS::get_singleton()->is_stdout_verbose()) { - print_line("audio buffer frames: " + itos(buffer_frames) + " calculated latency: " + itos(buffer_frames * 1000 / mix_rate) + "ms"); + print_line("WASAPI: detected " + itos(channels) + " channels"); + print_line("WASAPI: audio buffer frames: " + itos(buffer_frames) + " calculated latency: " + itos(buffer_frames * 1000 / mix_rate) + "ms"); } return OK; @@ -185,7 +187,7 @@ int AudioDriverWASAPI::get_mix_rate() const { AudioDriver::SpeakerMode AudioDriverWASAPI::get_speaker_mode() const { - return SPEAKER_MODE_STEREO; + return get_speaker_mode_by_total_channels(channels); } void AudioDriverWASAPI::thread_func(void *p_udata) { |