Rezzect/syncplay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Mplayer prints stderr on exit

Browse Source 
Changed behaviour of asking for input at the exit
This commit is contained in:
Uriziel 2012-10-15 09:15:44 +02:00
parent 16d2b5b097
commit b717b03a73
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
syncplay/client.py
View File

@ -35,7 +35,7 @@ class SyncClientFactory(ClientFactory):
if not self.reconnecting: if not self.reconnecting:
message = 'Connection failed' message = 'Connection failed'
self._client.ui.showMessage(message) self._client.ui.showMessage(message)
self._client.stop() self._client.stop(True)
else: else:
self.clientConnectionLost(connector, reason) self.clientConnectionLost(connector, reason)
@ -279,7 +279,7 @@ class SyncplayClient(object):
self._running = True self._running = True
reactor.run() reactor.run()
def stop(self, promptForAction = True): def stop(self, promptForAction = False):
if not self._running: if not self._running:
return return
self._running = False self._running = False

8
syncplay/players/mplayer.py
View File

@ -129,7 +129,9 @@ class MplayerPlayer(BasePlayer):
self._pathAsk.set() self._pathAsk.set()
self._positionAsk.set() self._positionAsk.set()
self._pausedAsk.set() self._pausedAsk.set()
self._client.stop() self._client.stop(False)
for line in self._listener.readStderrLine():
self._client.ui.showMessage(line, True, True)
class __Listener(threading.Thread): class __Listener(threading.Thread):
def __init__(self, playerController, playerProcess): def __init__(self, playerController, playerProcess):
@ -150,4 +152,8 @@ class MplayerPlayer(BasePlayer):
except IOError: except IOError:
pass pass
def readStderrLine(self):
for line in self.__process.stderr.readlines():
yield line