[Openlp-core] [Merge] lp:~trb143/openlp/more_media into lp:openlp
The proposal to merge lp:~trb143/openlp/more_media into lp:openlp has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~trb143/openlp/more_media/+merge/368843 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1832923] [NEW] SongSelect error handling
Public bug reported: A user on the forum had an error when trying to import from the SongSelect websiteOpenLP locked up and did NOT handle the error the website returned Please see https://forums.openlp.org/discussion/4346/openlp-crashes- when-trying-to-view-import-a-song-from-songselect#latest This was reported on the current released version of OpenLP, not the development version. ** Affects: openlp Importance: Undecided Status: New -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1832923 Title: SongSelect error handling Status in OpenLP: New Bug description: A user on the forum had an error when trying to import from the SongSelect websiteOpenLP locked up and did NOT handle the error the website returned Please see https://forums.openlp.org/discussion/4346/openlp-crashes- when-trying-to-view-import-a-song-from-songselect#latest This was reported on the current released version of OpenLP, not the development version. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1832923/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~trb143/openlp/more_media into lp:openlp
Review: Approve -- https://code.launchpad.net/~trb143/openlp/more_media/+merge/368843 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] macOS Test Results: Passed
macOS tests passed! -- https://code.launchpad.net/~trb143/openlp/more_media/+merge/368843 Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/more_media into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] Linting: Passed
Linting passed! -- https://code.launchpad.net/~trb143/openlp/more_media/+merge/368843 Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/more_media into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] Linux Test Results: Passed
Linux tests passed! -- https://code.launchpad.net/~trb143/openlp/more_media/+merge/368843 Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/more_media into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~trb143/openlp/more_media into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/more_media into lp:openlp.
Commit message:
Adds basic streaming service item
UI to set up streaming
Fix issues with suffix refactor
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~trb143/openlp/more_media/+merge/368842
--
Your team OpenLP Core is requested to review the proposed merge of
lp:~trb143/openlp/more_media into lp:openlp.
=== modified file 'openlp/core/common/settings.py'
--- openlp/core/common/settings.py 2019-06-10 20:22:22 +
+++ openlp/core/common/settings.py 2019-06-14 19:30:51 +
@@ -210,6 +210,8 @@
'media/media auto start': QtCore.Qt.Unchecked,
'media/stream command': '',
'media/vlc arguments': '',
+'media/video': '',
+'media/audio': '',
'remotes/download version': '0.0',
'players/background color': '#00',
'servicemanager/last directory': None,
=== modified file 'openlp/core/lib/__init__.py'
--- openlp/core/lib/__init__.py 2019-05-22 06:47:00 +
+++ openlp/core/lib/__init__.py 2019-06-14 19:30:51 +
@@ -173,6 +173,7 @@
HasNotes = 20
HasThumbnails = 21
HasMetaData = 22
+CanStream = 23
def get_text_file_string(text_file_path):
=== modified file 'openlp/core/ui/media/__init__.py'
--- openlp/core/ui/media/__init__.py 2019-04-13 13:00:22 +
+++ openlp/core/ui/media/__init__.py 2019-06-14 19:30:51 +
@@ -26,6 +26,19 @@
log = logging.getLogger(__name__ + '.__init__')
+# Audio and video extensions copied from 'include/vlc_interface.h' from vlc 2.2.0 source
+AUDIO_EXT = ['*.3ga', '*.669', '*.a52', '*.aac', '*.ac3', '*.adt', '*.adts', '*.aif', '*.aifc', '*.aiff', '*.amr',
+ '*.aob', '*.ape', '*.awb', '*.caf', '*.dts', '*.flac', '*.it', '*.kar', '*.m4a', '*.m4b', '*.m4p', '*.m5p',
+ '*.mid', '*.mka', '*.mlp', '*.mod', '*.mpa', '*.mp1', '*.mp2', '*.mp3', '*.mpc', '*.mpga', '*.mus',
+ '*.oga', '*.ogg', '*.oma', '*.opus', '*.qcp', '*.ra', '*.rmi', '*.s3m', '*.sid', '*.spx', '*.thd', '*.tta',
+ '*.voc', '*.vqf', '*.w64', '*.wav', '*.wma', '*.wv', '*.xa', '*.xm']
+VIDEO_EXT = ['*.3g2', '*.3gp', '*.3gp2', '*.3gpp', '*.amv', '*.asf', '*.avi', '*.bik', '*.divx', '*.drc', '*.dv',
+ '*.f4v', '*.flv', '*.gvi', '*.gxf', '*.iso', '*.m1v', '*.m2v', '*.m2t', '*.m2ts', '*.m4v', '*.mkv',
+ '*.mov', '*.mp2', '*.mp2v', '*.mp4', '*.mp4v', '*.mpe', '*.mpeg', '*.mpeg1', '*.mpeg2', '*.mpeg4', '*.mpg',
+ '*.mpv2', '*.mts', '*.mtv', '*.mxf', '*.mxg', '*.nsv', '*.nuv', '*.ogg', '*.ogm', '*.ogv', '*.ogx', '*.ps',
+ '*.rec', '*.rm', '*.rmvb', '*.rpl', '*.thp', '*.tod', '*.ts', '*.tts', '*.txd', '*.vob', '*.vro', '*.webm',
+ '*.wm', '*.wmv', '*.wtv', '*.xesc', '*.nut', '*.rv', '*.xvid']
+
class MediaState(object):
"""
=== modified file 'openlp/core/ui/media/mediacontroller.py'
--- openlp/core/ui/media/mediacontroller.py 2019-06-05 04:53:18 +
+++ openlp/core/ui/media/mediacontroller.py 2019-06-14 19:30:51 +
@@ -42,9 +42,9 @@
from openlp.core.lib.serviceitem import ItemCapabilities
from openlp.core.lib.ui import critical_error_message_box
from openlp.core.ui import DisplayControllerType
-from openlp.core.ui.media import MediaState, ItemMediaInfo, MediaType, parse_optical_path
+from openlp.core.ui.media import MediaState, ItemMediaInfo, MediaType, parse_optical_path, VIDEO_EXT, AUDIO_EXT
from openlp.core.ui.media.endpoint import media_endpoint
-from openlp.core.ui.media.vlcplayer import AUDIO_EXT, VIDEO_EXT, VlcPlayer, get_vlc
+from openlp.core.ui.media.vlcplayer import VlcPlayer, get_vlc
log = logging.getLogger(__name__)
@@ -184,7 +184,8 @@
display.has_audio = False
self.vlc_player.setup(display, preview)
-def set_controls_visible(self, controller, value):
+@staticmethod
+def set_controls_visible(controller, value):
"""
After a new display is configured, all media related widget will be created too
@@ -229,7 +230,10 @@
display = self._define_display(controller)
if controller.is_live:
# if this is an optical device use special handling
-if service_item.is_capable(ItemCapabilities.IsOptical):
+if service_item.is_capable(ItemCapabilities.CanStream):
+is_valid = self._check_file_type(controller, display, True)
+controller.media_info.media_type = MediaType.Stream
+elif service_item.is_capable(ItemCapabilities.IsOptical):
log.debug('video is optical and live')
path = service_item.get_frame_path()
(name, title, audio_track, subtitle_track, start, end, clip_name) = parse_optical_path(path)
@@ -249,7 +253,10 @@
controller.media_info.start_time = service_item.start_time
controller.media_info.end_time = service_item.end_time
elif
[Openlp-core] [Merge] lp:~trb143/openlp/more_media into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/more_media into lp:openlp.
Commit message:
Adds basic streaming service item
UI to set up streaming
Fix issues with suffix refactor
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~trb143/openlp/more_media/+merge/368843
--
Your team OpenLP Core is requested to review the proposed merge of
lp:~trb143/openlp/more_media into lp:openlp.
=== modified file 'openlp/core/common/settings.py'
--- openlp/core/common/settings.py 2019-06-10 20:22:22 +
+++ openlp/core/common/settings.py 2019-06-14 19:28:31 +
@@ -210,6 +210,8 @@
'media/media auto start': QtCore.Qt.Unchecked,
'media/stream command': '',
'media/vlc arguments': '',
+'media/video': '',
+'media/audio': '',
'remotes/download version': '0.0',
'players/background color': '#00',
'servicemanager/last directory': None,
=== modified file 'openlp/core/lib/__init__.py'
--- openlp/core/lib/__init__.py 2019-05-22 06:47:00 +
+++ openlp/core/lib/__init__.py 2019-06-14 19:28:31 +
@@ -173,6 +173,7 @@
HasNotes = 20
HasThumbnails = 21
HasMetaData = 22
+CanStream = 23
def get_text_file_string(text_file_path):
=== modified file 'openlp/core/ui/media/__init__.py'
--- openlp/core/ui/media/__init__.py 2019-04-13 13:00:22 +
+++ openlp/core/ui/media/__init__.py 2019-06-14 19:28:31 +
@@ -26,6 +26,19 @@
log = logging.getLogger(__name__ + '.__init__')
+# Audio and video extensions copied from 'include/vlc_interface.h' from vlc 2.2.0 source
+AUDIO_EXT = ['*.3ga', '*.669', '*.a52', '*.aac', '*.ac3', '*.adt', '*.adts', '*.aif', '*.aifc', '*.aiff', '*.amr',
+ '*.aob', '*.ape', '*.awb', '*.caf', '*.dts', '*.flac', '*.it', '*.kar', '*.m4a', '*.m4b', '*.m4p', '*.m5p',
+ '*.mid', '*.mka', '*.mlp', '*.mod', '*.mpa', '*.mp1', '*.mp2', '*.mp3', '*.mpc', '*.mpga', '*.mus',
+ '*.oga', '*.ogg', '*.oma', '*.opus', '*.qcp', '*.ra', '*.rmi', '*.s3m', '*.sid', '*.spx', '*.thd', '*.tta',
+ '*.voc', '*.vqf', '*.w64', '*.wav', '*.wma', '*.wv', '*.xa', '*.xm']
+VIDEO_EXT = ['*.3g2', '*.3gp', '*.3gp2', '*.3gpp', '*.amv', '*.asf', '*.avi', '*.bik', '*.divx', '*.drc', '*.dv',
+ '*.f4v', '*.flv', '*.gvi', '*.gxf', '*.iso', '*.m1v', '*.m2v', '*.m2t', '*.m2ts', '*.m4v', '*.mkv',
+ '*.mov', '*.mp2', '*.mp2v', '*.mp4', '*.mp4v', '*.mpe', '*.mpeg', '*.mpeg1', '*.mpeg2', '*.mpeg4', '*.mpg',
+ '*.mpv2', '*.mts', '*.mtv', '*.mxf', '*.mxg', '*.nsv', '*.nuv', '*.ogg', '*.ogm', '*.ogv', '*.ogx', '*.ps',
+ '*.rec', '*.rm', '*.rmvb', '*.rpl', '*.thp', '*.tod', '*.ts', '*.tts', '*.txd', '*.vob', '*.vro', '*.webm',
+ '*.wm', '*.wmv', '*.wtv', '*.xesc', '*.nut', '*.rv', '*.xvid']
+
class MediaState(object):
"""
=== modified file 'openlp/core/ui/media/mediacontroller.py'
--- openlp/core/ui/media/mediacontroller.py 2019-06-05 04:53:18 +
+++ openlp/core/ui/media/mediacontroller.py 2019-06-14 19:28:31 +
@@ -42,9 +42,9 @@
from openlp.core.lib.serviceitem import ItemCapabilities
from openlp.core.lib.ui import critical_error_message_box
from openlp.core.ui import DisplayControllerType
-from openlp.core.ui.media import MediaState, ItemMediaInfo, MediaType, parse_optical_path
+from openlp.core.ui.media import MediaState, ItemMediaInfo, MediaType, parse_optical_path, VIDEO_EXT, AUDIO_EXT
from openlp.core.ui.media.endpoint import media_endpoint
-from openlp.core.ui.media.vlcplayer import AUDIO_EXT, VIDEO_EXT, VlcPlayer, get_vlc
+from openlp.core.ui.media.vlcplayer import VlcPlayer, get_vlc
log = logging.getLogger(__name__)
@@ -184,7 +184,8 @@
display.has_audio = False
self.vlc_player.setup(display, preview)
-def set_controls_visible(self, controller, value):
+@staticmethod
+def set_controls_visible(controller, value):
"""
After a new display is configured, all media related widget will be created too
@@ -229,7 +230,10 @@
display = self._define_display(controller)
if controller.is_live:
# if this is an optical device use special handling
-if service_item.is_capable(ItemCapabilities.IsOptical):
+if service_item.is_capable(ItemCapabilities.CanStream):
+is_valid = self._check_file_type(controller, display, True)
+controller.media_info.media_type = MediaType.Stream
+elif service_item.is_capable(ItemCapabilities.IsOptical):
log.debug('video is optical and live')
path = service_item.get_frame_path()
(name, title, audio_track, subtitle_track, start, end, clip_name) = parse_optical_path(path)
@@ -249,7 +253,10 @@
controller.media_info.start_time = service_item.start_time
controller.media_info.end_time = service_item.end_time
elif
[Openlp-core] [Merge] lp:~trb143/openlp/more_media into lp:openlp
The proposal to merge lp:~trb143/openlp/more_media into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~trb143/openlp/more_media/+merge/368842 -- Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/more_media into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~trb143/openlp/more_media into lp:openlp
Review: Approve -- https://code.launchpad.net/~trb143/openlp/more_media/+merge/368841 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] Linting: Passed
Linting passed! -- https://code.launchpad.net/~trb143/openlp/more_media/+merge/368842 Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/more_media into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~trb143/openlp/more_media into lp:openlp
Review: Needs Fixing
Just one inconsistency with text labels (see inline) and the failed linting,
but other than that looks ok!
Diff comments:
>
> === modified file 'openlp/core/ui/media/mediatab.py'
> --- openlp/core/ui/media/mediatab.py 2019-05-04 19:47:06 +
> +++ openlp/core/ui/media/mediatab.py 2019-06-14 18:00:17 +
> @@ -68,11 +68,15 @@
> self.left_layout.addWidget(self.live_media_group_box)
> self.stream_media_group_box = QtWidgets.QGroupBox(self.left_column)
> self.stream_media_group_box.setObjectName('stream_media_group_box')
> -self.stream_media_layout =
> QtWidgets.QHBoxLayout(self.stream_media_group_box)
> +self.stream_media_layout =
> QtWidgets.QFormLayout(self.stream_media_group_box)
> self.stream_media_layout.setObjectName('stream_media_layout')
> self.stream_media_layout.setContentsMargins(0, 0, 0, 0)
> -self.stream_edit = QtWidgets.QLabel(self)
> -self.stream_media_layout.addWidget(self.stream_edit)
> +self.video_edit = QtWidgets.QLineEdit(self)
> +self.stream_media_layout.addRow(translate('MediaPlugin.MediaTab',
> 'Video:'), self.video_edit)
colon here
> +self.audio_edit = QtWidgets.QLineEdit(self)
> +self.stream_media_layout.addRow(translate('MediaPlugin.MediaTab',
> 'Audio'), self.audio_edit)
but not here
> +self.stream_cmd = QtWidgets.QLabel(self)
> +self.stream_media_layout.addWidget(self.stream_cmd)
> self.left_layout.addWidget(self.stream_media_group_box)
> self.vlc_arguments_group_box = QtWidgets.QGroupBox(self.left_column)
> self.vlc_arguments_group_box.setObjectName('vlc_arguments_group_box')
--
https://code.launchpad.net/~trb143/openlp/more_media/+merge/368841
Your team OpenLP Core is subscribed to branch lp:openlp.
___
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
[Openlp-core] Linux Test Results: Passed
Linux tests passed! -- https://code.launchpad.net/~trb143/openlp/more_media/+merge/368842 Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/more_media into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~trb143/openlp/more_media into lp:openlp
The proposal to merge lp:~trb143/openlp/more_media into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~trb143/openlp/more_media/+merge/368841 -- Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/more_media into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] Linux Test Results: Passed
Linux tests passed! -- https://code.launchpad.net/~trb143/openlp/more_media/+merge/368841 Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/more_media into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] Linting: Failed
Linting failed, please see https://ci.openlp.io/job/MP-03-Linting/119/ for more details -- https://code.launchpad.net/~trb143/openlp/more_media/+merge/368841 Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/more_media into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~trb143/openlp/more_media into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/more_media into lp:openlp.
Commit message:
Adds basic streaming service item
UI to set up streaming
Fix issues with suffix refactor
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~trb143/openlp/more_media/+merge/368841
--
Your team OpenLP Core is requested to review the proposed merge of
lp:~trb143/openlp/more_media into lp:openlp.
=== modified file 'openlp/core/common/settings.py'
--- openlp/core/common/settings.py 2019-06-10 20:22:22 +
+++ openlp/core/common/settings.py 2019-06-14 18:00:17 +
@@ -210,6 +210,8 @@
'media/media auto start': QtCore.Qt.Unchecked,
'media/stream command': '',
'media/vlc arguments': '',
+'media/video': '',
+'media/audio': '',
'remotes/download version': '0.0',
'players/background color': '#00',
'servicemanager/last directory': None,
=== modified file 'openlp/core/lib/__init__.py'
--- openlp/core/lib/__init__.py 2019-05-22 06:47:00 +
+++ openlp/core/lib/__init__.py 2019-06-14 18:00:17 +
@@ -173,6 +173,7 @@
HasNotes = 20
HasThumbnails = 21
HasMetaData = 22
+CanStream = 23
def get_text_file_string(text_file_path):
=== modified file 'openlp/core/ui/media/__init__.py'
--- openlp/core/ui/media/__init__.py 2019-04-13 13:00:22 +
+++ openlp/core/ui/media/__init__.py 2019-06-14 18:00:17 +
@@ -26,6 +26,19 @@
log = logging.getLogger(__name__ + '.__init__')
+# Audio and video extensions copied from 'include/vlc_interface.h' from vlc 2.2.0 source
+AUDIO_EXT = ['*.3ga', '*.669', '*.a52', '*.aac', '*.ac3', '*.adt', '*.adts', '*.aif', '*.aifc', '*.aiff', '*.amr',
+ '*.aob', '*.ape', '*.awb', '*.caf', '*.dts', '*.flac', '*.it', '*.kar', '*.m4a', '*.m4b', '*.m4p', '*.m5p',
+ '*.mid', '*.mka', '*.mlp', '*.mod', '*.mpa', '*.mp1', '*.mp2', '*.mp3', '*.mpc', '*.mpga', '*.mus',
+ '*.oga', '*.ogg', '*.oma', '*.opus', '*.qcp', '*.ra', '*.rmi', '*.s3m', '*.sid', '*.spx', '*.thd', '*.tta',
+ '*.voc', '*.vqf', '*.w64', '*.wav', '*.wma', '*.wv', '*.xa', '*.xm']
+VIDEO_EXT = ['*.3g2', '*.3gp', '*.3gp2', '*.3gpp', '*.amv', '*.asf', '*.avi', '*.bik', '*.divx', '*.drc', '*.dv',
+ '*.f4v', '*.flv', '*.gvi', '*.gxf', '*.iso', '*.m1v', '*.m2v', '*.m2t', '*.m2ts', '*.m4v', '*.mkv',
+ '*.mov', '*.mp2', '*.mp2v', '*.mp4', '*.mp4v', '*.mpe', '*.mpeg', '*.mpeg1', '*.mpeg2', '*.mpeg4', '*.mpg',
+ '*.mpv2', '*.mts', '*.mtv', '*.mxf', '*.mxg', '*.nsv', '*.nuv', '*.ogg', '*.ogm', '*.ogv', '*.ogx', '*.ps',
+ '*.rec', '*.rm', '*.rmvb', '*.rpl', '*.thp', '*.tod', '*.ts', '*.tts', '*.txd', '*.vob', '*.vro', '*.webm',
+ '*.wm', '*.wmv', '*.wtv', '*.xesc', '*.nut', '*.rv', '*.xvid']
+
class MediaState(object):
"""
=== modified file 'openlp/core/ui/media/mediacontroller.py'
--- openlp/core/ui/media/mediacontroller.py 2019-06-05 04:53:18 +
+++ openlp/core/ui/media/mediacontroller.py 2019-06-14 18:00:17 +
@@ -42,9 +42,9 @@
from openlp.core.lib.serviceitem import ItemCapabilities
from openlp.core.lib.ui import critical_error_message_box
from openlp.core.ui import DisplayControllerType
-from openlp.core.ui.media import MediaState, ItemMediaInfo, MediaType, parse_optical_path
+from openlp.core.ui.media import MediaState, ItemMediaInfo, MediaType, parse_optical_path, VIDEO_EXT, AUDIO_EXT
from openlp.core.ui.media.endpoint import media_endpoint
-from openlp.core.ui.media.vlcplayer import AUDIO_EXT, VIDEO_EXT, VlcPlayer, get_vlc
+from openlp.core.ui.media.vlcplayer import VlcPlayer, get_vlc
log = logging.getLogger(__name__)
@@ -184,7 +184,8 @@
display.has_audio = False
self.vlc_player.setup(display, preview)
-def set_controls_visible(self, controller, value):
+@staticmethod
+def set_controls_visible(controller, value):
"""
After a new display is configured, all media related widget will be created too
@@ -229,7 +230,10 @@
display = self._define_display(controller)
if controller.is_live:
# if this is an optical device use special handling
-if service_item.is_capable(ItemCapabilities.IsOptical):
+if service_item.is_capable(ItemCapabilities.CanStream):
+is_valid = self._check_file_type(controller, display, True)
+controller.media_info.media_type = MediaType.Stream
+elif service_item.is_capable(ItemCapabilities.IsOptical):
log.debug('video is optical and live')
path = service_item.get_frame_path()
(name, title, audio_track, subtitle_track, start, end, clip_name) = parse_optical_path(path)
@@ -249,7 +253,10 @@
controller.media_info.start_time = service_item.start_time
controller.media_info.end_time = service_item.end_time
elif
[Openlp-core] [Bug 1832874] Re: Temporary songs appear in the 'Delete Duplicate songs' wizard
Code to fix this was removed from the Songs plugin in 2.2 but was there in 2.0 ** Changed in: openlp Status: New => Confirmed ** Changed in: openlp Importance: Undecided => High -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1832874 Title: Temporary songs appear in the 'Delete Duplicate songs' wizard Status in OpenLP: Confirmed Bug description: Windows 10 OpenLP 2.4.6 When you run the Delete Duplicate songs wizard most songs marked in the db as Temporary will show up and the user has no idea that they are temporary It would be best if the songs were removed from the db when they are no longer needed, but at the very least they should not show up in the wizard. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1832874/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1832876] [NEW] Please add songbook to the 'Delete Duplicate Songs' Wizard
Public bug reported: Windows 10 OpenLP 2.4.6 When trying to delete duplicate songs using the wizard, please add the songbook and theme to the information displayed. It helps to know that there are three duplicates of a song, but each is in a different songbook or that they have different themes. Most musicians add bits to the song that make them special for just them! ** Affects: openlp Importance: Undecided Status: New -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1832876 Title: Please add songbook to the 'Delete Duplicate Songs' Wizard Status in OpenLP: New Bug description: Windows 10 OpenLP 2.4.6 When trying to delete duplicate songs using the wizard, please add the songbook and theme to the information displayed. It helps to know that there are three duplicates of a song, but each is in a different songbook or that they have different themes. Most musicians add bits to the song that make them special for just them! To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1832876/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1832874] [NEW] Temporary songs appear in the 'Delete Duplicate songs' wizard
Public bug reported: Windows 10 OpenLP 2.4.6 When you run the Delete Duplicate songs wizard most songs marked in the db as Temporary will show up and the user has no idea that they are temporary It would be best if the songs were removed from the db when they are no longer needed, but at the very least they should not show up in the wizard. ** Affects: openlp Importance: Undecided Status: New -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1832874 Title: Temporary songs appear in the 'Delete Duplicate songs' wizard Status in OpenLP: New Bug description: Windows 10 OpenLP 2.4.6 When you run the Delete Duplicate songs wizard most songs marked in the db as Temporary will show up and the user has no idea that they are temporary It would be best if the songs were removed from the db when they are no longer needed, but at the very least they should not show up in the wizard. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1832874/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
