openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/bug-1022039 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~trb143/openlp/bug-1022039/+merge/123122

If live trigger the same signal as the push of the play button would trigger.
Tested on VLC, Webkit, Phonon with MOV and wma files
-- 
https://code.launchpad.net/~trb143/openlp/bug-1022039/+merge/123122
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/bug-1022039 into lp:openlp.

=== modified file 'openlp/core/ui/media/mediacontroller.py'
--- openlp/core/ui/media/mediacontroller.py	2012-08-05 18:17:52 +0000
+++ openlp/core/ui/media/mediacontroller.py	2012-09-06 16:41:25 +0000
@@ -196,7 +196,8 @@
         controller.media_info = MediaInfo()
         # Build a Media ToolBar
         controller.mediabar = OpenLPToolbar(controller)
-        controller.mediabar.addToolbarAction(u'playbackPlay',
+        controller.mediabar.addToolbarAction\
+            (u'playbackPlay',
             text=u'media_playback_play',
             icon=u':/slides/media_playback_start.png',
             tooltip=translate('OpenLP.SlideController', 'Start playing media.'),

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2012-08-18 10:55:57 +0000
+++ openlp/core/ui/slidecontroller.py	2012-09-06 16:41:25 +0000
@@ -889,6 +889,8 @@
             self.display.buildHtml(self.serviceItem)
         if serviceItem.is_media():
             self.onMediaStart(serviceItem)
+            if self.isLive:
+                Receiver.send_message('playbackPlay', [self, u'(False,)'])
         self.slideSelected(True)
         self.previewListWidget.setFocus()
         if old_item: