quick if stuck
This commit is contained in:
parent
4e04bec8ad
commit
60bd70704f
4 changed files with 5 additions and 9 deletions
|
@ -1,6 +1,6 @@
|
||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Type=Application
|
Type=Application
|
||||||
Exec=/srv/pandora/t_for_time/player/player.py --mode main --playlist /srv/t_for_time/render/back.m3u
|
Exec=/srv/pandora/t_for_time/player/player.py --mode peer --playlist /srv/t_for_time/render/back.m3u
|
||||||
Hidden=false
|
Hidden=false
|
||||||
NoDisplay=false
|
NoDisplay=false
|
||||||
X-GNOME-Autostart-enabled=true
|
X-GNOME-Autostart-enabled=true
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Type=Application
|
Type=Application
|
||||||
Exec=/srv/pandora/t_for_time/player/player.py --mode peer --playlist /srv/t_for_time/render/front.m3u
|
Exec=/srv/pandora/t_for_time/player/player.py --mode main --playlist /srv/t_for_time/render/front.m3u
|
||||||
Hidden=false
|
Hidden=false
|
||||||
NoDisplay=false
|
NoDisplay=false
|
||||||
X-GNOME-Autostart-enabled=true
|
X-GNOME-Autostart-enabled=true
|
||||||
|
|
|
@ -5,7 +5,7 @@ Description=player
|
||||||
Type=simple
|
Type=simple
|
||||||
Restart=always
|
Restart=always
|
||||||
KillSignal=SIGINT
|
KillSignal=SIGINT
|
||||||
ExecStart=/srv/pandora/t_for_time/player/player.py --mode peer--playlist /srv/t_for_time/render/back.m3u
|
ExecStart=/srv/pandora/t_for_time/player/player.py --mode peer --playlist /srv/t_for_time/render/back.m3u
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=default.target
|
WantedBy=default.target
|
||||||
|
|
|
@ -77,13 +77,10 @@ class Sync(Thread):
|
||||||
self.read_position_main()
|
self.read_position_main()
|
||||||
#self.adjust_position()
|
#self.adjust_position()
|
||||||
self.reload_playlist()
|
self.reload_playlist()
|
||||||
if self._tick and abs(time.time() - self._tick) > 10:
|
if self._tick and abs(time.time() - self._tick) > 60:
|
||||||
logger.error("player is stuck")
|
logger.error("player is stuck")
|
||||||
self._tick = 0
|
self._tick = 0
|
||||||
self.mpv.loadlist(self.playlist)
|
self.quit()
|
||||||
self.mpv.playlist_play_index(0)
|
|
||||||
self.mpv.pause = False
|
|
||||||
self.mpv.wait_until_playing()
|
|
||||||
|
|
||||||
def q_binding(self, *args):
|
def q_binding(self, *args):
|
||||||
self.stop()
|
self.stop()
|
||||||
|
@ -158,7 +155,6 @@ class Sync(Thread):
|
||||||
data = self.sock.recvfrom(1024)[0].decode().split(" ", 1)
|
data = self.sock.recvfrom(1024)[0].decode().split(" ", 1)
|
||||||
except socket.timeout:
|
except socket.timeout:
|
||||||
logger.error("failed to receive data from main")
|
logger.error("failed to receive data from main")
|
||||||
return self.read_position_main()
|
|
||||||
else:
|
else:
|
||||||
self.main.time_pos = float(data[0])
|
self.main.time_pos = float(data[0])
|
||||||
self.main.playlist_current_pos = int(data[1])
|
self.main.playlist_current_pos = int(data[1])
|
||||||
|
|
Loading…
Add table
Reference in a new issue