From 4390c139011f55004e05475ff827fe9dcdd90310 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Tue, 4 Sep 2012 21:22:27 +0100 Subject: [PATCH 1/8] Auto start media --- openlp/core/ui/slidecontroller.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index faa9e1a52..1efe746e0 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -889,6 +889,8 @@ class SlideController(Controller): 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: From ed2d670f188ffe226368eb8ded705ca2d8d104d6 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Thu, 6 Sep 2012 17:38:31 +0100 Subject: [PATCH 2/8] fix ups --- openlp/core/ui/media/mediacontroller.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py index 94c148912..2f3df817b 100644 --- a/openlp/core/ui/media/mediacontroller.py +++ b/openlp/core/ui/media/mediacontroller.py @@ -196,7 +196,8 @@ class MediaController(object): 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.'), From 6d53ed904ba5d992ac113f9963b8afb3d7ebfecf Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Thu, 6 Sep 2012 18:12:02 +0100 Subject: [PATCH 3/8] Fix extra line --- openlp/core/ui/media/mediacontroller.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py index 2f3df817b..94c148912 100644 --- a/openlp/core/ui/media/mediacontroller.py +++ b/openlp/core/ui/media/mediacontroller.py @@ -196,8 +196,7 @@ class MediaController(object): 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.'), From 59ca1f546900af4a31a7b51e7dabc96480658474 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 7 Sep 2012 17:58:13 +0100 Subject: [PATCH 4/8] Try 2 --- openlp/core/ui/media/mediacontroller.py | 31 ++++++++++++++++--------- openlp/core/ui/slidecontroller.py | 4 +--- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py index 94c148912..3a081e23c 100644 --- a/openlp/core/ui/media/mediacontroller.py +++ b/openlp/core/ui/media/mediacontroller.py @@ -287,7 +287,7 @@ class MediaController(object): """ player.resize(display) - def video(self, controller, file, muted, isBackground): + def video(self, controller, file, muted, isBackground, hidden=False): """ Loads and starts a video to run with the option of sound """ @@ -333,17 +333,26 @@ class MediaController(object): if controller.isLive and not controller.media_info.is_background: display.frame.evaluateJavaScript(u'show_video( \ "setBackBoard", null, null, null,"visible");') - # now start playing - if controller.isLive and \ - (Settings().value(u'general/auto unblank', - QtCore.QVariant(False)).toBool() or \ - controller.media_info.is_background) or not controller.isLive: + # now start playing - Preview is autoplay! + autoplay = False + # Preview requested + if not controller.isLive: + autoplay = True + # Visible or background requested + elif not hidden or controller.media_info.is_background: + autoplay = True + # Unblank on load set + elif Settings().value(u'general/auto unblank', + QtCore.QVariant(False)).toBool(): + autoplay = True + if autoplay: if not self.video_play([controller]): - critical_error_message_box( - translate('MediaPlugin.MediaItem', 'Unsupported File'), - unicode(translate('MediaPlugin.MediaItem', - 'Unsupported File'))) - return False + if not self.video_play([controller]): + critical_error_message_box( + translate('MediaPlugin.MediaItem', 'Unsupported File'), + unicode(translate('MediaPlugin.MediaItem', + 'Unsupported File'))) + return False self.set_controls_visible(controller, True) log.debug(u'use %s controller' % self.curDisplayMediaPlayer[display]) return True diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 1efe746e0..2d108e72c 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -889,8 +889,6 @@ class SlideController(Controller): 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: @@ -1349,7 +1347,7 @@ class SlideController(Controller): """ log.debug(u'SlideController onMediaStart') file = os.path.join(item.get_frame_path(), item.get_frame_title()) - self.mediaController.video(self, file, False, False) + self.mediaController.video(self, file, False, False, self.hideMode()) if not self.isLive or self.mediaController.withLivePreview: self.previewDisplay.show() self.slidePreview.hide() From dd001e15ab461933310c7418780f044d88729333 Mon Sep 17 00:00:00 2001 From: Erik Lundin Date: Sat, 8 Sep 2012 00:17:53 +0200 Subject: [PATCH 5/8] Corrected width of the default main output area (was wider than the screen). --- openlp/core/lib/renderer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py index 8dc03c33e..f16568f06 100644 --- a/openlp/core/lib/renderer.py +++ b/openlp/core/lib/renderer.py @@ -365,7 +365,7 @@ class Renderer(object): The theme information """ if not theme_data.font_main_override: - return QtCore.QRect(10, 0, self.width, self.footer_start) + return QtCore.QRect(10, 0, self.width - 20, self.footer_start) else: return QtCore.QRect(theme_data.font_main_x, theme_data.font_main_y, theme_data.font_main_width - 1, theme_data.font_main_height - 1) From ad39fa11e531cdf94d75d685b39afe7681647a63 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Sat, 8 Sep 2012 19:15:08 +0200 Subject: [PATCH 6/8] Reformatted the list of extensions, and added *.ogv (which is actually usually used for libtheora videos in the OGG container format) --- openlp/core/ui/media/vlcplayer.py | 53 ++++++++++++++----------------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/openlp/core/ui/media/vlcplayer.py b/openlp/core/ui/media/vlcplayer.py index bf1e7a920..6203ca696 100644 --- a/openlp/core/ui/media/vlcplayer.py +++ b/openlp/core/ui/media/vlcplayer.py @@ -63,37 +63,32 @@ if VLC_AVAILABLE: VLC_AVAILABLE = False log.debug(u'VLC could not be loaded: %s' % version) -AUDIO_EXT = [ - u'*.mp3' - , u'*.wav' - , u'*.wma' - , u'*.ogg' - ] +AUDIO_EXT = [u'*.mp3', u'*.wav', u'*.wma', u'*.ogg'] VIDEO_EXT = [ - u'*.3gp' - , u'*.asf', u'*.wmv' - , u'*.au' - , u'*.avi' - , u'*.flv' - , u'*.mov' - , u'*.mp4' - , u'*.ogm' - , u'*.mkv', u'*.mka' - , u'*.ts', u'*.mpg' - , u'*.mpg', u'*.mp2' - , u'*.nsc' - , u'*.nsv' - , u'*.nut' - , u'*.ra', u'*.ram', u'*.rm', u'*.rv' ,u'*.rmbv' - , u'*.a52', u'*.dts', u'*.aac', u'*.flac' ,u'*.dv', u'*.vid' - , u'*.tta', u'*.tac' - , u'*.ty' - , u'*.dts' - , u'*.xa' - , u'*.iso' - , u'*.vob' - ] + u'*.3gp', + u'*.asf', u'*.wmv', + u'*.au', + u'*.avi', + u'*.flv', + u'*.mov', + u'*.mp4', + u'*.ogm', u'*.ogv', + u'*.mkv', u'*.mka', + u'*.ts', u'*.mpg', + u'*.mpg', u'*.mp2', + u'*.nsc', + u'*.nsv', + u'*.nut', + u'*.ra', u'*.ram', u'*.rm', u'*.rv' ,u'*.rmbv', + u'*.a52', u'*.dts', u'*.aac', u'*.flac' ,u'*.dv', u'*.vid', + u'*.tta', u'*.tac', + u'*.ty', + u'*.dts', + u'*.xa', + u'*.iso', + u'*.vob' +] class VlcPlayer(MediaPlayer): From 77f49258f998ecaa926dc9f48c2c2fb8439bbe34 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 8 Sep 2012 19:29:05 +0100 Subject: [PATCH 7/8] Fix duplicate ifs --- openlp/core/ui/media/mediacontroller.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py index 3a081e23c..71debab48 100644 --- a/openlp/core/ui/media/mediacontroller.py +++ b/openlp/core/ui/media/mediacontroller.py @@ -347,12 +347,11 @@ class MediaController(object): autoplay = True if autoplay: if not self.video_play([controller]): - if not self.video_play([controller]): - critical_error_message_box( - translate('MediaPlugin.MediaItem', 'Unsupported File'), - unicode(translate('MediaPlugin.MediaItem', - 'Unsupported File'))) - return False + critical_error_message_box( + translate('MediaPlugin.MediaItem', 'Unsupported File'), + unicode(translate('MediaPlugin.MediaItem', + 'Unsupported File'))) + return False self.set_controls_visible(controller, True) log.debug(u'use %s controller' % self.curDisplayMediaPlayer[display]) return True From 51893b8052266d5159d4825f8fb68585d479114b Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 8 Sep 2012 19:39:15 +0100 Subject: [PATCH 8/8] tabs --- openlp/core/ui/media/mediacontroller.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py index 71debab48..5e9671f64 100644 --- a/openlp/core/ui/media/mediacontroller.py +++ b/openlp/core/ui/media/mediacontroller.py @@ -350,7 +350,7 @@ class MediaController(object): critical_error_message_box( translate('MediaPlugin.MediaItem', 'Unsupported File'), unicode(translate('MediaPlugin.MediaItem', - 'Unsupported File'))) + 'Unsupported File'))) return False self.set_controls_visible(controller, True) log.debug(u'use %s controller' % self.curDisplayMediaPlayer[display])