From 7a72fe84df0ffcd38398b5917385d8b36a4fedb3 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 14 Feb 2016 08:26:04 +0000 Subject: [PATCH] more updates and cleanups --- openlp/core/ui/media/mediacontroller.py | 11 ++++++----- openlp/core/ui/media/systemplayer.py | 6 ++---- openlp/core/ui/media/vlcplayer.py | 12 +----------- 3 files changed, 9 insertions(+), 20 deletions(-) diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py index b33a52f9d..b7767a1d3 100644 --- a/openlp/core/ui/media/mediacontroller.py +++ b/openlp/core/ui/media/mediacontroller.py @@ -54,6 +54,7 @@ class MediaSlider(QtWidgets.QSlider): super(MediaSlider, self).__init__(direction) self.manager = manager self.controller = controller + self.no_matching_player = translate('MediaPlugin.MediaItem', 'File %s not supported using player %s') def mouseMoveEvent(self, event): """ @@ -460,7 +461,7 @@ class MediaController(RegistryMixin, OpenLPMixin, RegistryProperties): print(suffix in player.video_extensions_list or suffix in player.audio_extensions_list) if not suffix in player.video_extensions_list and not suffix in player.audio_extensions_list: # Media could not be loaded correctly - critical_error_message_box(translate('MediaPlugin.MediaItem', 'Unsupported File'), + critical_error_message_box(translate('MediaPlugin.MediaItem', 'Unsupported Media File'), translate('MediaPlugin.MediaItem', 'File %s not supported using player %s') % (service_item.get_frame_path(), used_players[0])) return False @@ -495,9 +496,9 @@ class MediaController(RegistryMixin, OpenLPMixin, RegistryProperties): controller.media_info.media_type = MediaType.CD else: controller.media_info.media_type = MediaType.DVD - controller.media_info.start_time = start / 1000 - controller.media_info.end_time = end / 1000 - controller.media_info.length = (end - start) / 1000 + controller.media_info.start_time = start // 1000 + controller.media_info.end_time = end // 1000 + controller.media_info.length = (end - start) // 1000 controller.media_info.title_track = title controller.media_info.audio_track = audio_track controller.media_info.subtitle_track = subtitle_track @@ -665,7 +666,7 @@ class MediaController(RegistryMixin, OpenLPMixin, RegistryProperties): seconds = controller.media_info.timer // 1000 minutes = seconds // 60 seconds %= 60 - total_seconds = controller.media_info.length + total_seconds = controller.media_info.length // 1000 total_minutes = total_seconds // 60 total_seconds %= 60 controller.position_label.setText(' %02d:%02d / %02d:%02d' % diff --git a/openlp/core/ui/media/systemplayer.py b/openlp/core/ui/media/systemplayer.py index ac7a34eed..7cd15bf0f 100644 --- a/openlp/core/ui/media/systemplayer.py +++ b/openlp/core/ui/media/systemplayer.py @@ -209,9 +209,7 @@ class SystemPlayer(MediaPlayer): @staticmethod def set_duration(controller, duration): - print("system set duration", controller.media_info.length, duration) - #controller.media_info.length = int(duration / 1000) - controller.seek_slider.setMaximum(controller.media_info.length * 1000) + controller.seek_slider.setMaximum(controller.media_info.length) def update_ui(self, display): """ @@ -221,7 +219,7 @@ class SystemPlayer(MediaPlayer): self.stop(display) controller = display.controller if controller.media_info.end_time > 0: - if display.media_player.position() > controller.media_info.end_time * 1000: + if display.media_player.position() > controller.media_info.end_time: self.stop(display) self.set_visible(display, False) if not controller.seek_slider.isSliderDown(): diff --git a/openlp/core/ui/media/vlcplayer.py b/openlp/core/ui/media/vlcplayer.py index fb865f624..2ac79d3ff 100644 --- a/openlp/core/ui/media/vlcplayer.py +++ b/openlp/core/ui/media/vlcplayer.py @@ -220,12 +220,6 @@ class VlcPlayer(MediaPlayer): # parse the metadata of the file display.vlc_media.parse() self.volume(display, volume) - # We need to set media_info.length during load because we want - # to avoid start and stop the video twice. Once for real playback - # and once to just get media length. - # - # Media plugin depends on knowing media length before playback. - #controller.media_info.length = int(display.vlc_media_player.get_media().get_duration() / 1000) return True def media_state_wait(self, display, media_state): @@ -273,7 +267,7 @@ class VlcPlayer(MediaPlayer): if not self.media_state_wait(display, vlc.State.Playing): return False if self.state != MediaState.Paused and controller.media_info.start_time > 0: - log.debug('vlc play, starttime set') + log.debug('vlc play, start time set') start_time = controller.media_info.start_time log.debug('mediatype: ' + str(controller.media_info.media_type)) # Set tracks for the optical device @@ -295,14 +289,10 @@ class VlcPlayer(MediaPlayer): log.debug('vlc play, starttime set: ' + str(controller.media_info.start_time)) start_time = controller.media_info.start_time controller.media_info.length = controller.media_info.end_time - controller.media_info.start_time - else: - print("vlc len", controller.media_info.length) - #controller.media_info.length = int(display.vlc_media_player.get_media().get_duration()) self.volume(display, controller.media_info.volume) if start_time > 0 and display.vlc_media_player.is_seekable(): display.vlc_media_player.set_time(int(start_time)) controller.seek_slider.setMaximum(controller.media_info.length) - print("VLC play " + str(controller.media_info.length)) self.state = MediaState.Playing display.vlc_widget.raise_() return True