player cleanup

player/play-back.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Exec=/srv/pandora/p_for_power/player/player.py --mode peer --playlist /srv/p_for_power/render/back.m3u
-Hidden=false
-NoDisplay=false
-X-GNOME-Autostart-enabled=true
-Name=t-for-time
-Comment=

player/play-front.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Exec=/srv/pandora/p_for_power/player/player.py --mode main --playlist /srv/p_for_power/render/front.m3u
-Hidden=false
-NoDisplay=false
-X-GNOME-Autostart-enabled=true
-Name=t-for-time
-Comment=

player/player-back.service

@@ -1,13 +0,0 @@
-[Unit]
-Description=player
-After=gnome-session.target
-Wants=network-online.target
-
-[Service]
-Type=simple
-Restart=on-failure
-KillSignal=SIGINT
-ExecStart=/srv/pandora/p_for_power/player/player.py --mode peer --playlist /srv/p_for_power/render/back.m3u --config /srv/p_for_power/render/back.json
-
-[Install]
-WantedBy=graphical-session.target

player/player.py

@@ -22,12 +22,6 @@ PORT = 9067
 DEBUG = False
 
 CONFIG = {
-    "font": "Menlo",
-    "font_size": 30,
-    "font_border": 4,
-    "sub_border_color": "0.0/0.0/0.0/0.75",
-    "sub_margin": 2 * 36 + 6,
-    "sub_spacing": 0,
     "vf": None,
     "sync_group": None,
 }
@@ -93,11 +87,6 @@ class Sync(Thread):
             log_handler=mpv_log,
             input_default_bindings=True,
             input_vo_keyboard=True,
-            sub_font_size=CONFIG["font_size"], sub_font=CONFIG["font"],
-            sub_border_size=CONFIG["font_border"],
-            sub_border_color=CONFIG["sub_border_color"],
-            sub_margin_y=CONFIG["sub_margin"],
-            sub_ass_line_spacing=CONFIG["sub_spacing"],
         )
         if CONFIG.get("vf"):
             self.mpv.vf = CONFIG["vf"]
@@ -167,38 +156,40 @@ class Sync(Thread):
                 self.stop()
                 self.mpv.stop()
 
+    def is_keydown(self, args):
+        if args and args[0] and args[0][0] == 'd':
+            return True
+        return False
+
+
     def q_binding(self, *args):
-        if args and args[0] and args[0][0] != 'd':
+        if self.is_keydown(args):
-            return
+            self.stop()
-        self.stop()
+            self.mpv.stop()
-        self.mpv.stop()
 
     def space_binding(self, *args):
-        if args and args[0] and args[0][0] != 'd':
+        if self.is_keydown(args):
-            return
+            if self.mpv.pause:
-        if self.mpv.pause:
+                self.p_binding(*args)
-            self.p_binding(*args)
+            else:
-        else:
+                self.s_binding(*args)
-            self.s_binding(*args)
 
     def s_binding(self, *args):
-        if args and args[0] and args[0][0] != 'd':
+        if self.is_keydown(args):
-            return
+            self.is_paused = True
-        self.is_paused = True
+            self.mpv.pause = True
-        self.mpv.pause = True
+            for loop in self.loops:
-        for loop in self.loops:
+                loop.pause = True
-            loop.pause = True
+            self.send_playback_state()
-        self.send_playback_state()
 
     def p_binding(self, *args):
-        if args and args[0] and args[0][0] != 'd':
+        if self.is_keydown(args):
-            return
+            self.is_paused = False
-        self.is_paused = False
+            self._tick = 0
-        self._tick = 0
+            self.mpv.pause = False
-        self.mpv.pause = False
+            for loop in self.loops:
-        for loop in self.loops:
+                loop.pause = False
-            loop.pause = False
+            self.send_playback_state()
-        self.send_playback_state()
 
     def stop(self, *args):
         self.active = False
@@ -409,8 +400,8 @@ class Sync(Thread):
 
 
 def main():
-    parser = argparse.ArgumentParser(description='p_for_power sync player')
+    parser = argparse.ArgumentParser(description='p_for_power player')
-    parser.add_argument('--mode', help='peer or main', default="peer")
+    parser.add_argument('--mode', help='peer or main', default="main")
     parser.add_argument('--playlist', default='/srv/p_for_power/render/front.m3u', help="m3u")
     parser.add_argument('--window', action='store_true', help='run in window', default=False)
     parser.add_argument('--debug', action='store_true', help='debug', default=False)

player/player.service

@@ -1,6 +1,6 @@
 [Unit]
 Description=player
-After=gnome-session.target network-online.target
+After=gnome-session.target
 
 [Service]
 Type=simple