|
|
@ -44,17 +44,17 @@ class VariableOsAudio(Variable):
|
|
|
|
|
|
|
|
|
|
|
|
def get(self):
|
|
|
|
def get(self):
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
pulseaudio по умолчанию если доступно или вписано в /etc/asound.conf
|
|
|
|
pipewire по умолчанию если доступно или вписано в /etc/asound.conf
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
avail = [x[0] for x in self.Get('os_audio_available')]
|
|
|
|
avail = [x[0] for x in self.Get('os_audio_available')]
|
|
|
|
if "pulseaudio" in avail:
|
|
|
|
if "pipewire" in avail:
|
|
|
|
audio = getValueFromCmdLine(CmdlineParams.Calculate,
|
|
|
|
audio = getValueFromCmdLine(CmdlineParams.Calculate,
|
|
|
|
CmdlineParams.Audio)
|
|
|
|
CmdlineParams.Audio)
|
|
|
|
|
|
|
|
|
|
|
|
if audio and audio == "alsa":
|
|
|
|
if audio and audio == "alsa":
|
|
|
|
return "alsa"
|
|
|
|
return "alsa"
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
return "pulseaudio"
|
|
|
|
return "pipewire"
|
|
|
|
return "alsa"
|
|
|
|
return "alsa"
|
|
|
|
|
|
|
|
|
|
|
|
def choice(self):
|
|
|
|
def choice(self):
|
|
|
@ -81,7 +81,7 @@ class VariableOsAudioAvailable(Variable):
|
|
|
|
def get(self):
|
|
|
|
def get(self):
|
|
|
|
mapAudioConf = (
|
|
|
|
mapAudioConf = (
|
|
|
|
('alsa', None, _('ALSA')),
|
|
|
|
('alsa', None, _('ALSA')),
|
|
|
|
('pulseaudio', 'media-sound/pulseaudio', _("PulseAudio")),
|
|
|
|
('pipewire', 'media-video/pipewire', _("PipeWire")),
|
|
|
|
)
|
|
|
|
)
|
|
|
|
image = self.Get('cl_image')
|
|
|
|
image = self.Get('cl_image')
|
|
|
|
if image:
|
|
|
|
if image:
|
|
|
|