From 20c3157d6de0259e3740df2fd8ac68776e918d10 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Thu, 21 Feb 2013 17:05:56 +0000 Subject: [PATCH] final fixes --- openlp/core/ui/maindisplay.py | 8 ++--- openlp/core/ui/mainwindow.py | 2 +- openlp/core/ui/media/mediacontroller.py | 48 ++++++++++++++----------- 3 files changed, 32 insertions(+), 26 deletions(-) diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index d429bf15d..076abba3c 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -313,7 +313,7 @@ class MainDisplay(Display): log.debug(u'image to display') image = self.image_manager.get_image_bytes(path, ImageSource.ImagePlugin) self.controller.media_controller.media_reset(self.controller) - self.displayImage(image) + self.display_image(image) def display_image(self, image): """ @@ -328,10 +328,10 @@ class MainDisplay(Display): def reset_image(self): """ - Reset the backgound image to the service item image. Used after the + Reset the background image to the service item image. Used after the image plugin has changed the background. """ - log.debug(u'resetImage') + log.debug(u'reset_image') if hasattr(self, u'serviceItem'): self.display_image(self.serviceItem.bg_image_bytes) else: @@ -642,6 +642,6 @@ class AudioPlayer(QtCore.QObject): def connectSlot(self, signal, slot): """ - Connect a slot to a signal on the media object + Connect a slot to a signal on the media object. Used by slidecontroller to connect to audio object. """ QtCore.QObject.connect(self.media_object, signal, slot) \ No newline at end of file diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 695c4073a..25878c88d 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -479,7 +479,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): Settings().remove_obsolete_settings() self.serviceNotSaved = False self.aboutForm = AboutForm(self) - self.mediaController = MediaController(self) + self.mediaController = MediaController() self.settingsForm = SettingsForm(self) self.formattingTagForm = FormattingTagForm(self) self.shortcutForm = ShortcutListForm(self) diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py index 732c7424d..e9a963553 100644 --- a/openlp/core/ui/media/mediacontroller.py +++ b/openlp/core/ui/media/mediacontroller.py @@ -61,8 +61,8 @@ class MediaSlider(QtGui.QSlider): """ Override event to allow hover time to be displayed. """ - timevalue = QtGui.QStyle.sliderValueFromPosition(self.minimum(), self.maximum(), event.x(), self.width()) - self.setToolTip(u'%s' % datetime.timedelta(seconds=int(timevalue / 1000))) + time_value = QtGui.QStyle.sliderValueFromPosition(self.minimum(), self.maximum(), event.x(), self.width()) + self.setToolTip(u'%s' % datetime.timedelta(seconds=int(time_value / 1000))) QtGui.QSlider.mouseMoveEvent(self, event) def mousePressEvent(self, event): @@ -93,11 +93,10 @@ class MediaController(object): currentMediaPlayer is an array of player instances keyed on ControllerType. """ - def __init__(self, parent): + def __init__(self): """ Constructor """ - self.mainWindow = parent Registry().register(u'media_controller', self) self.mediaPlayers = {} self.displayControllers = {} @@ -673,12 +672,11 @@ class MediaController(object): is_live = msg[1] if not is_live: return - controller = self.mainWindow.liveController - display = self._define_display(controller) - if controller.controller_type in self.currentMediaPlayer and \ - self.currentMediaPlayer[controller.controller_type].state == MediaState.Playing: - self.currentMediaPlayer[controller.controller_type].pause(display) - self.currentMediaPlayer[controller.controller_type].set_visible(display, False) + display = self._define_display(self.live_controller) + if self.live_controller.controller_type in self.currentMediaPlayer and \ + self.currentMediaPlayer[self.live_controller.controller_type].state == MediaState.Playing: + self.currentMediaPlayer[self.live_controller.controller_type].pause(display) + self.currentMediaPlayer[self.live_controller.controller_type].set_visible(display, False) def media_blank(self, msg): """ @@ -693,11 +691,10 @@ class MediaController(object): if not is_live: return Registry().execute(u'live_display_hide', hide_mode) - controller = self.mainWindow.liveController - display = self._define_display(controller) - if self.currentMediaPlayer[controller.controller_type].state == MediaState.Playing: - self.currentMediaPlayer[controller.controller_type].pause(display) - self.currentMediaPlayer[controller.controller_type].set_visible(display, False) + display = self._define_display(self.live_controller) + if self.currentMediaPlayer[self.live_controller.controller_type].state == MediaState.Playing: + self.currentMediaPlayer[self.live_controller.controller_type].pause(display) + self.currentMediaPlayer[self.live_controller.controller_type].set_visible(display, False) def media_unblank(self, msg): """ @@ -711,12 +708,11 @@ class MediaController(object): is_live = msg[1] if not is_live: return - controller = self.mainWindow.liveController - display = self._define_display(controller) - if controller.controller_type in self.currentMediaPlayer and \ - self.currentMediaPlayer[controller.controller_type].state != MediaState.Playing: - if self.currentMediaPlayer[controller.controller_type].play(display): - self.currentMediaPlayer[controller.controller_type].set_visible(display, True) + display = self._define_display(self.live_controller) + if self.live_controller.controller_type in self.currentMediaPlayer and \ + self.currentMediaPlayer[self.live_controller.controller_type].state != MediaState.Playing: + if self.currentMediaPlayer[self.live_controller.controller_type].play(display): + self.currentMediaPlayer[self.live_controller.controller_type].set_visible(display, True) # Start Timer for ui updates if not self.timer.isActive(): self.timer.start() @@ -749,3 +745,13 @@ class MediaController(object): return self._service_manager service_manager = property(_get_service_manager) + + def _get_live_controller(self): + """ + Adds the live controller to the class dynamically + """ + if not hasattr(self, u'_live_controller'): + self._live_controller = Registry().get(u'live_controller') + return self._live_controller + + live_controller = property(_get_live_controller)