auto-format

Author: brookgagnon

obplayer/player/outputs.py

@@ -169,7 +169,7 @@ def fade(self, arguments):
 
         volume_element_name = arguments["element"]
 
-        if(volume_element_name not in self.fade_threads):
+        if volume_element_name not in self.fade_threads:
             self.fade_threads[volume_element_name] = None
             self.fade_threads_cancel[volume_element_name] = False
 
@@ -180,7 +180,8 @@ def fade(self, arguments):
         fade_run_per_second = 20
 
         obplayer.Log.log(
-            volume_element_name + " fade from "
+            volume_element_name
+            + " fade from "
             + str(round(current_volume * 100))
             + "% to "
             + str(round(target_volume * 100))
@@ -195,7 +196,7 @@ def fade(self, arguments):
             fade_increment = target_volume
 
         # calculate fade increment
-        else: 
+        else:
             fade_increment = abs(current_volume - target_volume) / (
                 fade_time * fade_run_per_second
             )
@@ -234,7 +235,9 @@ def run():
             self.fade_threads[volume_element_name].join()
             self.fade_threads[volume_element_name] = None
 
-        self.fade_threads[volume_element_name] = threading.Thread(target=run, daemon=True)
+        self.fade_threads[volume_element_name] = threading.Thread(
+            target=run, daemon=True
+        )
         self.fade_threads[volume_element_name].start()
 
     def execute_instruction(self, instruction, arguments):
@@ -244,18 +247,38 @@ def execute_instruction(self, instruction, arguments):
             self.pipeline_main.get_by_name("mixer-prealert-volume").set_property(
                 "volume", 0.0
             )
-            print(self.pipeline_main.get_by_name("mixer-prealert-volume").get_property("volume"))
+            print(
+                self.pipeline_main.get_by_name("mixer-prealert-volume").get_property(
+                    "volume"
+                )
+            )
         elif instruction == "alert_off":
             self.pipeline_main.get_by_name("mixer-prealert-volume").set_property(
                 "volume", 1.0
             )
-            print(self.pipeline_main.get_by_name("mixer-prealert-volume").get_property("volume"))
+            print(
+                self.pipeline_main.get_by_name("mixer-prealert-volume").get_property(
+                    "volume"
+                )
+            )
         elif instruction == "voicetrack_on":
-            self.fade({"volume": arguments["volume"], "time": arguments["fade"], "element": "channel-main-volume"})
+            self.fade(
+                {
+                    "volume": arguments["volume"],
+                    "time": arguments["fade"],
+                    "element": "channel-main-volume",
+                }
+            )
         elif instruction == "voicetrack_off":
-            self.fade({"volume": 1.0, "time": arguments["fade"], "element": "channel-main-volume"})
+            self.fade(
+                {
+                    "volume": 1.0,
+                    "time": arguments["fade"],
+                    "element": "channel-main-volume",
+                }
+            )
         elif instruction == "main_fade":
-            arguments['element'] = "channel-main-volume"
+            arguments["element"] = "channel-main-volume"
             self.fade(arguments)
         elif instruction == "primary_on":
             self.fade({"volume": 1.0, "time": 0.0, "element": "mixer-primary-volume"})

obplayer/scheduler/data.py

@@ -205,7 +205,15 @@ def get_show(self, show_id, last_updated, datetime):
     # Return false if edit not required.  Return lastrowid otherwise.
     #
     def show_addedit(
-        self, show_id, name, show_type, description, datetime, duration, last_updated, last_track_fadeout='auto'
+        self,
+        show_id,
+        name,
+        show_type,
+        description,
+        datetime,
+        duration,
+        last_updated,
+        last_track_fadeout="auto",
     ):
         # determine whether there is already a show in this slot.
         rows = self.execute(
@@ -241,7 +249,7 @@ def show_addedit(
                 str(datetime),
                 duration,
                 str(last_updated),
-                str(last_track_fadeout)
+                str(last_track_fadeout),
             ),
         )
         return self.db.last_insert_rowid()

obplayer/scheduler/scheduler.py

@@ -76,14 +76,20 @@ def current_voicetrack(self, current_track_position):
             if voicetrack["order_num"] == self.pos and voicetrack["delay"] >= 0:
                 delta = voicetrack["delay"] - current_track_position
 
-                if delta >= -self.voicetrack_timing_tolerance and delta <= self.voicetrack_timing_tolerance:
+                if (
+                    delta >= -self.voicetrack_timing_tolerance
+                    and delta <= self.voicetrack_timing_tolerance
+                ):
                     self.delay_voicetrack()
                     return [voicetrack, delta]
 
             # if the voicetrack is set relative to the next track, but has a negative delay, then it plays at the end of this track
             if voicetrack["order_num"] == (self.pos + 1) and voicetrack["delay"] < 0:
                 delta = track_ends_in - abs(voicetrack["delay"])
-                if delta >= -self.voicetrack_timing_tolerance and delta <= self.voicetrack_timing_tolerance:
+                if (
+                    delta >= -self.voicetrack_timing_tolerance
+                    and delta <= self.voicetrack_timing_tolerance
+                ):
                     self.delay_voicetrack()
                     return [voicetrack, delta]
 
@@ -365,7 +371,10 @@ def play_media(self, media, offset, present_time):
                     order_num=media["order_num"],
                     artist=media["artist"],
                     title=media["title"],
-                    mixerend=['primary_on', {}], # restore the mixer from fade-out when the track stops
+                    mixerend=[
+                        "primary_on",
+                        {},
+                    ],  # restore the mixer from fade-out when the track stops
                 )
             else:
                 self.fadeout = False
@@ -588,7 +597,7 @@ def __init__(self, first_sync=False):
 
         self.voicetrack_ctrl.set_request_callback(self.do_voicetrack_request)
         self.voicetrack_ctrl.set_update_callback(self.do_voicetrack_update)
-        
+
         self.showfade_duration = float(obplayer.Config.setting("fade_duration", 5))
         self.showfade_ctrl.set_request_callback(self.do_showfade_request)
         self.showfade_ctrl.set_update_callback(self.do_showfade_update)
@@ -601,16 +610,20 @@ def do_showfade_request(self, ctrl, present_time, media_class):
 
     def do_showfade_update(self, ctrl, present_time):
         self.showfade_ctrl.set_next_update(present_time + 0.1)
-        if self.present_show and type(self.present_show) is ObShow and self.present_show.fadeout:
+        if (
+            self.present_show
+            and type(self.present_show) is ObShow
+            and self.present_show.fadeout
+        ):
             ending_in = self.present_show.end_time() - present_time
             fade_duration = self.showfade_duration
 
-            if(ending_in <= fade_duration):
+            if ending_in <= fade_duration:
                 obplayer.Player.outputs["mixer"].fade(
                     {
                         "element": "mixer-primary-volume",
                         "volume": 0.0,
-                        "time": self.showfade_duration - 0.1
+                        "time": self.showfade_duration - 0.1,
                     }
                 )