summaryrefslogtreecommitdiffstats
path: root/drivers/pulseaudio
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2018-04-12 13:46:10 +0200
committerGitHub <noreply@github.com>2018-04-12 13:46:10 +0200
commitd121f4af8acacd6a2197b0edfc2fef605e02d651 (patch)
treea004d9e03f0337228dca44e6ff3f60eecd4d714d /drivers/pulseaudio
parent38fe9ae6948e0aabd8fff300a9644069a8883174 (diff)
parent11fbfab7ece953d380152b98e83f78b5ea941bb6 (diff)
downloadredot-engine-d121f4af8acacd6a2197b0edfc2fef605e02d651.tar.gz
Merge pull request #18124 from marcelofg55/pulse_channels
Fix PulseAudio driver for audio devices that report unknown number of channels
Diffstat (limited to 'drivers/pulseaudio')
-rw-r--r--drivers/pulseaudio/audio_driver_pulseaudio.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pulseaudio/audio_driver_pulseaudio.cpp b/drivers/pulseaudio/audio_driver_pulseaudio.cpp
index 617414d2c5..fac73da44d 100644
--- a/drivers/pulseaudio/audio_driver_pulseaudio.cpp
+++ b/drivers/pulseaudio/audio_driver_pulseaudio.cpp
@@ -149,8 +149,9 @@ Error AudioDriverPulseAudio::init_device() {
break;
default:
- ERR_PRINTS("PulseAudio: Unsupported number of channels: " + itos(pa_channels));
- ERR_FAIL_V(ERR_CANT_OPEN);
+ WARN_PRINTS("PulseAudio: Unsupported number of channels: " + itos(pa_channels));
+ pa_channels = 2;
+ channels = 2;
break;
}