diff --git a/modules/myth_tv_player/MythBackendConn.py b/modules/myth_tv_player/MythBackendConn.py index bbdd190..880cded 100644 --- a/modules/myth_tv_player/MythBackendConn.py +++ b/modules/myth_tv_player/MythBackendConn.py @@ -176,7 +176,7 @@ class MythBackendConnection(threading.Thread): (self.pipe_rfd, self.pipe_wfd) = os.pipe() self.videoPlayer.begin_playback(self.pipe_rfd) - print "BEGINNING PLAYBACK!" + print "TV Player: BEGINNING PLAYBACK!" self.Playing = True while self.Playing: #print "Begin loop" @@ -201,11 +201,12 @@ class MythBackendConnection(threading.Thread): elif (request_size > request_size_step) and (num_bytes != request_size): request_size -= request_size_step if num_bytes < request_size and self.videoPlayer.glossMgr.debug: - print "TV_PLAYER: Failed to receive full allocation" - #print "End optimisation" + print "TV_PLAYER: (Warning) Failed to receive full allocation. Adjusting request size" print "Ending playback" - self.stop() + self.videoPlayer.stop() + self.videoPlayer.glossMgr.kill_plugin() + #self.stop() def message_socket_mgr(self, msg_socket): #Do the protocol version check @@ -276,10 +277,11 @@ class MythBackendConnection(threading.Thread): if not self.pipe_wfd is None: os.close(self.pipe_wfd) self.pipe_wfd = None - if not self.pipe_rfd is None: + if not self.pipe_rfd is None: os.close(self.pipe_rfd) self.pipe_rfd = None if not self.data_socket_id is None: end_transfer_cmd = "QUERY_FILETRANSFER "+str(self.data_socket_id) +"[]:[]DONE" self.send_cmd(self.sock, end_transfer_cmd) + diff --git a/multimedia/MediaController.py b/multimedia/MediaController.py index 83ca9a3..0bf7465 100644 --- a/multimedia/MediaController.py +++ b/multimedia/MediaController.py @@ -20,6 +20,7 @@ class MediaController(gobject.GObject): def __init__(self, glossMgr): gobject.GObject.__init__(self) self.stage = glossMgr.stage + self.glossMgr = glossMgr #self.media_element = clutter.Media() self.use_osd = True diff --git a/multimedia/VideoController.py b/multimedia/VideoController.py index c824ca0..766f77a 100644 --- a/multimedia/VideoController.py +++ b/multimedia/VideoController.py @@ -91,6 +91,7 @@ class VideoController(MediaController): return if struc.get_name() == "missing-plugin": + self.glossMgr.display_msg("Missing Plugin", message.structure.to_string()) print "GStreamer Error (missing-plugin): " + message.structure.to_string() self.isPlaying = False self.video_texture.set_playing(False) diff --git a/themes/Pear/music.xml b/themes/Pear/music.xml index 4477d8f..b4b66dd 100644 --- a/themes/Pear/music.xml +++ b/themes/Pear/music.xml @@ -36,6 +36,7 @@ active_bar.png + 1.20 100% relative diff --git a/themes/Pear/music_play_screen.xml b/themes/Pear/music_play_screen.xml index dac9769..d4016d0 100644 --- a/themes/Pear/music_play_screen.xml +++ b/themes/Pear/music_play_screen.xml @@ -89,7 +89,7 @@ 10% - 35% + 30% @@ -118,12 +118,12 @@ - 25% + 30% 20% - - 0 - 0 + + 10% + 15%