From 5d821b17724684d706e625b8eaf72ca03a17003e Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Wed, 19 Feb 2020 06:23:17 +0000 Subject: [PATCH] Fix appvoyer tests - we hope Migrate UI to pytest and fix up all tests. --- openlp/plugins/media/lib/mediaitem.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index 790c6eec2..4bd987b58 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -46,9 +46,6 @@ if get_vlc() is not None: log = logging.getLogger(__name__) -CLAPPERBOARD = UiIcons().clapperboard - - class MediaMediaItem(MediaManagerItem, RegistryProperties): """ This is the custom media manager item for Media Slides. @@ -69,6 +66,7 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties): self.background = False self.automatic = '' self.error_icon = UiIcons().delete + self.clapperboard = UiIcons().clapperboard def setup_item(self): """ @@ -160,7 +158,7 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties): 'The optical disc {name} is no longer available.').format(name=name)) return False service_item.processor = 'vlc' - service_item.add_from_command(filename, name, CLAPPERBOARD) + service_item.add_from_command(filename, name, self.clapperboard) service_item.title = clip_name # Set the length service_item.set_media_length(end - start) @@ -171,7 +169,7 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties): # Special handling if the filename is a devicestream (name, mrl, options) = parse_devicestream_path(filename) service_item.processor = 'vlc' - service_item.add_from_command(filename, name, CLAPPERBOARD) + service_item.add_from_command(filename, name, self.clapperboard) service_item.title = name service_item.add_capability(ItemCapabilities.CanStream) else: @@ -185,7 +183,7 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties): (path, name) = os.path.split(filename) service_item.title = name service_item.processor = 'vlc' - service_item.add_from_command(path, name, CLAPPERBOARD) + service_item.add_from_command(path, name, self.clapperboard) # Only get start and end times if going to a service service_item.set_media_length(self.media_controller.media_length(filename)) service_item.add_capability(ItemCapabilities.CanAutoStartForLive)