diff --git a/src/client/connector.py b/src/client/connector.py index 1f5811f6f87c7ad5d83416a3f92e86eaefe18837..78751ebe8523f04331ac187eb0b5faf7d17908c8 100644 --- a/src/client/connector.py +++ b/src/client/connector.py @@ -96,7 +96,7 @@ class PlayerConnector(): func = getattr(lqs_instance, command) result = func(str(namespace), *args) - elif namespace == "mixer" or namespace == "mixer_fallback": + elif namespace == "mixer": # or namespace == "mixer_fallback": func = getattr(lqs_instance, command) result = func(str(namespace), *args) else: diff --git a/src/engine.py b/src/engine.py index 11a0722270d7c2ef40b6e002a1cdf31420b2b761..da4e963e64be68a3bdac97d95fd83010a597b8c7 100644 --- a/src/engine.py +++ b/src/engine.py @@ -187,7 +187,7 @@ class Player: channel_router = None event_dispatcher = None mixer = None - mixer_fallback = None + # mixer_fallback = None @@ -204,7 +204,7 @@ class Player: self.connector = connector self.channel_router = ChannelRouter(self.config, self.logger) self.mixer = Mixer(self.config, MixerType.MAIN, self.connector) - self.mixer_fallback = Mixer(self.config, MixerType.FALLBACK, self.connector) + # self.mixer_fallback = Mixer(self.config, MixerType.FALLBACK, self.connector) @@ -313,8 +313,8 @@ class Player: channel_type = self.channel_router.type_of_channel(entry.channel) mixer = self.mixer - if channel_type == ChannelType.FALLBACK_QUEUE: - mixer = self.mixer_fallback + # if channel_type == ChannelType.FALLBACK_QUEUE: + # mixer = self.mixer_fallback # Instant activation or fade-in self.connector.enable_transaction() diff --git a/src/mixer.py b/src/mixer.py index d383840b0dd7a96d4e55e514535982563538ef9f..12edb5c300d43d4248ac59a7708228143f21355f 100644 --- a/src/mixer.py +++ b/src/mixer.py @@ -34,7 +34,7 @@ class MixerType(Enum): Types of mixers mapped to the Liquidsoap mixer ids. """ MAIN = "mixer" - FALLBACK = "mixer_fallback" + # FALLBACK = "mixer_fallback" @@ -169,7 +169,7 @@ class Mixer(): def mixer_channels_reload(self): """ - Reloads all mixer channels. + Reloads all mixer channels. """ self.channels = None return self.mixer_channels() @@ -185,7 +185,7 @@ class Mixer(): Args: channel (Channel): The channel - + Returns: (Integer): The channel number """ @@ -203,7 +203,7 @@ class Mixer(): Args: channel_number (Integer): The channel number - + Returns: (String): Channel status info as a String """ @@ -239,7 +239,7 @@ class Mixer(): """ Combined call of following to save execution time: - Select some mixer channel - - Increase the volume to 100, + - Increase the volume to 100, Args: pos (Integer): The channel number @@ -331,7 +331,7 @@ class Mixer(): Args: channel (Channel): The channel to fade volume (Integer): The target volume - + Returns: (Boolean): `True` if successful """ @@ -383,11 +383,11 @@ class Mixer(): def fade_out(self, channel, volume=None): """ Performs a fade-out for the given channel starting at it's current volume. - + Args: channel (Channel): The channel to fade volume (Integer): The start volume - + Returns: (Boolean): `True` if successful """ diff --git a/src/plugins/monitor.py b/src/plugins/monitor.py index 3ae57fbf71865499f1f6c1571a6dc9307787b0d2..34b7de4093b33eaa46aa07f313877d08cc498778 100644 --- a/src/plugins/monitor.py +++ b/src/plugins/monitor.py @@ -220,7 +220,7 @@ class AuraMonitor: self.status["lqs"]["uptime"] = self.engine.uptime() self.status["lqs"]["io"] = self.get_io_state() self.status["lqs"]["mixer"] = self.engine.player.mixer.mixer_status() - self.status["lqs"]["mixer_fallback"] = self.engine.player.mixer_fallback.mixer_status() + #self.status["lqs"]["mixer_fallback"] = self.engine.player.mixer_fallback.mixer_status() self.engine.player.connector.disable_transaction() self.status["api"]["steering"]["url"] = self.config.get("api_steering_status")