0x2620/cdosea-play
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Compare commits

base: 0x2620:df1eb190cb0d59a5912a38e04dd3f79b0bd77a47
Branches Tags
0x2620:master
..
compare: 0x2620:10faed82e4aef475141055b68a8d7ad01ba2fb3b
Branches Tags
0x2620:master

No commits in common. "df1eb190cb0d59a5912a38e04dd3f79b0bd77a47" and "10faed82e4aef475141055b68a8d7ad01ba2fb3b" have entirely different histories.
df1eb190cb ... 10faed82e4

1 changed files with 3 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
cdoseaplay/sync.py
View file

@ -92,10 +92,7 @@ class Player(Thread):
def ping(self): def ping(self):
data = 'NEXT' data = 'NEXT'
if ':' in self.peer: sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
sock = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM)
else:
sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
logger.debug("ping: %s %s", self.peer, data) logger.debug("ping: %s %s", self.peer, data)
sock.sendto(bytes(data + "\n", "utf-8"), self.peer) sock.sendto(bytes(data + "\n", "utf-8"), self.peer)
received = str(sock.recv(1024), "utf-8") received = str(sock.recv(1024), "utf-8")
@ -108,11 +105,7 @@ class Player(Thread):
def get_position(self): def get_position(self):
try: try:
if ':' in self.peer: sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
sock = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM)
else:
sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
sock.settimeout(1) sock.settimeout(1)
data = 'POS' data = 'POS'
sock.sendto(bytes(data + "\n", "utf-8"), self.peer) sock.sendto(bytes(data + "\n", "utf-8"), self.peer)
@ -129,8 +122,7 @@ def main():
prefix = os.path.expanduser('~/Videos/CDOSEA') prefix = os.path.expanduser('~/Videos/CDOSEA')
parser = argparse.ArgumentParser(description='play 2 screens in sync') parser = argparse.ArgumentParser(description='play 2 screens in sync')
parser.add_argument('--peer', help='ipof peer', required=True) parser.add_argument('--peer', help='ip[:port] of peer', required=True)
parser.add_argument('--peer', help='port of peer')
parser.add_argument('--port', type=int, help='local port', default=DEFAULT_PORT) parser.add_argument('--port', type=int, help='local port', default=DEFAULT_PORT)
parser.add_argument('--playlist', help='play.m3u', default=playlist) parser.add_argument('--playlist', help='play.m3u', default=playlist)
parser.add_argument('--prefix', help='video location', default=prefix) parser.add_argument('--prefix', help='video location', default=prefix)
@ -144,8 +136,6 @@ def main():
else: else:
peer = (args.peer, DEFAULT_PORT) peer = (args.peer, DEFAULT_PORT)
time.sleep(10)
DEBUG = args.debug DEBUG = args.debug
if DEBUG: if DEBUG:
log_format = '%(asctime)s:%(levelname)s:%(name)s:%(message)s' log_format = '%(asctime)s:%(levelname)s:%(name)s:%(message)s'
@ -156,7 +146,6 @@ def main():
player = get_player(fullscreen=not args.window) player = get_player(fullscreen=not args.window)
server = ThreadingUDPServer(('0.0.0.0', args.port), Handler) server = ThreadingUDPServer(('0.0.0.0', args.port), Handler)
server.allow_reuse_address = True
server.player = Player(peer, player, args.playlist, args.prefix) server.player = Player(peer, player, args.playlist, args.prefix)
player.register_key_binding('q', server.q_binding) player.register_key_binding('q', server.q_binding)