openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/beta1 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #742636 in OpenLP: "Leading spaces in song titles are stripped"
  https://bugs.launchpad.net/openlp/+bug/742636

For more details, see:
https://code.launchpad.net/~trb143/openlp/beta1/+merge/59577

Fix crash in video from MediaManager.
Add logging to try and see why the code failed. 
-- 
https://code.launchpad.net/~trb143/openlp/beta1/+merge/59577
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/beta1 into lp:openlp.

=== modified file 'openlp/core/lib/renderer.py'
--- openlp/core/lib/renderer.py	2011-04-29 19:22:20 +0000
+++ openlp/core/lib/renderer.py	2011-04-30 05:49:28 +0000
@@ -71,7 +71,7 @@
         log.debug(u'Initilisation started')
         self.screens = screens
         self.image_manager = ImageManager()
-        self.display = MainDisplay(self, screens, False, False)
+        self.display = MainDisplay(self, screens, False)
         self.display.imageManager = self.image_manager
         self.theme_manager = theme_manager
         self.service_theme = u''

=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py	2011-04-29 16:27:27 +0000
+++ openlp/core/ui/maindisplay.py	2011-04-30 05:49:28 +0000
@@ -60,12 +60,11 @@
     """
     This is the display screen.
     """
-    def __init__(self, parent, screens, live, needsPhonon=True):
+    def __init__(self, parent, screens, live):
         DisplayWidget.__init__(self, live, parent=None)
         self.parent = parent
         self.screens = screens
         self.isLive = live
-        self.needsPhonon = needsPhonon
         self.alertTab = None
         self.hideMode = None
         self.videoHide = False

=== modified file 'openlp/plugins/media/lib/mediaitem.py'
--- openlp/plugins/media/lib/mediaitem.py	2011-04-29 16:41:26 +0000
+++ openlp/plugins/media/lib/mediaitem.py	2011-04-30 05:49:28 +0000
@@ -132,6 +132,9 @@
                 unicode(translate('MediaPlugin.MediaItem',
                 'The file %s no longer exists.')) % filename)
             return False
+        # Guard incase the event fails to get object created.
+        if not self.mediaObject:
+            self.mediaObject = Phonon.MediaObject(self)
         self.mediaObject.stop()
         self.mediaObject.clearQueue()
         self.mediaObject.setCurrentSource(Phonon.MediaSource(filename))
@@ -215,6 +218,6 @@
             self.listView.addItem(item_name)
 
     def createPhonon(self):
+        log.debug(u'CreatePhonon')
         if not self.mediaObject:
             self.mediaObject = Phonon.MediaObject(self)
-