raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'appv' into 'master'

Browse Source 
Resolve AppVeyor breakage

See merge request openlp/openlp!141
This commit is contained in:
Tim Bentley 2020-02-19 06:23:17 +00:00
commit 744de67daf
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openlp/plugins/media/lib/mediaitem.py
View File

@ -46,9 +46,6 @@ if get_vlc() is not None:
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
CLAPPERBOARD = UiIcons().clapperboard
class MediaMediaItem(MediaManagerItem, RegistryProperties): class MediaMediaItem(MediaManagerItem, RegistryProperties):
""" """
This is the custom media manager item for Media Slides. This is the custom media manager item for Media Slides.
@ -69,6 +66,7 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties):
self.background = False self.background = False
self.automatic = '' self.automatic = ''
self.error_icon = UiIcons().delete self.error_icon = UiIcons().delete
self.clapperboard = UiIcons().clapperboard
def setup_item(self): def setup_item(self):
""" """
@ -160,7 +158,7 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties):
'The optical disc {name} is no longer available.').format(name=name)) 'The optical disc {name} is no longer available.').format(name=name))
return False return False
service_item.processor = 'vlc' 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 service_item.title = clip_name
# Set the length # Set the length
service_item.set_media_length(end - start) service_item.set_media_length(end - start)
@ -171,7 +169,7 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties):
# Special handling if the filename is a devicestream # Special handling if the filename is a devicestream
(name, mrl, options) = parse_devicestream_path(filename) (name, mrl, options) = parse_devicestream_path(filename)
service_item.processor = 'vlc' 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.title = name
service_item.add_capability(ItemCapabilities.CanStream) service_item.add_capability(ItemCapabilities.CanStream)
else: else:
@ -185,7 +183,7 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties):
(path, name) = os.path.split(filename) (path, name) = os.path.split(filename)
service_item.title = name service_item.title = name
service_item.processor = 'vlc' 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 # Only get start and end times if going to a service
service_item.set_media_length(self.media_controller.media_length(filename)) service_item.set_media_length(self.media_controller.media_length(filename))
service_item.add_capability(ItemCapabilities.CanAutoStartForLive) service_item.add_capability(ItemCapabilities.CanAutoStartForLive)