From b717b03a73822f0b7434f0685422c83e24302cec Mon Sep 17 00:00:00 2001 From: Uriziel Date: Mon, 15 Oct 2012 09:15:44 +0200 Subject: [PATCH] Mplayer prints stderr on exit Changed behaviour of asking for input at the exit --- syncplay/client.py | 4 ++-- syncplay/players/mplayer.py | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/syncplay/client.py b/syncplay/client.py index 3f3be6d..eaf738c 100644 --- a/syncplay/client.py +++ b/syncplay/client.py @@ -35,7 +35,7 @@ class SyncClientFactory(ClientFactory): if not self.reconnecting: message = 'Connection failed' self._client.ui.showMessage(message) - self._client.stop() + self._client.stop(True) else: self.clientConnectionLost(connector, reason) @@ -279,7 +279,7 @@ class SyncplayClient(object): self._running = True reactor.run() - def stop(self, promptForAction = True): + def stop(self, promptForAction = False): if not self._running: return self._running = False diff --git a/syncplay/players/mplayer.py b/syncplay/players/mplayer.py index 6e8a3dc..f591b8b 100644 --- a/syncplay/players/mplayer.py +++ b/syncplay/players/mplayer.py @@ -129,7 +129,9 @@ class MplayerPlayer(BasePlayer): self._pathAsk.set() self._positionAsk.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): def __init__(self, playerController, playerProcess): @@ -150,4 +152,8 @@ class MplayerPlayer(BasePlayer): except IOError: pass + def readStderrLine(self): + for line in self.__process.stderr.readlines(): + yield line + \ No newline at end of file