Comment out unused fallback mixer. #79

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:

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()

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
         """

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")