Skip to content

Commit 9cca93f

Browse files
committed
[audio.php] Fix bug in setting AUDIODEV
Bluetooth inbound AUDIODEV not set correctly when Peppy + CamillaDSP
1 parent 2ef1069 commit 9cca93f

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

www/inc/audio.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,9 +270,13 @@ function updDspAndBtInConfs($cardNum, $outputMode) {
270270
}
271271

272272
// Bluetooth config (inbound)
273-
// NOTE: bluealsaaplay.conf AUDIODEV=_audioout or plughw depending on Bluetooth Config, ALSA output mode
274273
if ($_SESSION['peppy_display'] == '1') {
275-
$alsaDevice = 'peppy';
274+
if ($_SESSION['camilladsp'] != 'off') {
275+
$alsaDevice = 'camilladsp';
276+
} else {
277+
$alsaDevice = 'peppy';
278+
}
279+
// AUDIODEV=_audioout or plughw depending on Bluetooth Config, ALSA output mode
276280
} else if ($_SESSION['alsa_output_mode_bt'] == 'plughw') {
277281
$alsaDevice = $outputMode == 'iec958' ? getAlsaIEC958Device() : 'plughw' . ':' . $cardNum . ',0';
278282
} else {

0 commit comments

Comments
 (0)