Compare commits

..

No commits in common. "dcd2030799ee03303004a2be5ffd5de1d7c94f4f" and "eb49a320d180b3e3e7fcd583e589a430bcf8d54e" have entirely different histories.

View file

@ -32,7 +32,6 @@ class Sync(Thread):
is_main = True
ready = False
destination = "255.255.255.255"
reload_check = None
def __init__(self, *args, **kwargs):
self.is_main = kwargs.get('mode', 'main') == 'main'
@ -49,13 +48,12 @@ class Sync(Thread):
)
self.mpv.observe_property('time-pos', self.time_pos_cb)
self.mpv.fullscreen = kwargs.get('fullscreen', False)
self.mpv.loop_file = False
self.mpv.loop_playlist = True
self.mpv.loop = 'inf'
self.mpv.loop_file = 'no'
self.mpv.register_key_binding('q', self.q_binding)
self.playlist = kwargs['playlist']
self.playlist_mtime = os.stat(self.playlist).st_mtime
print(self.playlist)
self.mpv.loadlist(self.playlist)
logger.error("loaded paylist: %s", self.playlist)
self.deviations = collections.deque(maxlen=10)
if not self.is_main:
self.mpv.pause = False
@ -70,16 +68,16 @@ class Sync(Thread):
def run(self):
while self.active:
if self.is_main:
time.sleep(0.5)
pass
else:
self.read_position_main()
#self.adjust_position()
self.reload_playlist()
def q_binding(self, *args):
self.stop()
self.mpv.stop()
def stop(self, *args):
self.active = False
if self.sock:
@ -92,16 +90,6 @@ class Sync(Thread):
elif self.ready:
self.adjust_position()
def reload_playlist(self):
if not self.reload_check:
self.reload_check = time.time()
if time.time() - self.reload_check > 5:
self.reload_check = time.time()
playlist_mtime = os.stat(self.playlist).st_mtime
if self.playlist_mtime != playlist_mtime:
self.playlist_mtime = playlist_mtime
self.mpv.loadlist(self.playlist)
logger.error("reloaded paylist: %s", self.playlist)
def init_socket(self):
sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, 0)