From 6c80ba1c7d76a7fa9ab021c68b46023769ec8921 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Mon, 17 Mar 2014 07:29:29 +0000 Subject: [PATCH] Full migration --- openlp/core/ui/media/mediacontroller.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py index e1877e9f9..b9e453689 100644 --- a/openlp/core/ui/media/mediacontroller.py +++ b/openlp/core/ui/media/mediacontroller.py @@ -80,7 +80,7 @@ class MediaSlider(QtGui.QSlider): QtGui.QSlider.mouseReleaseEvent(self, event) -class MediaController(RegistryProperties): +class MediaController(RegistryMixin, OpenLPMixin, RegistryProperties): """ The implementation of the Media Controller. The Media Controller adds an own class for every Player. Currently these are QtWebkit, Phonon and Vlc. @@ -94,12 +94,11 @@ class MediaController(RegistryProperties): current_media_players is an array of player instances keyed on ControllerType. """ - def __init__(self): + def __init__(self, parent=None): """ Constructor """ - Registry().register('media_controller', self) - Registry().register_function('bootstrap_initialise', self.bootstrap_initialise) + super(MediaController, self).__init__(parent) self.media_players = {} self.display_controllers = {} self.current_media_players = {}