From f1bf3c30008f8cebc27eb8b6b9f71a6caa8014dd Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 12 Apr 2019 22:03:23 +0100 Subject: [PATCH 01/22] Finish experimental and start media tab --- openlp/core/ui/__init__.py | 2 +- openlp/core/ui/generaltab.py | 7 ++++++ openlp/core/ui/media/mediacontroller.py | 18 +++++++-------- openlp/core/ui/media/mediatab.py | 29 +++++++++---------------- openlp/core/ui/settingsform.py | 3 ++- 5 files changed, 29 insertions(+), 30 deletions(-) diff --git a/openlp/core/ui/__init__.py b/openlp/core/ui/__init__.py index 77c36a177..5a0719736 100644 --- a/openlp/core/ui/__init__.py +++ b/openlp/core/ui/__init__.py @@ -93,4 +93,4 @@ class SingleColumnTableWidget(QtWidgets.QTableWidget): self.resizeRowsToContents() -__all__ = ['SingleColumnTableWidget'] +__all__ = ['SingleColumnTableWidget', 'DisplayControllerType'] diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py index 2a81820af..a9d1873dd 100644 --- a/openlp/core/ui/generaltab.py +++ b/openlp/core/ui/generaltab.py @@ -113,6 +113,9 @@ class GeneralTab(SettingsTab): self.check_for_updates_check_box = QtWidgets.QCheckBox(self.startup_group_box) self.check_for_updates_check_box.setObjectName('check_for_updates_check_box') self.startup_layout.addWidget(self.check_for_updates_check_box) + self.experimental_check_box = QtWidgets.QCheckBox(self.startup_group_box) + self.experimental_check_box.setObjectName('experimental_check_box') + self.startup_layout.addWidget(self.experimental_check_box) self.right_layout.addWidget(self.startup_group_box) # Logo self.logo_group_box = QtWidgets.QGroupBox(self.right_column) @@ -180,6 +183,8 @@ class GeneralTab(SettingsTab): self.logo_file_label.setText(translate('OpenLP.GeneralTab', 'Logo file:')) self.logo_hide_on_startup_check_box.setText(translate('OpenLP.GeneralTab', 'Don\'t show logo on startup')) self.check_for_updates_check_box.setText(translate('OpenLP.GeneralTab', 'Check for updates to OpenLP')) + self.experimental_check_box.setText(translate('OpenLP.GeneralTab', + 'Experimental features (use at your own risk)')) self.settings_group_box.setTitle(translate('OpenLP.GeneralTab', 'Application Settings')) self.save_check_service_check_box.setText(translate('OpenLP.GeneralTab', 'Prompt to save before starting a new service')) @@ -222,6 +227,7 @@ class GeneralTab(SettingsTab): self.logo_hide_on_startup_check_box.setChecked(settings.value('logo hide on startup')) self.logo_color_button.color = self.logo_background_color self.check_for_updates_check_box.setChecked(settings.value('update check')) + self.experimental_check_box.setChecked(settings.value('experimental')) self.auto_preview_check_box.setChecked(settings.value('auto preview')) self.timeout_spin_box.setValue(settings.value('loop delay')) self.start_paused_check_box.setChecked(settings.value('audio start paused')) @@ -241,6 +247,7 @@ class GeneralTab(SettingsTab): settings.setValue('logo file', self.logo_file_path_edit.path) settings.setValue('logo hide on startup', self.logo_hide_on_startup_check_box.isChecked()) settings.setValue('update check', self.check_for_updates_check_box.isChecked()) + settings.setValue('experimental', self.experimental_check_box.isChecked()) settings.setValue('save prompt', self.save_check_service_check_box.isChecked()) settings.setValue('auto unblank', self.auto_unblank_check_box.isChecked()) settings.setValue('click live slide to unblank', self.click_live_slide_to_unblank_check_box.isChecked()) diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py index 073023359..aea3ed9c7 100644 --- a/openlp/core/ui/media/mediacontroller.py +++ b/openlp/core/ui/media/mediacontroller.py @@ -20,8 +20,7 @@ # Temple Place, Suite 330, Boston, MA 02111-1307 USA # ############################################################################### """ -The :mod:`~openlp.core.ui.media.mediacontroller` module contains a base class for media components and other widgets -related to playing media, such as sliders. +The :mod:`~openlp.core.ui.media.mediacontroller` module is the control module for all media playing. """ import logging @@ -124,14 +123,14 @@ class MediaController(RegistryBase, LogMixin, RegistryProperties): """ self.setup() self.vlc_player = VlcPlayer(self) - State().add_service("mediacontroller", 0) - State().add_service("media_live", 0, requires="mediacontroller") + State().add_service('mediacontroller', 0) + State().add_service('media_live', 0, requires='mediacontroller') if get_vlc() and pymediainfo_available: - State().update_pre_conditions("mediacontroller", True) + State().update_pre_conditions('mediacontroller', True) State().update_pre_conditions('media_live', True) else: - State().missing_text("mediacontroller", translate('OpenLP.SlideController', - "VLC or pymediainfo are missing, so you are unable to play any media")) + State().missing_text('media_live', translate('OpenLP.SlideController', + 'VLC or pymediainfo are missing, so you are unable to play any media')) self._generate_extensions_lists() return True @@ -144,6 +143,8 @@ class MediaController(RegistryBase, LogMixin, RegistryProperties): self.setup_display(self.live_controller.display, False) except AttributeError: State().update_pre_conditions('media_live', False) + State().missing_text('media_live', translate('OpenLP.SlideController', + 'No Displays configure so Live Media has been disabled')) self.setup_display(self.preview_controller.preview_display, True) def display_controllers(self, controller_type): @@ -563,8 +564,7 @@ class MediaController(RegistryBase, LogMixin, RegistryProperties): total_seconds = controller.media_info.length // 1000 total_minutes = total_seconds // 60 total_seconds %= 60 - controller.position_label.setText(' %02d:%02d / %02d:%02d' % - (0, 0, total_minutes, total_seconds)) + controller.position_label.setText(' %02d:%02d / %02d:%02d' % (0, 0, total_minutes, total_seconds)) controller.mediabar.actions['playbackPlay'].setVisible(True) controller.mediabar.actions['playbackStop'].setDisabled(True) controller.mediabar.actions['playbackPause'].setVisible(False) diff --git a/openlp/core/ui/media/mediatab.py b/openlp/core/ui/media/mediatab.py index 82130df1e..cba9bdcd4 100644 --- a/openlp/core/ui/media/mediatab.py +++ b/openlp/core/ui/media/mediatab.py @@ -20,11 +20,11 @@ # Temple Place, Suite 330, Boston, MA 02111-1307 USA # ############################################################################### """ -The :mod:`~openlp.core.ui.media.playertab` module holds the configuration tab for the media stuff. +The :mod:`~openlp.core.ui.media.mediatab` module holds the configuration tab for the media stuff. """ from PyQt5 import QtWidgets -# from PyQt5.QtMultimedia import QCameraInfo, QAudioDeviceInfo, QAudio +from PyQt5.QtMultimedia import QCameraInfo, QAudioDeviceInfo, QAudio from openlp.core.common import is_linux, is_win from openlp.core.common.i18n import translate @@ -32,8 +32,9 @@ from openlp.core.common.settings import Settings from openlp.core.lib.settingstab import SettingsTab from openlp.core.ui.icons import UiIcons -LINUX_STREAM = 'v4l2:///dev/video0' -WIN_STREAM = 'dshow:// :dshow-vdev=' +LINUX_STREAM = 'v4l2://{video} :v4l2-standard= :input-slave={audio} :live-caching=300' +WIN_STREAM = 'dshow://:dshow-vdev={video} :dshow-adev={audio} :live-caching=300' +OSX_STREAM = 'avcapture://{video} :qtsound://{audio} :live-caching=300' class MediaTab(SettingsTab): @@ -44,8 +45,6 @@ class MediaTab(SettingsTab): """ Constructor """ - # self.media_players = Registry().get('media_controller').media_players - # self.saved_used_players = None self.icon_path = UiIcons().video player_translated = translate('OpenLP.MediaTab', 'Media') super(MediaTab, self).__init__(parent, 'Media', player_translated) @@ -81,13 +80,13 @@ class MediaTab(SettingsTab): # # Signals and slots self.browse_button.clicked.connect(self.on_revert) - def retranslateUi(self): + def retranslate_ui(self): """ Translate the UI on the fly """ self.live_media_group_box.setTitle(translate('MediaPlugin.MediaTab', 'Live Media')) self.stream_media_group_box.setTitle(translate('MediaPlugin.MediaTab', 'Stream Media Command')) - self.auto_start_check_box.setText(translate('MediaPlugin.MediaTab', 'Start automatically')) + self.auto_start_check_box.setText(translate('MediaPlugin.MediaTab', 'Start Live items automatically')) def load(self): """ @@ -100,6 +99,8 @@ class MediaTab(SettingsTab): self.stream_edit.setPlainText(LINUX_STREAM) elif is_win: self.stream_edit.setPlainText(WIN_STREAM) + else: + self.stream_edit.setPlainText(OSX_STREAM) def save(self): """ @@ -108,17 +109,7 @@ class MediaTab(SettingsTab): setting_key = self.settings_section + '/media auto start' if Settings().value(setting_key) != self.auto_start_check_box.checkState(): Settings().setValue(setting_key, self.auto_start_check_box.checkState()) - # settings = Settings() - # settings.beginGroup(self.settings_section) - # settings.setValue('background color', self.background_color) - # settings.endGroup() - # old_players, override_player = get_media_players() - # if self.used_players != old_players: - # # clean old Media stuff - # set_media_players(self.used_players, override_player) - # self.settings_form.register_post_process('mediaitem_suffix_reset') - # self.settings_form.register_post_process('mediaitem_media_rebuild') - # self.settings_form.register_post_process('config_screen_changed') + Settings().setValue(self.settings_section + '/stream command', self.stream_edit.toPlainText()) def post_set_up(self, post_update=False): """ diff --git a/openlp/core/ui/settingsform.py b/openlp/core/ui/settingsform.py index d4f0ac30b..1d4e58bfe 100644 --- a/openlp/core/ui/settingsform.py +++ b/openlp/core/ui/settingsform.py @@ -61,6 +61,7 @@ class SettingsForm(QtWidgets.QDialog, Ui_SettingsDialog, RegistryProperties): self.setting_list_widget.currentRowChanged.connect(self.list_item_changed) self.general_tab = None self.themes_tab = None + self.player_tab = None self.projector_tab = None self.advanced_tab = None self.api_tab = None @@ -79,7 +80,7 @@ class SettingsForm(QtWidgets.QDialog, Ui_SettingsDialog, RegistryProperties): self.insert_tab(self.advanced_tab) self.insert_tab(self.screens_tab) self.insert_tab(self.themes_tab) - if Settings().value('core/experimental'): + if Settings().value('core/experimental') and self.player_tab: self.insert_tab(self.player_tab) self.insert_tab(self.projector_tab) self.insert_tab(self.api_tab) From 468df46c9ced8372286805d2262e0381eff2061c Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 20 Apr 2019 21:29:12 +0100 Subject: [PATCH 02/22] More fixes and corrections --- openlp/core/common/settings.py | 1 + openlp/core/ui/media/mediacontroller.py | 2 +- openlp/core/ui/media/mediatab.py | 42 ++++++++++++++----------- openlp/core/ui/media/vlcplayer.py | 6 ++-- openlp/core/ui/settingsform.py | 10 ++---- openlp/plugins/media/lib/mediaitem.py | 12 +------ 6 files changed, 34 insertions(+), 39 deletions(-) diff --git a/openlp/core/common/settings.py b/openlp/core/common/settings.py index 1b404c543..0d85b9f13 100644 --- a/openlp/core/common/settings.py +++ b/openlp/core/common/settings.py @@ -213,6 +213,7 @@ class Settings(QtCore.QSettings): 'images/background color': '#000000', 'media/media auto start': QtCore.Qt.Unchecked, 'media/stream command': '', + 'media/vlc additions': '', 'remotes/download version': '0.0', 'players/background color': '#000000', 'servicemanager/last directory': None, diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py index aea3ed9c7..12f6c8ba2 100644 --- a/openlp/core/ui/media/mediacontroller.py +++ b/openlp/core/ui/media/mediacontroller.py @@ -124,7 +124,7 @@ class MediaController(RegistryBase, LogMixin, RegistryProperties): self.setup() self.vlc_player = VlcPlayer(self) State().add_service('mediacontroller', 0) - State().add_service('media_live', 0, requires='mediacontroller') + State().add_service('media_live', 0) if get_vlc() and pymediainfo_available: State().update_pre_conditions('mediacontroller', True) State().update_pre_conditions('media_live', True) diff --git a/openlp/core/ui/media/mediatab.py b/openlp/core/ui/media/mediatab.py index cba9bdcd4..25829f476 100644 --- a/openlp/core/ui/media/mediatab.py +++ b/openlp/core/ui/media/mediatab.py @@ -66,7 +66,7 @@ class MediaTab(SettingsTab): 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.setObjectName('live_media_layout') + self.stream_media_layout.setObjectName('stream_media_layout') self.stream_media_layout.setContentsMargins(0, 0, 0, 0) self.stream_edit = QtWidgets.QPlainTextEdit(self) self.stream_media_layout.addWidget(self.stream_edit) @@ -74,7 +74,15 @@ class MediaTab(SettingsTab): self.browse_button.setIcon(UiIcons().undo) self.stream_media_layout.addWidget(self.browse_button) self.left_layout.addWidget(self.stream_media_group_box) - self.left_layout.addWidget(self.stream_media_group_box) + self.vlc_additions_group_box = QtWidgets.QGroupBox(self.left_column) + self.vlc_additions_group_box.setObjectName('vlc_additions_group_box') + self.vlc_additions_layout = QtWidgets.QHBoxLayout(self.vlc_additions_group_box) + self.vlc_additions_layout.setObjectName('vlc_additions_layout') + self.vlc_additions_layout.setContentsMargins(0, 0, 0, 0) + self.vlc_additions_edit = QtWidgets.QPlainTextEdit(self) + self.vlc_additions_layout.addWidget(self.vlc_additions_edit) + self.vlc_additions_layout.addWidget(self.browse_button) + self.left_layout.addWidget(self.vlc_additions_group_box) self.left_layout.addStretch() self.right_layout.addStretch() # # Signals and slots @@ -86,6 +94,7 @@ class MediaTab(SettingsTab): """ self.live_media_group_box.setTitle(translate('MediaPlugin.MediaTab', 'Live Media')) self.stream_media_group_box.setTitle(translate('MediaPlugin.MediaTab', 'Stream Media Command')) + self.vlc_additions_group_box.setTitle(translate('MediaPlugin.MediaTab', 'VLC additional commands')) self.auto_start_check_box.setText(translate('MediaPlugin.MediaTab', 'Start Live items automatically')) def load(self): @@ -101,6 +110,18 @@ class MediaTab(SettingsTab): self.stream_edit.setPlainText(WIN_STREAM) else: self.stream_edit.setPlainText(OSX_STREAM) + self.vlc_additions_edit.setPlainText(Settings().value(self.settings_section + '/vlc additions')) + if Settings().value('core/experimental'): + print('Video input:') + for cam in QCameraInfo.availableCameras(): + print('===============') + print(cam.deviceName()) + print(cam.description()) + print() + print('Audio input:') + for au in QAudioDeviceInfo.availableDevices(QAudio.AudioInput): + print('===============') + print(au.deviceName()) def save(self): """ @@ -110,6 +131,7 @@ class MediaTab(SettingsTab): if Settings().value(setting_key) != self.auto_start_check_box.checkState(): Settings().setValue(setting_key, self.auto_start_check_box.checkState()) Settings().setValue(self.settings_section + '/stream command', self.stream_edit.toPlainText()) + Settings().setValue(self.settings_section + '/vlc additions', self.vlc_additions_edit.toPlainText()) def post_set_up(self, post_update=False): """ @@ -118,22 +140,6 @@ class MediaTab(SettingsTab): :param post_update: Indicates if called before or after updates. """ pass - # for key, player in self.media_players.items(): - # player = self.media_players[key] - # checkbox = MediaQCheckBox(self.media_player_group_box) - # checkbox.setEnabled(player.available) - # checkbox.setObjectName(player.name + '_check_box') - # checkbox.setToolTip(player.get_info()) - # checkbox.set_player_name(player.name) - # self.player_check_boxes[player.name] = checkbox - # checkbox.stateChanged.connect(self.on_player_check_box_changed) - # self.media_player_layout.addWidget(checkbox) - # if player.available and player.name in self.used_players: - # checkbox.setChecked(True) - # else: - # checkbox.setChecked(False) - # self.update_player_list() - # self.retranslate_players() def on_revert(self): pass diff --git a/openlp/core/ui/media/vlcplayer.py b/openlp/core/ui/media/vlcplayer.py index bf2030b9a..f254ebaf9 100644 --- a/openlp/core/ui/media/vlcplayer.py +++ b/openlp/core/ui/media/vlcplayer.py @@ -164,9 +164,11 @@ class VlcPlayer(MediaPlayer): output_display.vlc_widget = QtWidgets.QFrame(output_display) output_display.vlc_widget.setFrameStyle(QtWidgets.QFrame.NoFrame) # creating a basic vlc instance - command_line_options = '--no-video-title-show' + command_line_options = '--no-video-title-show ' if Settings().value('advanced/hide mouse') and live_display: - command_line_options += ' --mouse-hide-timeout=0' + command_line_options += '--mouse-hide-timeout=0 ' + if Settings().value('media/vlc additions'): + command_line_options += Settings().value('media/vlc additions') output_display.vlc_instance = vlc.Instance(command_line_options) # creating an empty vlc media player output_display.vlc_media_player = output_display.vlc_instance.media_player_new() diff --git a/openlp/core/ui/settingsform.py b/openlp/core/ui/settingsform.py index 1d4e58bfe..030054ac5 100644 --- a/openlp/core/ui/settingsform.py +++ b/openlp/core/ui/settingsform.py @@ -30,7 +30,6 @@ from openlp.core.state import State from openlp.core.api.tab import ApiTab from openlp.core.common.mixins import RegistryProperties from openlp.core.common.registry import Registry -from openlp.core.common.settings import Settings from openlp.core.lib import build_icon from openlp.core.projectors.tab import ProjectorTab from openlp.core.ui.advancedtab import AdvancedTab @@ -80,8 +79,7 @@ class SettingsForm(QtWidgets.QDialog, Ui_SettingsDialog, RegistryProperties): self.insert_tab(self.advanced_tab) self.insert_tab(self.screens_tab) self.insert_tab(self.themes_tab) - if Settings().value('core/experimental') and self.player_tab: - self.insert_tab(self.player_tab) + self.insert_tab(self.player_tab) self.insert_tab(self.projector_tab) self.insert_tab(self.api_tab) for plugin in State().list_plugins(): @@ -162,8 +160,7 @@ class SettingsForm(QtWidgets.QDialog, Ui_SettingsDialog, RegistryProperties): self.themes_tab = ThemesTab(self) self.projector_tab = ProjectorTab(self) self.advanced_tab = AdvancedTab(self) - if Settings().value('core/experimental'): - self.player_tab = MediaTab(self) + self.player_tab = MediaTab(self) self.api_tab = ApiTab(self) self.screens_tab = ScreensTab(self) except Exception as e: @@ -171,8 +168,7 @@ class SettingsForm(QtWidgets.QDialog, Ui_SettingsDialog, RegistryProperties): self.general_tab.post_set_up() self.themes_tab.post_set_up() self.advanced_tab.post_set_up() - if Settings().value('core/experimental'): - self.player_tab.post_set_up() + self.player_tab.post_set_up() self.api_tab.post_set_up() for plugin in State().list_plugins(): if plugin.settings_tab: diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index 97ff56c93..588c86a45 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -93,16 +93,6 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties): to another language. """ self.on_new_prompt = translate('MediaPlugin.MediaItem', 'Select Media') - # self.replace_action.setText(UiStrings().ReplaceBG) - # self.replace_action_context.setText(UiStrings().ReplaceBG) - # self.replace_action.setToolTip(UiStrings().ReplaceLiveBGDisabled) - # self.replace_action_context.setToolTip(UiStrings().ReplaceLiveBGDisabled) - # self.reset_action.setText(UiStrings().ResetBG) - # self.reset_action.setToolTip(UiStrings().ResetLiveBG) - # self.reset_action_context.setText(UiStrings().ResetBG) - # self.reset_action_context.setToolTip(UiStrings().ResetLiveBG) - # self.automatic = UiStrings().Automatic - # self.display_type_label.setText(translate('MediaPlugin.MediaItem', 'Use Player:')) def required_icons(self): """ @@ -117,7 +107,7 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties): self.can_make_live = False self.can_add_to_service = False if State().check_preconditions('media_live'): - self.can_make_live = False + self.can_make_live = True def add_list_view_to_toolbar(self): """ From 0088fd4fe2c865b5c792a18af9d68c27250a395f Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 21 Apr 2019 07:25:46 +0100 Subject: [PATCH 03/22] fix image theme editing --- openlp/core/ui/thememanager.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index 4ae79ee6b..4c7d38e1a 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -648,11 +648,6 @@ class ThemeManager(QtWidgets.QWidget, RegistryBase, Ui_ThemeManager, LogMixin, R :rtype: None """ self._write_theme(theme, image_source_path, image_destination_path) - if theme.background_type == BackgroundType.to_string(BackgroundType.Image): - self.image_manager.update_image_border(path_to_str(theme.background_filename), - ImageSource.Theme, - QtGui.QColor(theme.background_border_color)) - self.image_manager.process_updates() def _write_theme(self, theme, image_source_path=None, image_destination_path=None): """ From 607d678780ca7e05e37b3bf134ca2fbd76d9dfeb Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 21 Apr 2019 09:20:43 +0100 Subject: [PATCH 04/22] seek slider works --- openlp/core/ui/media/mediacontroller.py | 3 --- openlp/core/ui/media/mediaplayer.py | 5 +++-- openlp/core/ui/media/vlcplayer.py | 13 +++++++------ openlp/core/ui/slidecontroller.py | 6 ++---- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py index 12f6c8ba2..a916b8cc0 100644 --- a/openlp/core/ui/media/mediacontroller.py +++ b/openlp/core/ui/media/mediacontroller.py @@ -216,9 +216,6 @@ class MediaController(RegistryBase, LogMixin, RegistryProperties): """ # Generic controls controller.mediabar.setVisible(value) - # if controller.is_live and controller.display: - # if self.current_media_players and value: - # controller.display.set_transparency(False) @staticmethod def resize(display, player): diff --git a/openlp/core/ui/media/mediaplayer.py b/openlp/core/ui/media/mediaplayer.py index 36d5ef13f..79d6d529d 100644 --- a/openlp/core/ui/media/mediaplayer.py +++ b/openlp/core/ui/media/mediaplayer.py @@ -139,11 +139,12 @@ class MediaPlayer(RegistryProperties): """ pass - def update_ui(self, display): + def update_ui(self, controller, output_display): """ Do some ui related stuff (e.g. update the seek slider) - :param display: The display to be updated. + :param controller: Which Controller is running the show. + :param output_display: The display where the media is """ pass diff --git a/openlp/core/ui/media/vlcplayer.py b/openlp/core/ui/media/vlcplayer.py index f254ebaf9..3675a0378 100644 --- a/openlp/core/ui/media/vlcplayer.py +++ b/openlp/core/ui/media/vlcplayer.py @@ -226,7 +226,8 @@ class VlcPlayer(MediaPlayer): return False output_display.vlc_media = audio_cd_tracks.item_at_index(controller.media_info.title_track) elif controller.media_info.media_type == MediaType.Stream: - output_display.vlc_media = output_display.vlc_instance.media_new_location('ZZZZZZ') + stream_cmd = Settings().value('media/stream command') + output_display.vlc_media = output_display.vlc_instance.media_new_location(stream_cmd) else: output_display.vlc_media = output_display.vlc_instance.media_new_path(path) # put the media in the media player @@ -242,7 +243,7 @@ class VlcPlayer(MediaPlayer): Wait no longer than 60 seconds. (loading an iso file needs a long time) :param media_state: The state of the playing media - :param display: The display where the media is + :param output_display: The display where the media is :return: """ vlc = get_vlc() @@ -316,7 +317,7 @@ class VlcPlayer(MediaPlayer): self.volume(output_display, output_display.media_info.volume) if start_time > 0 and output_display.vlc_media_player.is_seekable(): output_display.vlc_media_player.set_time(int(start_time)) - controller.seek_slider.setMaximum(output_display.media_info.length) + controller.seek_slider.setMaximum(controller.media_info.length) self.set_state(MediaState.Playing, output_display) output_display.vlc_widget.raise_() return True @@ -363,9 +364,9 @@ class VlcPlayer(MediaPlayer): :param seek_value: The position of where a seek goes to :param output_display: The display where the media is """ - if output_display.controller.media_info.media_type == MediaType.CD \ - or output_display.controller.media_info.media_type == MediaType.DVD: - seek_value += int(output_display.controller.media_info.start_time) + if output_display.media_info.media_type == MediaType.CD \ + or output_display.media_info.media_type == MediaType.DVD: + seek_value += int(output_display.media_info.start_time) if output_display.vlc_media_player.is_seekable(): output_display.vlc_media_player.set_time(seek_value) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 146c060f6..86ceef5d2 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -112,7 +112,7 @@ class MediaSlider(QtWidgets.QSlider): class InfoLabel(QtWidgets.QLabel): """ - InfoLabel is a subclassed QLabel. Created to provide the ablilty to add a ellipsis if the text is cut off. Original + InfoLabel is a subclassed QLabel. Created to provide the ability to add a ellipsis if the text is cut off. Original source: https://stackoverflow.com/questions/11446478/pyside-pyqt-truncate-text-in-qlabel-based-on-minimumsize """ @@ -177,7 +177,6 @@ class SlideController(QtWidgets.QWidget, LogMixin, RegistryProperties): if screen.is_display: display = DisplayWindow(self, screen) self.displays.append(display) - # display.media_watcher.progress.connect(self.on_audio_time_remaining) @property def display(self): @@ -381,7 +380,7 @@ class SlideController(QtWidgets.QWidget, LogMixin, RegistryProperties): self.position_label.setMinimumSize(90, 0) self.position_label.setObjectName('position_label') self.mediabar.add_toolbar_widget(self.position_label) - # Build the seek_slider. + # Build the media seek_slider. self.seek_slider = MediaSlider(QtCore.Qt.Horizontal, self, self) self.seek_slider.setMaximum(1000) self.seek_slider.setTracking(True) @@ -398,7 +397,6 @@ class SlideController(QtWidgets.QWidget, LogMixin, RegistryProperties): self.volume_slider.setMaximum(100) self.volume_slider.setTracking(True) self.volume_slider.setToolTip(translate('OpenLP.SlideController', 'Audio Volume.')) - # self.volume_slider.setValue(self.media_info.volume) self.volume_slider.setGeometry(QtCore.QRect(90, 160, 221, 24)) self.volume_slider.setObjectName('volume_slider') self.mediabar.add_toolbar_widget(self.volume_slider) From e607a95b866839d693a5ba6a0953f5f7a93354ef Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 21 Apr 2019 09:53:59 +0100 Subject: [PATCH 05/22] Fix tests --- .../openlp_core/ui/media/test_vlcplayer.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/tests/functional/openlp_core/ui/media/test_vlcplayer.py b/tests/functional/openlp_core/ui/media/test_vlcplayer.py index 1ae05da52..9fd111748 100644 --- a/tests/functional/openlp_core/ui/media/test_vlcplayer.py +++ b/tests/functional/openlp_core/ui/media/test_vlcplayer.py @@ -126,7 +126,7 @@ class TestVLCPlayer(TestCase, TestMixin): mocked_is_macosx.return_value = False mocked_is_win.return_value = False mocked_settings = MagicMock() - mocked_settings.value.return_value = True + mocked_settings.value.return_value = '' MockedSettings.return_value = mocked_settings mocked_qframe = MagicMock() mocked_qframe.winId.return_value = 2 @@ -150,8 +150,9 @@ class TestVLCPlayer(TestCase, TestMixin): # THEN: The VLC widget should be set up correctly assert mocked_output_display.vlc_widget == mocked_qframe mocked_qframe.setFrameStyle.assert_called_with(1) - mocked_settings.value.assert_called_with('advanced/hide mouse') - mocked_vlc.Instance.assert_called_with('--no-video-title-show --mouse-hide-timeout=0') + mocked_settings.value.assert_any_call('advanced/hide mouse') + mocked_settings.value.assert_any_call('media/vlc additions') + mocked_vlc.Instance.assert_called_with('--no-video-title-show ') assert mocked_output_display.vlc_instance == mocked_instance mocked_instance.media_player_new.assert_called_with() assert mocked_output_display.vlc_media_player == mocked_media_player_new @@ -175,7 +176,7 @@ class TestVLCPlayer(TestCase, TestMixin): mocked_is_macosx.return_value = False mocked_is_win.return_value = False mocked_settings = MagicMock() - mocked_settings.value.return_value = True + mocked_settings.value.return_value = '' MockedSettings.return_value = mocked_settings mocked_qframe = MagicMock() mocked_qframe.winId.return_value = 2 @@ -197,7 +198,7 @@ class TestVLCPlayer(TestCase, TestMixin): vlc_player.setup(mocked_output_display, mocked_controller) # THEN: The VLC instance should be created with the correct options - mocked_vlc.Instance.assert_called_with('--no-video-title-show --mouse-hide-timeout=0') + mocked_vlc.Instance.assert_called_with('--no-video-title-show ') @patch('openlp.core.ui.media.vlcplayer.is_win') @patch('openlp.core.ui.media.vlcplayer.is_macosx') @@ -213,7 +214,7 @@ class TestVLCPlayer(TestCase, TestMixin): mocked_is_macosx.return_value = False mocked_is_win.return_value = False mocked_settings = MagicMock() - mocked_settings.value.return_value = False + mocked_settings.value.return_value = '' MockedSettings.return_value = mocked_settings mocked_qframe = MagicMock() mocked_qframe.winId.return_value = 2 @@ -235,7 +236,7 @@ class TestVLCPlayer(TestCase, TestMixin): vlc_player.setup(mocked_output_display, mocked_controller) # THEN: The VLC instance should be created with the correct options - mocked_vlc.Instance.assert_called_with('--no-video-title-show') + mocked_vlc.Instance.assert_called_with('--no-video-title-show ') @patch('openlp.core.ui.media.vlcplayer.is_win') @patch('openlp.core.ui.media.vlcplayer.is_macosx') @@ -863,7 +864,7 @@ class TestVLCPlayer(TestCase, TestMixin): # THEN: nothing should happen mocked_display.vlc_media_player.is_seekable.assert_called_with() - mocked_display.vlc_media_player.set_time.assert_called_with(5000) + mocked_display.vlc_media_player.set_time.assert_called_with(2000) def test_reset(self): """ From 656c1d3bfc30fc884bc02d16d1e3ec3bdf97493f Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 21 Apr 2019 13:48:23 +0100 Subject: [PATCH 06/22] fix pep8 --- openlp/core/ui/thememanager.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index 4c7d38e1a..7ccb65942 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -26,19 +26,18 @@ import os import zipfile from xml.etree.ElementTree import XML, ElementTree -from PyQt5 import QtCore, QtGui, QtWidgets +from PyQt5 import QtCore, QtWidgets from openlp.core.common import delete_file from openlp.core.common.applocation import AppLocation from openlp.core.common.i18n import UiStrings, get_locale_key, translate from openlp.core.common.mixins import LogMixin, RegistryProperties -from openlp.core.common.path import Path, copyfile, create_paths, path_to_str +from openlp.core.common.path import Path, copyfile, create_paths from openlp.core.common.registry import Registry, RegistryBase from openlp.core.common.settings import Settings -from openlp.core.lib import ImageSource, build_icon, check_item_selected, create_thumb, get_text_file_string, \ - validate_thumb +from openlp.core.lib import build_icon, check_item_selected, create_thumb, get_text_file_string, validate_thumb from openlp.core.lib.exceptions import ValidationError -from openlp.core.lib.theme import BackgroundType, Theme +from openlp.core.lib.theme import Theme from openlp.core.lib.ui import create_widget_action, critical_error_message_box from openlp.core.ui.filerenameform import FileRenameForm from openlp.core.ui.icons import UiIcons From 56722b272975a7cc231a64428f8f4a612ff33e58 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 27 Apr 2019 16:12:24 +0100 Subject: [PATCH 07/22] updates --- openlp/core/common/settings.py | 2 +- openlp/core/ui/advancedtab.py | 7 +++++++ openlp/core/ui/generaltab.py | 7 ------- openlp/core/ui/media/mediatab.py | 16 +++++++--------- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/openlp/core/common/settings.py b/openlp/core/common/settings.py index 0d85b9f13..b50e58633 100644 --- a/openlp/core/common/settings.py +++ b/openlp/core/common/settings.py @@ -188,7 +188,7 @@ class Settings(QtCore.QSettings): 'core/click live slide to unblank': False, 'core/blank warning': False, 'core/ccli number': '', - 'core/experimental': False, + 'advanced/experimental': False, 'core/has run wizard': False, 'core/language': '[en]', 'core/last version test': '', diff --git a/openlp/core/ui/advancedtab.py b/openlp/core/ui/advancedtab.py index e4bc18703..1d481ad81 100644 --- a/openlp/core/ui/advancedtab.py +++ b/openlp/core/ui/advancedtab.py @@ -117,6 +117,9 @@ class AdvancedTab(SettingsTab): self.enable_auto_close_check_box = QtWidgets.QCheckBox(self.ui_group_box) self.enable_auto_close_check_box.setObjectName('enable_auto_close_check_box') self.ui_layout.addRow(self.enable_auto_close_check_box) + self.experimental_check_box = QtWidgets.QCheckBox(self.ui_group_box) + self.experimental_check_box.setObjectName('experimental_check_box') + self.ui_layout.addRow(self.experimental_check_box) self.left_layout.addWidget(self.ui_group_box) if HAS_DARK_STYLE: self.use_dark_style_checkbox = QtWidgets.QCheckBox(self.ui_group_box) @@ -291,6 +294,8 @@ class AdvancedTab(SettingsTab): 'Auto-scroll the next slide to bottom')) self.enable_auto_close_check_box.setText(translate('OpenLP.AdvancedTab', 'Enable application exit confirmation')) + self.experimental_check_box.setText(translate('OpenLP.GeneralTab', + 'Experimental features (use at your own risk)')) if HAS_DARK_STYLE: self.use_dark_style_checkbox.setText(translate('OpenLP.AdvancedTab', 'Use dark style (needs restart)')) self.service_name_group_box.setTitle(translate('OpenLP.AdvancedTab', 'Default Service Name')) @@ -360,6 +365,7 @@ class AdvancedTab(SettingsTab): if self.autoscroll_map[i] == autoscroll_value and i < self.autoscroll_combo_box.count(): self.autoscroll_combo_box.setCurrentIndex(i) self.enable_auto_close_check_box.setChecked(settings.value('enable exit confirmation')) + self.experimental_check_box.setChecked(settings.value('experimental')) if HAS_DARK_STYLE: self.use_dark_style_checkbox.setChecked(settings.value('use_dark_style')) self.hide_mouse_check_box.setChecked(settings.value('hide mouse')) @@ -423,6 +429,7 @@ class AdvancedTab(SettingsTab): slide_max_height_value = self.slide_max_height_combo_box.itemData(slide_max_height_index) settings.setValue('slide max height', slide_max_height_value) settings.setValue('autoscrolling', self.autoscroll_map[self.autoscroll_combo_box.currentIndex()]) + settings.setValue('experimental', self.experimental_check_box.isChecked()) settings.setValue('enable exit confirmation', self.enable_auto_close_check_box.isChecked()) settings.setValue('hide mouse', self.hide_mouse_check_box.isChecked()) settings.setValue('alternate rows', self.alternate_rows_check_box.isChecked()) diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py index a9d1873dd..2a81820af 100644 --- a/openlp/core/ui/generaltab.py +++ b/openlp/core/ui/generaltab.py @@ -113,9 +113,6 @@ class GeneralTab(SettingsTab): self.check_for_updates_check_box = QtWidgets.QCheckBox(self.startup_group_box) self.check_for_updates_check_box.setObjectName('check_for_updates_check_box') self.startup_layout.addWidget(self.check_for_updates_check_box) - self.experimental_check_box = QtWidgets.QCheckBox(self.startup_group_box) - self.experimental_check_box.setObjectName('experimental_check_box') - self.startup_layout.addWidget(self.experimental_check_box) self.right_layout.addWidget(self.startup_group_box) # Logo self.logo_group_box = QtWidgets.QGroupBox(self.right_column) @@ -183,8 +180,6 @@ class GeneralTab(SettingsTab): self.logo_file_label.setText(translate('OpenLP.GeneralTab', 'Logo file:')) self.logo_hide_on_startup_check_box.setText(translate('OpenLP.GeneralTab', 'Don\'t show logo on startup')) self.check_for_updates_check_box.setText(translate('OpenLP.GeneralTab', 'Check for updates to OpenLP')) - self.experimental_check_box.setText(translate('OpenLP.GeneralTab', - 'Experimental features (use at your own risk)')) self.settings_group_box.setTitle(translate('OpenLP.GeneralTab', 'Application Settings')) self.save_check_service_check_box.setText(translate('OpenLP.GeneralTab', 'Prompt to save before starting a new service')) @@ -227,7 +222,6 @@ class GeneralTab(SettingsTab): self.logo_hide_on_startup_check_box.setChecked(settings.value('logo hide on startup')) self.logo_color_button.color = self.logo_background_color self.check_for_updates_check_box.setChecked(settings.value('update check')) - self.experimental_check_box.setChecked(settings.value('experimental')) self.auto_preview_check_box.setChecked(settings.value('auto preview')) self.timeout_spin_box.setValue(settings.value('loop delay')) self.start_paused_check_box.setChecked(settings.value('audio start paused')) @@ -247,7 +241,6 @@ class GeneralTab(SettingsTab): settings.setValue('logo file', self.logo_file_path_edit.path) settings.setValue('logo hide on startup', self.logo_hide_on_startup_check_box.isChecked()) settings.setValue('update check', self.check_for_updates_check_box.isChecked()) - settings.setValue('experimental', self.experimental_check_box.isChecked()) settings.setValue('save prompt', self.save_check_service_check_box.isChecked()) settings.setValue('auto unblank', self.auto_unblank_check_box.isChecked()) settings.setValue('click live slide to unblank', self.click_live_slide_to_unblank_check_box.isChecked()) diff --git a/openlp/core/ui/media/mediatab.py b/openlp/core/ui/media/mediatab.py index 25829f476..b0c5700b1 100644 --- a/openlp/core/ui/media/mediatab.py +++ b/openlp/core/ui/media/mediatab.py @@ -22,6 +22,7 @@ """ The :mod:`~openlp.core.ui.media.mediatab` module holds the configuration tab for the media stuff. """ +import logging from PyQt5 import QtWidgets from PyQt5.QtMultimedia import QCameraInfo, QAudioDeviceInfo, QAudio @@ -36,6 +37,8 @@ LINUX_STREAM = 'v4l2://{video} :v4l2-standard= :input-slave={audio} :live-cachin WIN_STREAM = 'dshow://:dshow-vdev={video} :dshow-adev={audio} :live-caching=300' OSX_STREAM = 'avcapture://{video} :qtsound://{audio} :live-caching=300' +log = logging.getLogger(__name__) + class MediaTab(SettingsTab): """ @@ -111,17 +114,12 @@ class MediaTab(SettingsTab): else: self.stream_edit.setPlainText(OSX_STREAM) self.vlc_additions_edit.setPlainText(Settings().value(self.settings_section + '/vlc additions')) - if Settings().value('core/experimental'): - print('Video input:') + if Settings().value('advanced/experimental'): for cam in QCameraInfo.availableCameras(): - print('===============') - print(cam.deviceName()) - print(cam.description()) - print() - print('Audio input:') + log.debug(cam.deviceName()) + log.debug(cam.description()) for au in QAudioDeviceInfo.availableDevices(QAudio.AudioInput): - print('===============') - print(au.deviceName()) + log.debug(au.deviceName()) def save(self): """ From 50e2c6e5e99e9b384bd571090a963c0936c275d9 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 3 May 2019 18:25:27 +0100 Subject: [PATCH 08/22] updates --- openlp/core/common/settings.py | 6 +++--- openlp/core/ui/generaltab.py | 20 +------------------- openlp/core/ui/media/mediatab.py | 19 +++++++------------ 3 files changed, 11 insertions(+), 34 deletions(-) diff --git a/openlp/core/common/settings.py b/openlp/core/common/settings.py index b50e58633..ea54f1182 100644 --- a/openlp/core/common/settings.py +++ b/openlp/core/common/settings.py @@ -180,10 +180,8 @@ class Settings(QtCore.QSettings): 'api/thumbnails': True, 'crashreport/last directory': None, 'formattingTags/html_tags': '', - 'core/audio repeat list': False, 'core/auto open': False, 'core/auto preview': False, - 'core/audio start paused': True, 'core/auto unblank': False, 'core/click live slide to unblank': False, 'core/blank warning': False, @@ -318,7 +316,9 @@ class Settings(QtCore.QSettings): ('bibles/proxy username', '', []), ('bibles/proxy password', '', []), ('media/players', '', []), - ('media/override player', '', []) + ('media/override player', '', []), + ('core/audio start paused', '', []), + ('core/audio repeat list', '', []) ] @staticmethod diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py index 2a81820af..0e457b362 100644 --- a/openlp/core/ui/generaltab.py +++ b/openlp/core/ui/generaltab.py @@ -83,18 +83,6 @@ class GeneralTab(SettingsTab): self.password_edit.setObjectName('password_edit') self.ccli_layout.addRow(self.password_label, self.password_edit) self.left_layout.addWidget(self.ccli_group_box) - # Background audio - self.audio_group_box = QtWidgets.QGroupBox(self.left_column) - self.audio_group_box.setObjectName('audio_group_box') - self.audio_layout = QtWidgets.QVBoxLayout(self.audio_group_box) - self.audio_layout.setObjectName('audio_layout') - self.start_paused_check_box = QtWidgets.QCheckBox(self.audio_group_box) - self.start_paused_check_box.setObjectName('start_paused_check_box') - self.audio_layout.addWidget(self.start_paused_check_box) - self.repeat_list_check_box = QtWidgets.QCheckBox(self.audio_group_box) - self.repeat_list_check_box.setObjectName('repeat_list_check_box') - self.audio_layout.addWidget(self.repeat_list_check_box) - self.left_layout.addWidget(self.audio_group_box) self.left_layout.addStretch() # Application Startup self.startup_group_box = QtWidgets.QGroupBox(self.right_column) @@ -195,9 +183,7 @@ class GeneralTab(SettingsTab): self.number_label.setText(UiStrings().CCLINumberLabel) self.username_label.setText(translate('OpenLP.GeneralTab', 'SongSelect username:')) self.password_label.setText(translate('OpenLP.GeneralTab', 'SongSelect password:')) - self.audio_group_box.setTitle(translate('OpenLP.GeneralTab', 'Background Audio')) - self.start_paused_check_box.setText(translate('OpenLP.GeneralTab', 'Start background audio paused')) - self.repeat_list_check_box.setText(translate('OpenLP.GeneralTab', 'Repeat track list')) + self.logo_file_path_edit.dialog_caption = translate('OpenLP.AdvancedTab', 'Select Logo File') self.logo_file_path_edit.dialog_caption = translate('OpenLP.AdvancedTab', 'Select Logo File') self.logo_file_path_edit.filters = '{text};;{names} (*)'.format( text=get_images_filter(), names=UiStrings().AllFiles) @@ -224,8 +210,6 @@ class GeneralTab(SettingsTab): self.check_for_updates_check_box.setChecked(settings.value('update check')) self.auto_preview_check_box.setChecked(settings.value('auto preview')) self.timeout_spin_box.setValue(settings.value('loop delay')) - self.start_paused_check_box.setChecked(settings.value('audio start paused')) - self.repeat_list_check_box.setChecked(settings.value('audio repeat list')) settings.endGroup() def save(self): @@ -249,8 +233,6 @@ class GeneralTab(SettingsTab): settings.setValue('ccli number', self.number_edit.displayText()) settings.setValue('songselect username', self.username_edit.displayText()) settings.setValue('songselect password', self.password_edit.displayText()) - settings.setValue('audio start paused', self.start_paused_check_box.isChecked()) - settings.setValue('audio repeat list', self.repeat_list_check_box.isChecked()) settings.endGroup() self.post_set_up() diff --git a/openlp/core/ui/media/mediatab.py b/openlp/core/ui/media/mediatab.py index b0c5700b1..327c77f22 100644 --- a/openlp/core/ui/media/mediatab.py +++ b/openlp/core/ui/media/mediatab.py @@ -71,11 +71,8 @@ class MediaTab(SettingsTab): self.stream_media_layout = QtWidgets.QHBoxLayout(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.QPlainTextEdit(self) + self.stream_edit = QtWidgets.QLabel(self) self.stream_media_layout.addWidget(self.stream_edit) - self.browse_button = QtWidgets.QToolButton(self) - self.browse_button.setIcon(UiIcons().undo) - self.stream_media_layout.addWidget(self.browse_button) self.left_layout.addWidget(self.stream_media_group_box) self.vlc_additions_group_box = QtWidgets.QGroupBox(self.left_column) self.vlc_additions_group_box.setObjectName('vlc_additions_group_box') @@ -84,12 +81,10 @@ class MediaTab(SettingsTab): self.vlc_additions_layout.setContentsMargins(0, 0, 0, 0) self.vlc_additions_edit = QtWidgets.QPlainTextEdit(self) self.vlc_additions_layout.addWidget(self.vlc_additions_edit) - self.vlc_additions_layout.addWidget(self.browse_button) self.left_layout.addWidget(self.vlc_additions_group_box) self.left_layout.addStretch() self.right_layout.addStretch() # # Signals and slots - self.browse_button.clicked.connect(self.on_revert) def retranslate_ui(self): """ @@ -105,14 +100,14 @@ class MediaTab(SettingsTab): Load the settings """ self.auto_start_check_box.setChecked(Settings().value(self.settings_section + '/media auto start')) - self.stream_edit.setPlainText(Settings().value(self.settings_section + '/stream command')) - if not self.stream_edit.toPlainText(): + self.stream_edit.setText(Settings().value(self.settings_section + '/stream command')) + if not self.stream_edit.text(): if is_linux: - self.stream_edit.setPlainText(LINUX_STREAM) + self.stream_edit.setText(LINUX_STREAM) elif is_win: - self.stream_edit.setPlainText(WIN_STREAM) + self.stream_edit.setText(WIN_STREAM) else: - self.stream_edit.setPlainText(OSX_STREAM) + self.stream_edit.setText(OSX_STREAM) self.vlc_additions_edit.setPlainText(Settings().value(self.settings_section + '/vlc additions')) if Settings().value('advanced/experimental'): for cam in QCameraInfo.availableCameras(): @@ -128,7 +123,7 @@ class MediaTab(SettingsTab): setting_key = self.settings_section + '/media auto start' if Settings().value(setting_key) != self.auto_start_check_box.checkState(): Settings().setValue(setting_key, self.auto_start_check_box.checkState()) - Settings().setValue(self.settings_section + '/stream command', self.stream_edit.toPlainText()) + Settings().setValue(self.settings_section + '/stream command', self.stream_edit.text()) Settings().setValue(self.settings_section + '/vlc additions', self.vlc_additions_edit.toPlainText()) def post_set_up(self, post_update=False): From 15f3b0fccabf46384a223897165fde8ffb3f460c Mon Sep 17 00:00:00 2001 From: Phill Date: Sat, 4 May 2019 10:13:29 +0100 Subject: [PATCH 09/22] Seperate some fixes out of annother branch --- openlp/core/app.py | 18 +++++------ openlp/core/common/__init__.py | 4 +-- openlp/core/display/window.py | 2 +- openlp/core/lib/theme.py | 2 +- openlp/core/server.py | 3 +- openlp/core/ui/firsttimewizard.py | 2 +- openlp/core/ui/mainwindow.py | 19 ++++++----- openlp/core/ui/servicemanager.py | 32 ++++++++++++------- openlp/core/ui/slidecontroller.py | 2 +- openlp/core/widgets/dialogs.py | 2 +- openlp/core/widgets/layouts.py | 2 +- openlp/core/widgets/views.py | 6 ++-- .../plugins/bibles/lib/importers/csvbible.py | 2 +- openlp/plugins/images/lib/mediaitem.py | 3 +- .../lib/importers/presentationmanager.py | 2 +- .../plugins/songs/lib/importers/songbeamer.py | 2 +- .../songs/lib/importers/worshipassistant.py | 2 +- .../openlp_core/common/test_init.py | 6 ++-- .../openlp_core/ui/test_mainwindow.py | 1 - 19 files changed, 58 insertions(+), 54 deletions(-) diff --git a/openlp/core/app.py b/openlp/core/app.py index dfb413caa..ab738e1a2 100644 --- a/openlp/core/app.py +++ b/openlp/core/app.py @@ -287,12 +287,12 @@ class OpenLP(QtWidgets.QApplication): return QtWidgets.QApplication.event(self, event) -def parse_options(args=None): +def parse_options(): """ Parse the command line arguments - :param args: list of command line arguments - :return: a tuple of parsed options of type optparse.Value and a list of remaining argsZ + :return: An :object:`argparse.Namespace` insatnce containing the parsed args. + :rtype: argparse.Namespace """ # Set up command line options. parser = argparse.ArgumentParser(prog='openlp') @@ -307,9 +307,9 @@ def parse_options(args=None): dir_name=os.path.join('', '..', '..'))) parser.add_argument('-w', '--no-web-server', dest='no_web_server', action='store_true', help='Turn off the Web and Socket Server ') - parser.add_argument('rargs', nargs='?', default=[]) - # Parse command line options and deal with them. Use args supplied pragmatically if possible. - return parser.parse_args(args) if args else parser.parse_args() + parser.add_argument('rargs', nargs='*', default=[]) + # Parse command line options and deal with them. + return parser.parse_args() def set_up_logging(log_path): @@ -328,13 +328,11 @@ def set_up_logging(log_path): print('Logging to: {name}'.format(name=file_path)) -def main(args=None): +def main(): """ The main function which parses command line options and then runs - - :param args: Some args """ - args = parse_options(args) + args = parse_options() qt_args = ['--disable-web-security'] # qt_args = [] if args and args.loglevel.lower() in ['d', 'debug']: diff --git a/openlp/core/common/__init__.py b/openlp/core/common/__init__.py index dfed903c7..fd251be14 100644 --- a/openlp/core/common/__init__.py +++ b/openlp/core/common/__init__.py @@ -134,8 +134,8 @@ def extension_loader(glob_pattern, excluded_files=[]): importlib.import_module(module_name) except (ImportError, OSError): # On some platforms importing vlc.py might cause OSError exceptions. (e.g. Mac OS X) - log.warning('Failed to import {module_name} on path {extension_path}' - .format(module_name=module_name, extension_path=extension_path)) + log.exception('Failed to import {module_name} on path {extension_path}' + .format(module_name=module_name, extension_path=extension_path)) def path_to_module(path): diff --git a/openlp/core/display/window.py b/openlp/core/display/window.py index 6b2e9af1b..161b49981 100644 --- a/openlp/core/display/window.py +++ b/openlp/core/display/window.py @@ -180,7 +180,7 @@ class DisplayWindow(QtWidgets.QWidget): """ Set the URL of the webview - :param str url: The URL to set + :param QtCore.QUrl | str url: The URL to set """ if not isinstance(url, QtCore.QUrl): url = QtCore.QUrl(url) diff --git a/openlp/core/lib/theme.py b/openlp/core/lib/theme.py index 4bc145c72..f770b7487 100644 --- a/openlp/core/lib/theme.py +++ b/openlp/core/lib/theme.py @@ -333,7 +333,7 @@ class Theme(object): else: # make string value unicode if not isinstance(value, str): - value = str(str(value), 'utf-8') + value = str(value, 'utf-8') # None means an empty string so lets have one. if value == 'None': value = '' diff --git a/openlp/core/server.py b/openlp/core/server.py index 7c7842853..33c024254 100644 --- a/openlp/core/server.py +++ b/openlp/core/server.py @@ -22,6 +22,7 @@ from PyQt5 import QtCore, QtNetwork from openlp.core.common.mixins import LogMixin +from openlp.core.common.path import Path from openlp.core.common.registry import Registry @@ -97,7 +98,7 @@ class Server(QtCore.QObject, LogMixin): msg = self.in_stream.readLine() if msg: self.log_debug("socket msg = " + msg) - Registry().get('service_manager').on_load_service_clicked(msg) + Registry().get('service_manager').load_service(Path(msg)) def close_server(self): """ diff --git a/openlp/core/ui/firsttimewizard.py b/openlp/core/ui/firsttimewizard.py index 87b044ac0..8cb967a54 100644 --- a/openlp/core/ui/firsttimewizard.py +++ b/openlp/core/ui/firsttimewizard.py @@ -78,7 +78,7 @@ class ThemeListWidget(QtWidgets.QListWidget): """ nominal_width = 141 # Icon width of 133 + 4 each side max_items_per_row = self.viewport().width() // nominal_width or 1 # or 1 to avoid divide by 0 errors - col_size = (self.viewport().width() - 1) / max_items_per_row + col_size = (self.viewport().width() - 1) // max_items_per_row self.setGridSize(QtCore.QSize(col_size, 140)) diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 3443185ae..703bdc943 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -22,7 +22,7 @@ """ This is the main window, where all the action happens. """ -import sys +import os from datetime import datetime from distutils import dir_util from distutils.errors import DistutilsFileError @@ -475,7 +475,6 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, LogMixin, RegistryPropert super(MainWindow, self).__init__() Registry().register('main_window', self) self.clipboard = self.application.clipboard() - self.arguments = ''.join(self.application.args) # Set up settings sections for the main application (not for use by plugins). self.ui_settings_section = 'user interface' self.general_settings_section = 'core' @@ -632,8 +631,8 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, LogMixin, RegistryPropert # if self.live_controller.display.isVisible(): # self.live_controller.display.setFocus() self.activateWindow() - if self.arguments: - self.open_cmd_line_files(self.arguments) + if self.application.args: + self.open_cmd_line_files(self.application.args) elif Settings().value(self.general_settings_section + '/auto open'): self.service_manager_contents.load_last_file() # This will store currently used layout preset so it remains enabled on next startup. @@ -1339,7 +1338,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, LogMixin, RegistryPropert self.application.set_normal_cursor() self.log_exception('Data copy failed {err}'.format(err=str(why))) err_text = translate('OpenLP.MainWindow', - 'OpenLP Data directory copy failed\n\n{err}').format(err=str(why)), + 'OpenLP Data directory copy failed\n\n{err}').format(err=str(why)) QtWidgets.QMessageBox.critical(self, translate('OpenLP.MainWindow', 'New Data Directory Error'), err_text, QtWidgets.QMessageBox.StandardButtons(QtWidgets.QMessageBox.Ok)) @@ -1354,11 +1353,11 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, LogMixin, RegistryPropert settings.remove('advanced/data path') self.application.set_normal_cursor() - def open_cmd_line_files(self, filename): + def open_cmd_line_files(self, args): """ Open files passed in through command line arguments """ - if not isinstance(filename, str): - filename = str(filename, sys.getfilesystemencoding()) - if filename.endswith(('.osz', '.oszl')): - self.service_manager_contents.load_file(Path(filename)) + for arg in args: + file_name = os.path.expanduser(arg) + if os.path.isfile(file_name): + self.service_manager_contents.load_file(Path(file_name)) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 9303dae35..3858e1f48 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -430,11 +430,20 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi return False self.new_file() - def on_load_service_clicked(self, load_file=None): + def on_load_service_clicked(self, checked): + """ + Handle the `fileOpenItem` action + + :param bool checked: Not used. + :rtype: None + """ + self.load_service() + + def load_service(self, file_path=None): """ Loads the service file and saves the existing one it there is one unchanged. - :param load_file: The service file to the loaded. Will be None is from menu so selection will be required. + :param openlp.core.common.path.Path | None file_path: The service file to the loaded. """ if self.is_modified(): result = self.save_modified_service() @@ -442,7 +451,7 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi return False elif result == QtWidgets.QMessageBox.Save: self.decide_save_method() - if not load_file: + if not file_path: file_path, filter_used = FileDialog.getOpenFileName( self.main_window, translate('OpenLP.ServiceManager', 'Open File'), @@ -450,8 +459,6 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi translate('OpenLP.ServiceManager', 'OpenLP Service Files (*.osz *.oszl)')) if not file_path: return False - else: - file_path = str_to_path(load_file) Settings().setValue(self.main_window.service_manager_settings_section + '/last directory', file_path.parent) self.load_file(file_path) @@ -670,8 +677,9 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi def load_file(self, file_path): """ - Load an existing service file - :param file_path: + Load an existing service file. + + :param openlp.core.common.path.Path file_path: The service file to load. """ if not file_path.exists(): return False @@ -1520,12 +1528,12 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi event.setDropAction(QtCore.Qt.CopyAction) event.accept() for url in link.urls(): - file_name = url.toLocalFile() - if file_name.endswith('.osz'): - self.on_load_service_clicked(file_name) - elif file_name.endswith('.oszl'): + file_path = Path(url.toLocalFile()) + if file_path.suffix == '.osz': + self.load_service(file_path) + elif file_path.suffix == '.oszl': # todo correct - self.on_load_service_clicked(file_name) + self.load_service(file_path) elif link.hasText(): plugin = link.text() item = self.service_manager_list.itemAt(event.pos()) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index b5855d3d3..437dbf88c 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -112,7 +112,7 @@ class MediaSlider(QtWidgets.QSlider): class InfoLabel(QtWidgets.QLabel): """ - InfoLabel is a subclassed QLabel. Created to provide the ablilty to add a ellipsis if the text is cut off. Original + InfoLabel is a subclassed QLabel. Created to provide the ability to add a ellipsis if the text is cut off. Original source: https://stackoverflow.com/questions/11446478/pyside-pyqt-truncate-text-in-qlabel-based-on-minimumsize """ diff --git a/openlp/core/widgets/dialogs.py b/openlp/core/widgets/dialogs.py index 7668dcab8..11083f393 100755 --- a/openlp/core/widgets/dialogs.py +++ b/openlp/core/widgets/dialogs.py @@ -35,7 +35,7 @@ class FileDialog(QtWidgets.QFileDialog): :type caption: str :type directory: openlp.core.common.path.Path :type options: QtWidgets.QFileDialog.Options - :rtype: tuple[openlp.core.common.path.Path, str] + :rtype: openlp.core.common.path.Path """ args, kwargs = replace_params(args, kwargs, ((2, 'directory', path_to_str),)) diff --git a/openlp/core/widgets/layouts.py b/openlp/core/widgets/layouts.py index 65c61e266..0b46bf3f6 100644 --- a/openlp/core/widgets/layouts.py +++ b/openlp/core/widgets/layouts.py @@ -37,7 +37,7 @@ class AspectRatioLayout(QtWidgets.QLayout): """ Create a layout. - :param PyQt5.QtWidgets.QWidget parent: The parent widget, can be None. + :param QtWidgets.QWidget | None parent: The parent widget :param float aspect_ratio: The aspect ratio as a float (e.g. 16.0/9.0) """ super().__init__(parent) diff --git a/openlp/core/widgets/views.py b/openlp/core/widgets/views.py index 68422e1b4..dbe7c2be6 100644 --- a/openlp/core/widgets/views.py +++ b/openlp/core/widgets/views.py @@ -39,7 +39,7 @@ def handle_mime_data_urls(mime_data): """ Process the data from a drag and drop operation. - :param PyQt5.QtCore.QMimeData mime_data: The mime data from the drag and drop opperation. + :param QtCore.QMimeData mime_data: The mime data from the drag and drop opperation. :return: A list of file paths that were dropped :rtype: list[openlp.core.common.path.Path] """ @@ -297,7 +297,7 @@ class ListWidgetWithDnD(QtWidgets.QListWidget): """ self.setAcceptDrops(True) self.setDragDropMode(QtWidgets.QAbstractItemView.DragDrop) - Registry().register_function(('%s_dnd' % self.mime_data_text), self.parent().load_file) + Registry().register_function(('%s_dnd' % self.mime_data_text), self.parent().handle_mime_data) def clear(self, search_while_typing=False): """ @@ -412,7 +412,7 @@ class TreeWidgetWithDnD(QtWidgets.QTreeWidget): """ self.setAcceptDrops(True) self.setDragDropMode(QtWidgets.QAbstractItemView.DragDrop) - Registry().register_function(('%s_dnd' % self.mime_data_text), self.parent().load_file) + Registry().register_function(('%s_dnd' % self.mime_data_text), self.parent().handle_mime_data) Registry().register_function(('%s_dnd_internal' % self.mime_data_text), self.parent().dnd_move_internal) def mouseMoveEvent(self, event): diff --git a/openlp/plugins/bibles/lib/importers/csvbible.py b/openlp/plugins/bibles/lib/importers/csvbible.py index 694784f80..0f273de8b 100644 --- a/openlp/plugins/bibles/lib/importers/csvbible.py +++ b/openlp/plugins/bibles/lib/importers/csvbible.py @@ -102,7 +102,7 @@ class CSVBible(BibleImport): :rtype: list[namedtuple] """ try: - encoding = get_file_encoding(file_path)['encoding'] + encoding = get_file_encoding(file_path) with file_path.open('r', encoding=encoding, newline='') as csv_file: csv_reader = csv.reader(csv_file, delimiter=',', quotechar='"') return [results_tuple(*line) for line in csv_reader] diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index 14bef3f0e..9909198cf 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -401,10 +401,9 @@ class ImageMediaItem(MediaManagerItem): Process a list for files either from the File Dialog or from Drag and Drop. This method is overloaded from MediaManagerItem. - :param files: A List of strings containing the filenames of the files to be loaded + :param list[openlp.core.common.path.Path] file_paths: A List of paths to be loaded :param target_group: The QTreeWidgetItem of the group that will be the parent of the added files """ - file_paths = [Path(file) for file in file_paths] self.application.set_normal_cursor() self.load_list(file_paths, target_group) last_dir = file_paths[0].parent diff --git a/openlp/plugins/songs/lib/importers/presentationmanager.py b/openlp/plugins/songs/lib/importers/presentationmanager.py index ae673dcab..6647222cb 100644 --- a/openlp/plugins/songs/lib/importers/presentationmanager.py +++ b/openlp/plugins/songs/lib/importers/presentationmanager.py @@ -48,7 +48,7 @@ class PresentationManagerImport(SongImport): tree = etree.parse(str(file_path), parser=etree.XMLParser(recover=True)) except etree.XMLSyntaxError: # Try to detect encoding and use it - encoding = get_file_encoding(file_path)['encoding'] + encoding = get_file_encoding(file_path) # Open file with detected encoding and remove encoding declaration text = file_path.read_text(encoding=encoding) text = re.sub(r'.+\?>\n', '', text) diff --git a/openlp/plugins/songs/lib/importers/songbeamer.py b/openlp/plugins/songs/lib/importers/songbeamer.py index d5ba82bd0..0fe42c541 100644 --- a/openlp/plugins/songs/lib/importers/songbeamer.py +++ b/openlp/plugins/songs/lib/importers/songbeamer.py @@ -124,7 +124,7 @@ class SongBeamerImport(SongImport): self.chord_table = None if file_path.is_file(): # Detect the encoding - self.input_file_encoding = get_file_encoding(file_path)['encoding'] + self.input_file_encoding = get_file_encoding(file_path) # The encoding should only be ANSI (cp1252), UTF-8, Unicode, Big-Endian-Unicode. # So if it doesn't start with 'u' we default to cp1252. See: # https://forum.songbeamer.com/viewtopic.php?p=419&sid=ca4814924e37c11e4438b7272a98b6f2 diff --git a/openlp/plugins/songs/lib/importers/worshipassistant.py b/openlp/plugins/songs/lib/importers/worshipassistant.py index 15f14122f..4cc374f8f 100644 --- a/openlp/plugins/songs/lib/importers/worshipassistant.py +++ b/openlp/plugins/songs/lib/importers/worshipassistant.py @@ -82,7 +82,7 @@ class WorshipAssistantImport(SongImport): Receive a CSV file to import. """ # Get encoding - encoding = get_file_encoding(self.import_source)['encoding'] + encoding = get_file_encoding(self.import_source) with self.import_source.open('r', encoding=encoding) as songs_file: songs_reader = csv.DictReader(songs_file, escapechar='\\') try: diff --git a/tests/functional/openlp_core/common/test_init.py b/tests/functional/openlp_core/common/test_init.py index e968cce1f..d7320114e 100644 --- a/tests/functional/openlp_core/common/test_init.py +++ b/tests/functional/openlp_core/common/test_init.py @@ -322,7 +322,7 @@ class TestInit(TestCase, TestMixin): mocked_open.assert_called_once_with('rb') assert mocked_universal_detector_inst.feed.mock_calls == [call(b'data' * 256)] mocked_universal_detector_inst.close.assert_called_once_with() - assert result == encoding_result + assert result == 'UTF-8' def test_get_file_encoding_eof(self): """ @@ -344,7 +344,7 @@ class TestInit(TestCase, TestMixin): mocked_open.assert_called_once_with('rb') assert mocked_universal_detector_inst.feed.mock_calls == [call(b'data' * 256), call(b'data' * 4)] mocked_universal_detector_inst.close.assert_called_once_with() - assert result == encoding_result + assert result == 'UTF-8' def test_get_file_encoding_oserror(self): """ @@ -367,4 +367,4 @@ class TestInit(TestCase, TestMixin): mocked_log.exception.assert_called_once_with('Error detecting file encoding') mocked_universal_detector_inst.feed.assert_not_called() mocked_universal_detector_inst.close.assert_called_once_with() - assert result == encoding_result + assert result == 'UTF-8' diff --git a/tests/functional/openlp_core/ui/test_mainwindow.py b/tests/functional/openlp_core/ui/test_mainwindow.py index 6a7e02430..1d1929286 100644 --- a/tests/functional/openlp_core/ui/test_mainwindow.py +++ b/tests/functional/openlp_core/ui/test_mainwindow.py @@ -108,7 +108,6 @@ class TestMainWindow(TestCase, TestMixin): """ # GIVEN a non service file as an argument to openlp service = 'run_openlp.py' - self.main_window.arguments = service # WHEN the argument is processed self.main_window.open_cmd_line_files(service) From a503c61a51b6b33065559d07eb325529a1b3557d Mon Sep 17 00:00:00 2001 From: Ken Roberts Date: Sat, 4 May 2019 03:21:48 -0700 Subject: [PATCH 10/22] PJLink2 update v05 --- openlp/core/projectors/pjlink.py | 20 +- openlp/core/projectors/pjlinkcommands.py | 12 +- .../test_projector_command_routing.py | 107 +++- .../projectors/test_projector_commands_01.py | 549 ++++++++++++++++++ ...ds_01.py => test_projector_commands_02.py} | 397 +------------ .../test_projector_pjlink_cmd_routing.py | 121 +--- 6 files changed, 689 insertions(+), 517 deletions(-) create mode 100644 tests/openlp_core/projectors/test_projector_commands_01.py rename tests/openlp_core/projectors/{test_projector_pjlink_commands_01.py => test_projector_commands_02.py} (54%) diff --git a/openlp/core/projectors/pjlink.py b/openlp/core/projectors/pjlink.py index 1383b27d8..5aa6f2b20 100644 --- a/openlp/core/projectors/pjlink.py +++ b/openlp/core/projectors/pjlink.py @@ -861,6 +861,24 @@ class PJLink(QtNetwork.QTcpSocket): log.debug('({ip}) Sending POWR command'.format(ip=self.entry.name)) return self.send_command(cmd='POWR', priority=priority) + def set_audio_mute(self, priority=False): + """ + Send command to set audio to muted + """ + log.debug('({ip}) Setting AVMT to 21 (audio mute)'.format(ip=self.entry.name)) + self.send_command(cmd='AVMT', opts='21', priority=True) + self.status_timer_add(cmd='AVMT', callback=self.get_av_mute_status) + self.poll_loop() + + def set_audio_normal(self, priority=False): + """ + Send command to set audio to normal + """ + log.debug('({ip}) Setting AVMT to 20 (audio normal)'.format(ip=self.entry.name)) + self.send_command(cmd='AVMT', opts='20', priority=True) + self.status_timer_add(cmd='AVMT', callback=self.get_av_mute_status) + self.poll_loop() + def set_input_source(self, src=None): """ Verify input source available as listed in 'INST' command, @@ -924,9 +942,9 @@ class PJLink(QtNetwork.QTcpSocket): log.warning('({ip}) "{cmd}" already in checks - returning'.format(ip=self.entry.name, cmd=cmd)) return log.debug('({ip}) Adding "{cmd}" callback for status timer'.format(ip=self.entry.name, cmd=cmd)) + self.status_timer_checks[cmd] = callback if not self.status_timer.isActive(): self.status_timer.start() - self.status_timer_checks[cmd] = callback def status_timer_delete(self, cmd): """ diff --git a/openlp/core/projectors/pjlinkcommands.py b/openlp/core/projectors/pjlinkcommands.py index 1834acc03..6df155db1 100644 --- a/openlp/core/projectors/pjlinkcommands.py +++ b/openlp/core/projectors/pjlinkcommands.py @@ -113,15 +113,21 @@ def process_avmt(projector, data): '31': {'shutter': True, 'mute': True} } if data not in settings: - log.warning('({ip}) Invalid shutter response: {data}'.format(ip=projector.entry.name, data=data)) + log.warning('({ip}) Invalid av mute response: {data}'.format(ip=projector.entry.name, data=data)) return shutter = settings[data]['shutter'] mute = settings[data]['mute'] # Check if we need to update the icons update_icons = (shutter != projector.shutter) or (mute != projector.mute) - projector.shutter = shutter - projector.mute = mute if update_icons: + if projector.shutter != shutter: + projector.shutter = shutter + log.debug('({ip}) Setting shutter to {chk}'.format(ip=projector.entry.name, + chk='closed' if shutter else 'open')) + if projector.mute != mute: + projector.mute = mute + log.debug('({ip}) Setting speaker to {chk}'.format(ip=projector.entry.name, + chk='muted' if shutter else 'normal')) if 'AVMT' in projector.status_timer_checks: projector.status_timer_delete('AVMT') projector.projectorUpdateIcons.emit() diff --git a/tests/openlp_core/projectors/test_projector_command_routing.py b/tests/openlp_core/projectors/test_projector_command_routing.py index 38721eb24..866ee3132 100644 --- a/tests/openlp_core/projectors/test_projector_command_routing.py +++ b/tests/openlp_core/projectors/test_projector_command_routing.py @@ -28,7 +28,8 @@ from unittest.mock import call, patch import openlp.core.projectors.pjlink from openlp.core.projectors.pjlinkcommands import process_command -from openlp.core.projectors.constants import E_UNDEFINED, S_DATA_OK +from openlp.core.projectors.constants import E_AUTHENTICATION, E_PARAMETER, E_PROJECTOR, E_UNAVAILABLE, E_UNDEFINED, \ + S_DATA_OK, PJLINK_ERRORS, STATUS_MSG from openlp.core.projectors.db import Projector from openlp.core.projectors.pjlink import PJLink from tests.resources.projector.data import TEST1_DATA @@ -114,19 +115,111 @@ class TestPJLinkRouting(TestCase): assert (chk == S_DATA_OK), 'Should have returned S_DATA_OK' @patch.object(openlp.core.projectors.pjlinkcommands, 'log') - def test_routing_pjink_errors(self, mock_log): + def test_routing_pjink_err1(self, mock_log): """ - Test rouing when PJLink error received (err1, err2, err3, err4, erra) + Test rouing when PJLink ERR1 received """ # GIVEN: Test setup - log_error_text = [call('({ip}) CLSS: PJLink returned "ERR1: Undefined Command"'.format(ip=self.pjlink.name))] - log_debug_text = [call('({ip}) Processing command "CLSS" with data "ERR1"'.format(ip=self.pjlink.name))] err_code = E_UNDEFINED + err_msg = STATUS_MSG[err_code] + err_str = PJLINK_ERRORS[err_code] + + log_error_text = [call('({ip}) CLSS: {err}'.format(ip=self.pjlink.name, err=err_msg))] + log_debug_text = [call('({ip}) Processing command "CLSS" with data "{err}"'.format(ip=self.pjlink.name, + err=err_str))] # WHEN: routing called - chk = process_command(projector=self.pjlink, cmd='CLSS', data='ERR1') + chk = process_command(projector=self.pjlink, cmd='CLSS', data=err_str) # THEN: Appropriate log entries should have been made and methods called/not called mock_log.error.assert_has_calls(log_error_text) mock_log.debug.assert_has_calls(log_debug_text) - assert (chk == err_code), 'Should have returned E_UNDEFINED' + assert (chk == err_code), 'Should have returned {err}'.format(err=PJLINK_ERRORS[err_code]) + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_routing_pjink_err2(self, mock_log): + """ + Test rouing when PJLink ERR2 received + """ + # GIVEN: Test setup + err_code = E_PARAMETER + err_msg = STATUS_MSG[err_code] + err_str = PJLINK_ERRORS[err_code] + + log_error_text = [call('({ip}) CLSS: {err}'.format(ip=self.pjlink.name, err=err_msg))] + log_debug_text = [call('({ip}) Processing command "CLSS" with data "{err}"'.format(ip=self.pjlink.name, + err=err_str))] + + # WHEN: routing called + chk = process_command(projector=self.pjlink, cmd='CLSS', data=err_str) + + # THEN: Appropriate log entries should have been made and methods called/not called + mock_log.error.assert_has_calls(log_error_text) + mock_log.debug.assert_has_calls(log_debug_text) + assert (chk == err_code), 'Should have returned {err}'.format(err=PJLINK_ERRORS[err_code]) + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_routing_pjink_err3(self, mock_log): + """ + Test rouing when PJLink ERR3 received + """ + # GIVEN: Test setup + err_code = E_UNAVAILABLE + err_msg = STATUS_MSG[err_code] + err_str = PJLINK_ERRORS[err_code] + + log_error_text = [call('({ip}) CLSS: {err}'.format(ip=self.pjlink.name, err=err_msg))] + log_debug_text = [call('({ip}) Processing command "CLSS" with data "{err}"'.format(ip=self.pjlink.name, + err=err_str))] + + # WHEN: routing called + chk = process_command(projector=self.pjlink, cmd='CLSS', data=err_str) + + # THEN: Appropriate log entries should have been made and methods called/not called + mock_log.error.assert_has_calls(log_error_text) + mock_log.debug.assert_has_calls(log_debug_text) + assert (chk == err_code), 'Should have returned {err}'.format(err=PJLINK_ERRORS[err_code]) + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_routing_pjink_err4(self, mock_log): + """ + Test rouing when PJLink ERR4 received + """ + # GIVEN: Test setup + err_code = E_PROJECTOR + err_msg = STATUS_MSG[err_code] + err_str = PJLINK_ERRORS[err_code] + + log_error_text = [call('({ip}) CLSS: {err}'.format(ip=self.pjlink.name, err=err_msg))] + log_debug_text = [call('({ip}) Processing command "CLSS" with data "{err}"'.format(ip=self.pjlink.name, + err=err_str))] + + # WHEN: routing called + chk = process_command(projector=self.pjlink, cmd='CLSS', data=err_str) + + # THEN: Appropriate log entries should have been made and methods called/not called + mock_log.error.assert_has_calls(log_error_text) + mock_log.debug.assert_has_calls(log_debug_text) + assert (chk == err_code), 'Should have returned {err}'.format(err=PJLINK_ERRORS[err_code]) + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_routing_pjink_errA(self, mock_log): + """ + Test rouing when PJLink ERRA received + """ + # GIVEN: Test setup + err_code = E_AUTHENTICATION + err_msg = STATUS_MSG[err_code] + err_str = PJLINK_ERRORS[err_code] + + log_error_text = [call('({ip}) CLSS: {err}'.format(ip=self.pjlink.name, err=err_msg))] + log_debug_text = [call('({ip}) Processing command "CLSS" with data "{err}"'.format(ip=self.pjlink.name, + err=err_str))] + + # WHEN: routing called + chk = process_command(projector=self.pjlink, cmd='CLSS', data=err_str) + + # THEN: Appropriate log entries should have been made and methods called/not called + mock_log.error.assert_has_calls(log_error_text) + mock_log.debug.assert_has_calls(log_debug_text) + assert (chk == err_code), 'Should have returned {err}'.format(err=PJLINK_ERRORS[err_code]) diff --git a/tests/openlp_core/projectors/test_projector_commands_01.py b/tests/openlp_core/projectors/test_projector_commands_01.py new file mode 100644 index 000000000..64fa4c1fc --- /dev/null +++ b/tests/openlp_core/projectors/test_projector_commands_01.py @@ -0,0 +1,549 @@ +# -*- coding: utf-8 -*- +# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 + +########################################################################## +# OpenLP - Open Source Lyrics Projection # +# ---------------------------------------------------------------------- # +# Copyright (c) 2008-2019 OpenLP Developers # +# ---------------------------------------------------------------------- # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +########################################################################## +""" +Package to test the openlp.core.projectors.pjlink commands package. +""" +from unittest import TestCase +from unittest.mock import call, patch + +import openlp.core.projectors.pjlink +from openlp.core.projectors.pjlinkcommands import process_command +from openlp.core.projectors.constants import E_ERROR, E_WARN, PJLINK_ERST_DATA, PJLINK_ERST_STATUS, S_OK +from openlp.core.projectors.db import Projector +from openlp.core.projectors.pjlink import PJLink +from tests.resources.projector.data import TEST1_DATA + + +class TestPJLinkCommands(TestCase): + """ + Tests PJLink get status commands part 1 + """ + def setUp(self): + """ + Initial test setup + """ + self.pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) + + def tearDown(self): + """ + Test reset + """ + del(self.pjlink) + + @patch.object(openlp.core.projectors.pjlink.PJLink, 'projectorUpdateIcons') + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_avmt_audio_muted(self, mock_log, mock_UpdateIcons): + """ + Test avmt status shutter unchanged and mute on + """ + # GIVEN: Test setup + log_warning_text = [] + log_debug_text = [call('({ip}) Processing command "AVMT" with data "21"'.format(ip=self.pjlink.name)), + call('({ip}) Calling function for AVMT'.format(ip=self.pjlink.name)), + call('({ip}) Setting speaker to muted'.format(ip=self.pjlink.name))] + self.pjlink.shutter = True + self.pjlink.mute = False + + # WHEN: Called with setting shutter closed and mute on + process_command(projector=self.pjlink, cmd='AVMT', data='21') + + # THEN: Shutter should be closed and mute should be True + assert self.pjlink.shutter, 'Shutter should not have changed' + assert self.pjlink.mute, 'Audio should be off' + assert mock_UpdateIcons.emit.called, 'Update icons should have been called' + mock_log.warning.assert_has_calls(log_warning_text) + mock_log.debug.assert_has_calls(log_debug_text) + + @patch.object(openlp.core.projectors.pjlink.PJLink, 'projectorUpdateIcons') + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_avmt_bad_data(self, mock_log, mock_UpdateIcons): + """ + Test avmt bad data fail + """ + # GIVEN: Test object + log_warning_text = [call('({ip}) Invalid av mute response: 36'.format(ip=self.pjlink.name))] + log_debug_text = [call('({ip}) Processing command "AVMT" with data "36"'.format(ip=self.pjlink.name)), + call('({ip}) Calling function for AVMT'.format(ip=self.pjlink.name))] + self.pjlink.shutter = True + self.pjlink.mute = True + + # WHEN: Called with an invalid setting + process_command(projector=self.pjlink, cmd='AVMT', data='36') + + # THEN: Shutter should be closed and mute should be True + assert self.pjlink.shutter, 'Shutter should changed' + assert self.pjlink.mute, 'Audio should not have changed' + assert (not mock_UpdateIcons.emit.called), 'Update icons should NOT have been called' + mock_log.warning.assert_has_calls(log_warning_text) + mock_log.debug.assert_has_calls(log_debug_text) + + @patch.object(openlp.core.projectors.pjlink.PJLink, 'projectorUpdateIcons') + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_avmt_closed_muted(self, mock_log, mock_UpdateIcons): + """ + Test avmt status shutter closed and mute off + """ + # GIVEN: Test object + log_warning_text = [] + log_debug_text = [call('({ip}) Processing command "AVMT" with data "31"'.format(ip=self.pjlink.name)), + call('({ip}) Calling function for AVMT'.format(ip=self.pjlink.name)), + call('({ip}) Setting shutter to closed'.format(ip=self.pjlink.name)), + call('({ip}) Setting speaker to muted'.format(ip=self.pjlink.name))] + self.pjlink.shutter = False + self.pjlink.mute = False + + # WHEN: Called with setting shutter to closed and mute on + process_command(projector=self.pjlink, cmd='AVMT', data='31') + + # THEN: Shutter should be closed and mute should be True + assert self.pjlink.shutter, 'Shutter should have been set to closed' + assert self.pjlink.mute, 'Audio should be muted' + assert mock_UpdateIcons.emit.called, 'Update icons should have been called' + mock_log.warning.assert_has_calls(log_warning_text) + mock_log.debug.assert_has_calls(log_debug_text) + + @patch.object(openlp.core.projectors.pjlink.PJLink, 'projectorUpdateIcons') + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_avmt_open_unmuted(self, mock_log, mock_UpdateIcons): + """ + Test avmt status shutter open and mute off + """ + # GIVEN: Test object + log_warning_text = [] + log_debug_text = [call('({ip}) Processing command "AVMT" with data "30"'.format(ip=self.pjlink.name)), + call('({ip}) Calling function for AVMT'.format(ip=self.pjlink.name)), + call('({ip}) Setting shutter to open'.format(ip=self.pjlink.name)), + call('({ip}) Setting speaker to normal'.format(ip=self.pjlink.name))] + self.pjlink.shutter = True + self.pjlink.mute = True + + # WHEN: Called with setting shutter to closed and mute on + process_command(projector=self.pjlink, cmd='AVMT', data='30') + + # THEN: Shutter should be closed and mute should be True + assert (not self.pjlink.shutter), 'Shutter should have been set to off' + assert (not self.pjlink.mute), 'Audio should be on' + assert mock_UpdateIcons.emit.called, 'Update icons should have been called' + mock_log.warning.assert_has_calls(log_warning_text) + mock_log.debug.assert_has_calls(log_debug_text) + + @patch.object(openlp.core.projectors.pjlink.PJLink, 'projectorUpdateIcons') + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_avmt_shutter_closed(self, mock_log, mock_UpdateIcons): + """ + Test avmt status shutter closed and audio unchanged + """ + # GIVEN: Test object + log_warning_text = [] + log_debug_text = [call('({ip}) Processing command "AVMT" with data "11"'.format(ip=self.pjlink.name)), + call('({ip}) Calling function for AVMT'.format(ip=self.pjlink.name)), + call('({ip}) Setting shutter to closed'.format(ip=self.pjlink.name))] + self.pjlink.shutter = False + self.pjlink.mute = True + + # WHEN: Called with setting shutter closed and mute off + process_command(projector=self.pjlink, cmd='AVMT', data='11') + + # THEN: Shutter should be True and mute should be False + assert self.pjlink.shutter, 'Shutter should have been set to closed' + assert self.pjlink.mute, 'Audio should not have changed' + assert mock_UpdateIcons.emit.called, 'Update icons should have been called' + mock_log.warning.assert_has_calls(log_warning_text) + mock_log.debug.assert_has_calls(log_debug_text) + + @patch.object(openlp.core.projectors.pjlink.PJLink, 'projectorUpdateIcons') + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_avmt_status_timer_check_delete(self, mock_log, mock_UpdateIcons): + """ + Test avmt deletes callback in projector.status_timer_check + """ + # GIVEN: Test object + log_warning_text = [] + log_debug_text = [call('({ip}) Processing command "AVMT" with data "11"'.format(ip=self.pjlink.name)), + call('({ip}) Calling function for AVMT'.format(ip=self.pjlink.name)), + call('({ip}) Setting shutter to closed'.format(ip=self.pjlink.name))] + self.pjlink.shutter = False + self.pjlink.mute = True + self.pjlink.status_timer_checks = {'AVMT': self.pjlink.get_av_mute_status} + + # WHEN: Called with setting shutter closed and mute off + with patch.object(self.pjlink, 'status_timer') as mock_status_timer: + process_command(projector=self.pjlink, cmd='AVMT', data='11') + + # THEN: Shutter should be True and mute should be False + assert self.pjlink.shutter, 'Shutter should have been set to closed' + assert self.pjlink.mute, 'Audio should not have changed' + assert mock_UpdateIcons.emit.called, 'Update icons should have been called' + assert ('AVMT' not in self.pjlink.status_timer_checks), 'Status timer list should not have AVMT callback' + assert mock_status_timer.stop.called, 'Projector status_timer.stop() should have been called' + mock_log.warning.assert_has_calls(log_warning_text) + mock_log.debug.assert_has_calls(log_debug_text) + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_clss_1(self, mock_log): + """ + Test CLSS request returns non-standard reply 1 + """ + # GIVEN: Test object + log_error_calls = [] + log_warning_calls = [] + log_debug_calls = [call('({ip}) Processing command "CLSS" with data "1"'.format(ip=self.pjlink.name)), + call('({ip}) Calling function for CLSS'.format(ip=self.pjlink.name)), + call('({ip}) Setting pjlink_class for this projector to "1"'.format(ip=self.pjlink.name))] + + # WHEN: Process non-standard reply + process_command(projector=self.pjlink, cmd='CLSS', data='1') + + # THEN: Projector class should be set with proper value + assert ('1' == self.pjlink.pjlink_class), 'Should have set class=1' + mock_log.error.assert_has_calls(log_error_calls) + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_clss_2(self, mock_log): + """ + Test CLSS request returns non-standard reply 1 + """ + # GIVEN: Test object + log_error_calls = [] + log_warning_calls = [] + log_debug_calls = [call('({ip}) Processing command "CLSS" with data "2"'.format(ip=self.pjlink.name)), + call('({ip}) Calling function for CLSS'.format(ip=self.pjlink.name)), + call('({ip}) Setting pjlink_class for this projector to "2"'.format(ip=self.pjlink.name))] + + # WHEN: Process non-standard reply + process_command(projector=self.pjlink, cmd='CLSS', data='2') + + # THEN: Projector class should be set with proper value + assert ('2' == self.pjlink.pjlink_class), 'Should have set class=2' + mock_log.error.assert_has_calls(log_error_calls) + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_clss_invalid_nan(self, mock_log): + """ + Test CLSS reply has no class number + """ + # GIVEN: Test setup + log_error_calls = [call('({ip}) NAN CLSS version reply "Z" - ' + 'defaulting to class "1"'.format(ip=self.pjlink.name))] + log_debug_calls = [call('({ip}) Processing command "CLSS" with data "Z"'.format(ip=self.pjlink.name)), + call('({ip}) Calling function for CLSS'.format(ip=self.pjlink.name)), + call('({ip}) Setting pjlink_class for this projector to "1"'.format(ip=self.pjlink.name))] + + # WHEN: Process invalid reply + process_command(projector=self.pjlink, cmd='CLSS', data='Z') + + # THEN: Projector class should be set with default value + assert (self.pjlink.pjlink_class == '1'), 'Invalid NaN class reply should have set class=1' + mock_log.error.assert_has_calls(log_error_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_clss_invalid_no_version(self, mock_log): + """ + Test CLSS reply has no class number + """ + # GIVEN: Test object + log_error_calls = [call('({ip}) No numbers found in class version reply "Invalid" ' + '- defaulting to class "1"'.format(ip=self.pjlink.name))] + log_debug_calls = [call('({ip}) Processing command "CLSS" with data "Invalid"'.format(ip=self.pjlink.name)), + call('({ip}) Calling function for CLSS'.format(ip=self.pjlink.name)), + call('({ip}) Setting pjlink_class for this projector to "1"'.format(ip=self.pjlink.name))] + + # WHEN: Process invalid reply + process_command(projector=self.pjlink, cmd='CLSS', data='Invalid') + + # THEN: Projector class should be set with default value + assert (self.pjlink.pjlink_class == '1'), 'Invalid class reply should have set class=1' + mock_log.error.assert_has_calls(log_error_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_clss_nonstandard_reply_1(self, mock_log): + """ + Test CLSS request returns non-standard reply 1 + """ + # GIVEN: Test object + log_error_calls = [] + log_warning_calls = [call('({ip}) Non-standard CLSS reply: "Class 1"'.format(ip=self.pjlink.name))] + log_debug_calls = [call('({ip}) Processing command "CLSS" with data "Class 1"'.format(ip=self.pjlink.name)), + call('({ip}) Calling function for CLSS'.format(ip=self.pjlink.name)), + call('({ip}) Setting pjlink_class for this projector to "1"'.format(ip=self.pjlink.name))] + + # WHEN: Process non-standard reply + process_command(projector=self.pjlink, cmd='CLSS', data='Class 1') + + # THEN: Projector class should be set with proper value + assert ('1' == self.pjlink.pjlink_class), 'Non-standard class reply should have set class=1' + mock_log.error.assert_has_calls(log_error_calls) + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_clss_nonstandard_reply_2(self, mock_log): + """ + Test CLSS request returns non-standard reply 1 + """ + # GIVEN: Test object + log_warning_calls = [call('({ip}) Non-standard CLSS reply: "Version2"'.format(ip=self.pjlink.name))] + log_debug_calls = [call('({ip}) Processing command "CLSS" with data "Version2"'.format(ip=self.pjlink.name)), + call('({ip}) Calling function for CLSS'.format(ip=self.pjlink.name)), + call('({ip}) Setting pjlink_class for this projector to "2"'.format(ip=self.pjlink.name))] + + # WHEN: Process non-standard reply + process_command(projector=self.pjlink, cmd='CLSS', data='Version2') + + # THEN: Projector class should be set with proper value + assert ('2' == self.pjlink.pjlink_class), 'Non-standard class reply should have set class=1' + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_erst_all_error(self, mock_log): + """ + Test test_projector_process_erst_all_error + """ + # GIVEN: Test object + chk_data = '{fan}{lamp}{temp}{cover}{filt}{other}'.format(fan=PJLINK_ERST_STATUS[E_ERROR], + lamp=PJLINK_ERST_STATUS[E_ERROR], + temp=PJLINK_ERST_STATUS[E_ERROR], + cover=PJLINK_ERST_STATUS[E_ERROR], + filt=PJLINK_ERST_STATUS[E_ERROR], + other=PJLINK_ERST_STATUS[E_ERROR]) + chk_test = {'Fan': E_ERROR, + 'Lamp': E_ERROR, + 'Temperature': E_ERROR, + 'Cover': E_ERROR, + 'Filter': E_ERROR, + 'Other': E_ERROR} + log_warning_calls = [] + log_debug_calls = [call('({ip}) Processing command "ERST" with data "{chk}"'.format(ip=self.pjlink.name, + chk=chk_data)), + call('({ip}) Calling function for ERST'.format(ip=self.pjlink.name))] + self.pjlink.projector_errors = None + + # WHEN: process_erst with status set to WARN + process_command(projector=self.pjlink, cmd='ERST', data=chk_data) + + # THEN: PJLink instance errors should match chk_value + assert (self.pjlink.projector_errors == chk_test), 'Projector errors should be all E_ERROR' + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_erst_all_ok(self, mock_log): + """ + Test to verify pjlink.projector_errors is set to None when no errors + """ + # GIVEN: Test object + chk_data = '0' * PJLINK_ERST_DATA['DATA_LENGTH'] + log_warning_calls = [] + log_debug_calls = [call('({ip}) Processing command "ERST" with data "{chk}"'.format(ip=self.pjlink.name, + chk=chk_data)), + call('({ip}) Calling function for ERST'.format(ip=self.pjlink.name))] + + # WHEN: process_erst with no errors + process_command(projector=self.pjlink, cmd='ERST', data=chk_data) + + # THEN: PJLink instance errors should be None + assert (self.pjlink.projector_errors is None), 'projector_errors should have been set to None' + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_erst_all_warn(self, mock_log): + """ + Test test_projector_process_erst_all_error + """ + # GIVEN: Test object + chk_data = '{fan}{lamp}{temp}{cover}{filt}{other}'.format(fan=PJLINK_ERST_STATUS[E_WARN], + lamp=PJLINK_ERST_STATUS[E_WARN], + temp=PJLINK_ERST_STATUS[E_WARN], + cover=PJLINK_ERST_STATUS[E_WARN], + filt=PJLINK_ERST_STATUS[E_WARN], + other=PJLINK_ERST_STATUS[E_WARN]) + chk_test = {'Fan': E_WARN, + 'Lamp': E_WARN, + 'Temperature': E_WARN, + 'Cover': E_WARN, + 'Filter': E_WARN, + 'Other': E_WARN} + log_warning_calls = [] + log_debug_calls = [call('({ip}) Processing command "ERST" with data "{chk}"'.format(ip=self.pjlink.name, + chk=chk_data)), + call('({ip}) Calling function for ERST'.format(ip=self.pjlink.name))] + self.pjlink.projector_errors = None + + # WHEN: process_erst with status set to WARN + process_command(projector=self.pjlink, cmd='ERST', data=chk_data) + + # THEN: PJLink instance errors should match chk_value + assert (self.pjlink.projector_errors == chk_test), 'Projector errors should be all E_WARN' + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_erst_data_invalid_length(self, mock_log): + """ + Test test_projector_process_erst_data_invalid_length + """ + # GIVEN: Test object + chk_data = '0' * (PJLINK_ERST_DATA['DATA_LENGTH'] + 1) + log_warn_calls = [call('({ip}) Invalid error status response "{data}": ' + 'length != {chk}'.format(ip=self.pjlink.name, + data=chk_data, chk=PJLINK_ERST_DATA['DATA_LENGTH']))] + log_debug_calls = [call('({ip}) Processing command "ERST" with data "{data}"'.format(ip=self.pjlink.name, + data=chk_data)), + call('({ip}) Calling function for ERST'.format(ip=self.pjlink.name))] + self.pjlink.projector_errors = None + + # WHEN: process_erst called with invalid data (too many values + process_command(self.pjlink, cmd='ERST', data=chk_data) + + # THEN: pjlink.projector_errors should be empty and warning logged + assert (not self.pjlink.projector_errors), 'There should be no errors' + mock_log.warning.assert_has_calls(log_warn_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_erst_data_invalid_nan(self, mock_log): + """ + Test ERST called with invalid data + """ + # GIVEN: Test object + chk_data = 'Z' + ('0' * (PJLINK_ERST_DATA['DATA_LENGTH'] - 1)) + log_warn_calls = [call('({ip}) Invalid error status response "{data}"'.format(ip=self.pjlink.name, + data=chk_data))] + log_debug_calls = [call('({ip}) Processing command "ERST" with data "{data}"'.format(ip=self.pjlink.name, + data=chk_data)), + call('({ip}) Calling function for ERST'.format(ip=self.pjlink.name))] + self.pjlink.projector_errors = None + + # WHEN: process_erst called with invalid data (too many values + process_command(self.pjlink, cmd='ERST', data=chk_data) + + # THEN: pjlink.projector_errors should be empty and warning logged + assert (not self.pjlink.projector_errors), 'There should be no errors' + mock_log.warning.assert_has_calls(log_warn_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_erst_warn_cover_only(self, mock_log): + """ + Test test_projector_process_erst_warn_cover_only + """ + # GIVEN: Test object + chk_data = '{fan}{lamp}{temp}{cover}{filt}{other}'.format(fan=PJLINK_ERST_STATUS[S_OK], + lamp=PJLINK_ERST_STATUS[S_OK], + temp=PJLINK_ERST_STATUS[S_OK], + cover=PJLINK_ERST_STATUS[E_WARN], + filt=PJLINK_ERST_STATUS[S_OK], + other=PJLINK_ERST_STATUS[S_OK]) + chk_test = {'Cover': E_WARN} + log_warn_calls = [] + log_debug_calls = [call('({ip}) Processing command "ERST" with data "{data}"'.format(ip=self.pjlink.name, + data=chk_data)), + call('({ip}) Calling function for ERST'.format(ip=self.pjlink.name))] + self.pjlink.projector_errors = None + + # WHEN: process_erst with status set to WARN + process_command(projector=self.pjlink, cmd='ERST', data=chk_data) + + # THEN: PJLink instance errors should match only cover warning + assert (1 == len(self.pjlink.projector_errors)), 'There should only be 1 error listed in projector_errors' + assert ('Cover' in self.pjlink.projector_errors), '"Cover" should be the only error listed' + assert (self.pjlink.projector_errors['Cover'] == E_WARN), '"Cover" should have E_WARN listed as error' + assert (chk_test == self.pjlink.projector_errors), 'projector_errors should match test errors' + mock_log.warning.assert_has_calls(log_warn_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_inf1(self, mock_log): + """ + Test saving INF1 data (manufacturer) + """ + # GIVEN: Test object + chk_data = 'TEst INformation MultiCase' + log_warn_calls = [] + log_debug_calls = [call('({ip}) Processing command "INF1" with data "{data}"'.format(ip=self.pjlink.name, + data=chk_data)), + call('({ip}) Calling function for INF1'.format(ip=self.pjlink.name)), + call('({ip}) Setting projector manufacturer data to ' + '"{data}"'.format(ip=self.pjlink.name, data=chk_data))] + self.pjlink.manufacturer = None + + # WHEN: process_inf called with test data + process_command(projector=self.pjlink, cmd='INF1', data=chk_data) + + # THEN: Data should be saved + assert (self.pjlink.manufacturer == chk_data), 'Test data should have been saved' + mock_log.warning.assert_has_calls(log_warn_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_inf2(self, mock_log): + """ + Test saving INF2 data (model) + """ + # GIVEN: Test object + chk_data = 'TEst moDEl MultiCase' + log_warn_calls = [] + log_debug_calls = [call('({ip}) Processing command "INF2" with data "{data}"'.format(ip=self.pjlink.name, + data=chk_data)), + call('({ip}) Calling function for INF2'.format(ip=self.pjlink.name)), + call('({ip}) Setting projector model to "{data}"'.format(ip=self.pjlink.name, + data=chk_data))] + self.pjlink.model = None + + # WHEN: process_inf called with test data + process_command(projector=self.pjlink, cmd='INF2', data=chk_data) + + # THEN: Data should be saved + assert (self.pjlink.model == chk_data), 'Test data should have been saved' + mock_log.warning.assert_has_calls(log_warn_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_info(self, mock_log): + """ + Test saving INF2 data (model) + """ + # GIVEN: Test object + chk_data = 'TEst ExtrANEous MultiCase INformatoin that MFGR might Set' + log_warn_calls = [] + log_debug_calls = [call('({ip}) Processing command "INFO" with data "{data}"'.format(ip=self.pjlink.name, + data=chk_data)), + call('({ip}) Calling function for INFO'.format(ip=self.pjlink.name)), + call('({ip}) Setting projector other_info to "{data}"'.format(ip=self.pjlink.name, + data=chk_data))] + self.pjlink.other_info = None + + # WHEN: process_inf called with test data + process_command(projector=self.pjlink, cmd='INFO', data=chk_data) + + # THEN: Data should be saved + assert (self.pjlink.other_info == chk_data), 'Test data should have been saved' + mock_log.warning.assert_has_calls(log_warn_calls) + mock_log.debug.assert_has_calls(log_debug_calls) diff --git a/tests/openlp_core/projectors/test_projector_pjlink_commands_01.py b/tests/openlp_core/projectors/test_projector_commands_02.py similarity index 54% rename from tests/openlp_core/projectors/test_projector_pjlink_commands_01.py rename to tests/openlp_core/projectors/test_projector_commands_02.py index 48e479660..f483269a8 100644 --- a/tests/openlp_core/projectors/test_projector_pjlink_commands_01.py +++ b/tests/openlp_core/projectors/test_projector_commands_02.py @@ -26,8 +26,8 @@ from unittest import TestCase, skip from unittest.mock import call, patch import openlp.core.projectors.pjlink -from openlp.core.projectors.constants import E_ERROR, E_WARN, PJLINK_ERST_DATA, PJLINK_ERST_STATUS, \ - PJLINK_POWR_STATUS, S_NOT_CONNECTED, S_OK, S_ON, S_STANDBY, STATUS_CODE +from openlp.core.projectors.pjlinkcommands import process_command +from openlp.core.projectors.constants import PJLINK_POWR_STATUS, S_ON, S_STANDBY from openlp.core.projectors.db import Projector from openlp.core.projectors.pjlink import PJLink from tests.resources.projector.data import TEST1_DATA @@ -35,396 +35,19 @@ from tests.resources.projector.data import TEST1_DATA class TestPJLinkCommands(TestCase): """ - Tests for the PJLinkCommands class part 1 + Tests PJLink get status commands part 2 """ - @skip('Needs update to new setup') - def test_projector_process_inf1(self): + def setUp(self): """ - Test saving INF1 data (manufacturer) + Initial test setup """ - test_data = 'TEst INformation MultiCase' + self.pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - # GIVEN: Test object - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.manufacturer = None - - # WHEN: process_inf called with test data - pjlink.process_inf1(data=test_data) - - # THEN: Data should be saved - assert pjlink.manufacturer == test_data, 'Test data should have been saved' - - @skip('Needs update to new setup') - def test_projector_process_inf2(self): + def tearDown(self): """ - Test saving INF2 data (model) + Test reset """ - test_data = 'TEst moDEl MultiCase' - - # GIVEN: Test object - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.model = None - - # WHEN: process_inf called with test data - pjlink.process_inf2(data=test_data) - - # THEN: Data should be saved - assert pjlink.model == test_data, 'Test data should have been saved' - - @skip('Needs update to new setup') - def test_projector_process_info(self): - """ - Test saving INFO data (other information) - """ - test_data = 'TEst ExtrANEous MultiCase INformatoin that MFGR might Set' - - # GIVEN: Test object - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.other_info = None - - # WHEN: process_inf called with test data - pjlink.process_info(data=test_data) - - # THEN: Data should be saved - assert pjlink.other_info == test_data, 'Test data should have been saved' - - @skip('Needs update to new setup') - def test_projector_process_avmt_bad_data(self): - """ - Test avmt bad data fail - """ - # GIVEN: Test object - with patch.object(openlp.core.projectors.pjlink.PJLink, 'projectorUpdateIcons') as mock_UpdateIcons: - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.shutter = True - pjlink.mute = True - - # WHEN: Called with an invalid setting - pjlink.process_avmt('36') - - # THEN: Shutter should be closed and mute should be True - assert pjlink.shutter is True, 'Shutter should changed' - assert pjlink.mute is True, 'Audio should not have changed' - assert mock_UpdateIcons.emit.called is False, 'Update icons should NOT have been called' - - @skip('Needs update to new setup') - def test_projector_process_avmt_closed_muted(self): - """ - Test avmt status shutter closed and mute off - """ - # GIVEN: Test object - with patch.object(openlp.core.projectors.pjlink.PJLink, 'projectorUpdateIcons') as mock_UpdateIcons: - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.shutter = False - pjlink.mute = False - - # WHEN: Called with setting shutter to closed and mute on - pjlink.process_avmt('31') - - # THEN: Shutter should be closed and mute should be True - assert pjlink.shutter is True, 'Shutter should have been set to closed' - assert pjlink.mute is True, 'Audio should be muted' - assert mock_UpdateIcons.emit.called is True, 'Update icons should have been called' - - @skip('Needs update to new setup') - def test_projector_process_avmt_shutter_closed(self): - """ - Test avmt status shutter closed and audio unchanged - """ - # GIVEN: Test object - with patch.object(openlp.core.projectors.pjlink.PJLink, 'projectorUpdateIcons') as mock_UpdateIcons: - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.shutter = False - pjlink.mute = True - - # WHEN: Called with setting shutter closed and mute off - pjlink.process_avmt('11') - - # THEN: Shutter should be True and mute should be False - assert pjlink.shutter is True, 'Shutter should have been set to closed' - assert pjlink.mute is True, 'Audio should not have changed' - assert mock_UpdateIcons.emit.called is True, 'Update icons should have been called' - - @skip('Needs update to new setup') - def test_projector_process_avmt_audio_muted(self): - """ - Test avmt status shutter unchanged and mute on - """ - # GIVEN: Test object - with patch.object(openlp.core.projectors.pjlink.PJLink, 'projectorUpdateIcons') as mock_UpdateIcons: - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.shutter = True - pjlink.mute = False - - # WHEN: Called with setting shutter closed and mute on - pjlink.process_avmt('21') - - # THEN: Shutter should be closed and mute should be True - assert pjlink.shutter is True, 'Shutter should not have changed' - assert pjlink.mute is True, 'Audio should be off' - assert mock_UpdateIcons.emit.called is True, 'Update icons should have been called' - - @skip('Needs update to new setup') - def test_projector_process_avmt_open_unmuted(self): - """ - Test avmt status shutter open and mute off - """ - # GIVEN: Test object - with patch.object(openlp.core.projectors.pjlink.PJLink, 'projectorUpdateIcons') as mock_UpdateIcons: - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.shutter = True - pjlink.mute = True - - # WHEN: Called with setting shutter to closed and mute on - pjlink.process_avmt('30') - - # THEN: Shutter should be closed and mute should be True - assert pjlink.shutter is False, 'Shutter should have been set to open' - assert pjlink.mute is False, 'Audio should be on' - assert mock_UpdateIcons.emit.called is True, 'Update icons should have been called' - - @skip('Needs update to new setup') - def test_projector_process_clss_one(self): - """ - Test class 1 sent from projector - """ - # GIVEN: Test object - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - - # WHEN: Process class response - pjlink.process_clss('1') - - # THEN: Projector class should be set to 1 - assert pjlink.pjlink_class == '1', 'Projector should have set class=1' - - @skip('Needs update to new setup') - def test_projector_process_clss_two(self): - """ - Test class 2 sent from projector - """ - # GIVEN: Test object - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - - # WHEN: Process class response - pjlink.process_clss('2') - - # THEN: Projector class should be set to 1 - assert pjlink.pjlink_class == '2', 'Projector should have set class=2' - - @skip('Needs update to new setup') - def test_projector_process_clss_invalid_nan(self): - """ - Test CLSS reply has no class number - """ - # GIVEN: Test object - with patch.object(openlp.core.projectors.pjlink, 'log') as mock_log: - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - log_debug_calls = [call('({ip}) reset_information() connect status is ' - '{state}'.format(ip=pjlink.name, state=STATUS_CODE[S_NOT_CONNECTED])), - call('({ip}) Setting pjlink_class for this projector to "1"'.format(ip=pjlink.name))] - log_error_calls = [call('({ip}) NAN CLSS version reply "Z" - ' - 'defaulting to class "1"'.format(ip=pjlink.name))] - - # WHEN: Process invalid reply - pjlink.process_clss('Z') - - # THEN: Projector class should be set with default value - assert pjlink.pjlink_class == '1', 'Invalid NaN class reply should have set class=1' - mock_log.error.assert_has_calls(log_error_calls) - mock_log.debug.assert_has_calls(log_debug_calls) - - @skip('Needs update to new setup') - def test_projector_process_clss_invalid_no_version(self): - """ - Test CLSS reply has no class number - """ - # GIVEN: Test object - with patch.object(openlp.core.projectors.pjlink, 'log') as mock_log: - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - log_debug_calls = [call('({ip}) reset_information() connect status is ' - '{state}'.format(ip=pjlink.name, state=STATUS_CODE[S_NOT_CONNECTED])), - call('({ip}) Setting pjlink_class for this projector to "1"'.format(ip=pjlink.name))] - log_error_calls = [call('({ip}) No numbers found in class version reply "Invalid" ' - '- defaulting to class "1"'.format(ip=pjlink.name))] - - # WHEN: Process invalid reply - pjlink.process_clss('Invalid') - - # THEN: Projector class should be set with default value - assert pjlink.pjlink_class == '1', 'Invalid class reply should have set class=1' - mock_log.error.assert_has_calls(log_error_calls) - mock_log.debug.assert_has_calls(log_debug_calls) - - @skip('Needs update to new setup') - def test_projector_process_clss_nonstandard_reply_1(self): - """ - Test CLSS request returns non-standard reply 1 - """ - # GIVEN: Test object - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - - # WHEN: Process non-standard reply - pjlink.process_clss('Class 1') - - # THEN: Projector class should be set with proper value - assert '1' == pjlink.pjlink_class, 'Non-standard class reply should have set class=1' - - @skip('Needs update to new setup') - def test_projector_process_clss_nonstandard_reply_2(self): - """ - Test CLSS request returns non-standard reply 2 - """ - # GIVEN: Test object - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - - # WHEN: Process non-standard reply - pjlink.process_clss('Version2') - - # THEN: Projector class should be set with proper value - assert '2' == pjlink.pjlink_class, 'Non-standard class reply should have set class=2' - - @skip('Needs update to new setup') - def test_projector_process_erst_all_ok(self): - """ - Test to verify pjlink.projector_errors is set to None when no errors - """ - chk_data = '0' * PJLINK_ERST_DATA['DATA_LENGTH'] - - # GIVEN: Test object - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - - # WHEN: process_erst with no errors - pjlink.process_erst(chk_data) - - # THEN: PJLink instance errors should be None - assert pjlink.projector_errors is None, 'projector_errors should have been set to None' - - @skip('Needs update to new setup') - def test_projector_process_erst_data_invalid_length(self): - """ - Test test_projector_process_erst_data_invalid_length - """ - # GIVEN: Test object - with patch.object(openlp.core.projectors.pjlink, 'log') as mock_log: - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.projector_errors = None - chk_data = '0' * (PJLINK_ERST_DATA['DATA_LENGTH'] + 1) - log_debug_calls = [call('({ip}) reset_information() connect status is ' - '{state}'.format(ip=pjlink.name, state=STATUS_CODE[S_NOT_CONNECTED]))] - log_warn_calls = [call('({ip}) Invalid error status response "0000000": ' - 'length != {chk}'.format(ip=pjlink.name, chk=PJLINK_ERST_DATA['DATA_LENGTH']))] - - # WHEN: process_erst called with invalid data (too many values - pjlink.process_erst(chk_data) - - # THEN: pjlink.projector_errors should be empty and warning logged - assert pjlink.projector_errors is None, 'There should be no errors' - mock_log.debug.assert_has_calls(log_debug_calls) - mock_log.warning.assert_has_calls(log_warn_calls) - - @skip('Needs update to new setup') - def test_projector_process_erst_data_invalid_nan(self): - """ - Test test_projector_process_erst_data_invalid_nan - """ - # GIVEN: Test object - with patch.object(openlp.core.projectors.pjlink, 'log') as mock_log: - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.projector_errors = None - chk_data = 'Z' + ('0' * (PJLINK_ERST_DATA['DATA_LENGTH'] - 1)) - log_debug_calls = [call('({ip}) reset_information() connect status is ' - '{state}'.format(ip=pjlink.name, state=STATUS_CODE[S_NOT_CONNECTED]))] - log_warn_calls = [call('({ip}) Invalid error status response "Z00000"'.format(ip=pjlink.name))] - - # WHEN: process_erst called with invalid data (too many values - pjlink.process_erst(chk_data) - - # THEN: pjlink.projector_errors should be empty and warning logged - assert pjlink.projector_errors is None, 'There should be no errors' - mock_log.debug.assert_has_calls(log_debug_calls) - mock_log.warning.assert_has_calls(log_warn_calls) - - @skip('Needs update to new setup') - def test_projector_process_erst_all_warn(self): - """ - Test test_projector_process_erst_all_warn - """ - chk_data = '{fan}{lamp}{temp}{cover}{filt}{other}'.format(fan=PJLINK_ERST_STATUS[E_WARN], - lamp=PJLINK_ERST_STATUS[E_WARN], - temp=PJLINK_ERST_STATUS[E_WARN], - cover=PJLINK_ERST_STATUS[E_WARN], - filt=PJLINK_ERST_STATUS[E_WARN], - other=PJLINK_ERST_STATUS[E_WARN]) - chk_test = {'Fan': E_WARN, - 'Lamp': E_WARN, - 'Temperature': E_WARN, - 'Cover': E_WARN, - 'Filter': E_WARN, - 'Other': E_WARN} - - # GIVEN: Test object - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.projector_errors = None - - # WHEN: process_erst with status set to WARN - pjlink.process_erst(chk_data) - - # THEN: PJLink instance errors should match chk_value - assert pjlink.projector_errors == chk_test, 'Projector errors should be all E_WARN' - - @skip('Needs update to new setup') - def test_projector_process_erst_all_error(self): - """ - Test test_projector_process_erst_all_error - """ - chk_data = '{fan}{lamp}{temp}{cover}{filt}{other}'.format(fan=PJLINK_ERST_STATUS[E_ERROR], - lamp=PJLINK_ERST_STATUS[E_ERROR], - temp=PJLINK_ERST_STATUS[E_ERROR], - cover=PJLINK_ERST_STATUS[E_ERROR], - filt=PJLINK_ERST_STATUS[E_ERROR], - other=PJLINK_ERST_STATUS[E_ERROR]) - chk_test = {'Fan': E_ERROR, - 'Lamp': E_ERROR, - 'Temperature': E_ERROR, - 'Cover': E_ERROR, - 'Filter': E_ERROR, - 'Other': E_ERROR} - - # GIVEN: Test object - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.projector_errors = None - - # WHEN: process_erst with status set to WARN - pjlink.process_erst(chk_data) - - # THEN: PJLink instance errors should match chk_value - assert pjlink.projector_errors == chk_test, 'Projector errors should be all E_ERROR' - - @skip('Needs update to new setup') - def test_projector_process_erst_warn_cover_only(self): - """ - Test test_projector_process_erst_warn_cover_only - """ - chk_data = '{fan}{lamp}{temp}{cover}{filt}{other}'.format(fan=PJLINK_ERST_STATUS[S_OK], - lamp=PJLINK_ERST_STATUS[S_OK], - temp=PJLINK_ERST_STATUS[S_OK], - cover=PJLINK_ERST_STATUS[E_WARN], - filt=PJLINK_ERST_STATUS[S_OK], - other=PJLINK_ERST_STATUS[S_OK]) - chk_test = {'Cover': E_WARN} - - # GIVEN: Test object - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.projector_errors = None - - # WHEN: process_erst with status set to WARN - pjlink.process_erst(chk_data) - - # THEN: PJLink instance errors should match only cover warning - assert 1 == len(pjlink.projector_errors), 'There should only be 1 error listed in projector_errors' - assert 'Cover' in pjlink.projector_errors, '"Cover" should be the only error listed' - assert pjlink.projector_errors['Cover'] == E_WARN, '"Cover" should have E_WARN listed as error' - assert chk_test == pjlink.projector_errors, 'projector_errors should match test errors' + del(self.pjlink) @skip('Needs update to new setup') def test_projector_process_inpt_valid(self): @@ -441,7 +64,7 @@ class TestPJLinkCommands(TestCase): pjlink.source_available = chk_source_available # WHEN: Called with input source - pjlink.process_inpt('21') + process_command(projector=self.pjlink, cmd='INPT', data='21') # THEN: Input selected should reflect current input assert pjlink.source == '21', 'Input source should be set to "21"' diff --git a/tests/openlp_core/projectors/test_projector_pjlink_cmd_routing.py b/tests/openlp_core/projectors/test_projector_pjlink_cmd_routing.py index a5225fd69..669f0a10a 100644 --- a/tests/openlp_core/projectors/test_projector_pjlink_cmd_routing.py +++ b/tests/openlp_core/projectors/test_projector_pjlink_cmd_routing.py @@ -23,12 +23,11 @@ Package to test the openlp.core.projectors.pjlink command routing. """ -from unittest import TestCase, skip +from unittest import TestCase from unittest.mock import call, patch import openlp.core.projectors.pjlink -from openlp.core.projectors.constants import E_AUTHENTICATION, E_PARAMETER, E_PROJECTOR, E_UNAVAILABLE, E_UNDEFINED, \ - PJLINK_ERRORS, PJLINK_PREFIX, STATUS_MSG +from openlp.core.projectors.constants import PJLINK_PREFIX from openlp.core.projectors.db import Projector from openlp.core.projectors.pjlink import PJLink from tests.resources.projector.data import TEST1_DATA @@ -134,119 +133,3 @@ class TestPJLinkRouting(TestCase): mock_log.warning.assert_has_calls(log_warning_text) mock_log.debug.assert_has_calls(log_debug_text) assert (mock_process_cmd.call_count == 0), 'process_command should not have been called' - - @skip('Needs update to new setup') - def test_routing_err1(self): - """ - Test ERR1 - Undefined projector function - """ - # GIVEN: Test object - with patch.object(openlp.core.projectors.pjlink, 'log') as mock_log, \ - patch.object(openlp.core.projectors.pjlink.PJLink, 'process_clss') as mock_process_clss: - - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - log_error_text = [call('({ip}) CLSS: {msg}'.format(ip=self.pjlink.name, msg=STATUS_MSG[E_UNDEFINED]))] - log_debug_text = [call('({ip}) Processing command "CLSS" with data "ERR1"'.format(ip=self.pjlink.name)), - call('({ip}) Calling function for CLSS'.format(ip=self.pjlink.name))] - - # WHEN: process_command called with ERR1 - pjlink.process_command(cmd='CLSS', data=PJLINK_ERRORS[E_UNDEFINED]) - - # THEN: Appropriate log entries should have been made and methods called - mock_log.error.assert_has_calls(log_error_text) - mock_log.debug.assert_has_calls(log_debug_text) - mock_process_clss.assert_called_once_with(data=PJLINK_ERRORS[E_UNDEFINED]) - - @skip('Needs update to new setup') - def test_routing_err2(self): - """ - Test ERR2 - Parameter Error - """ - # GIVEN: Test object - with patch.object(openlp.core.projectors.pjlink, 'log') as mock_log, \ - patch.object(openlp.core.projectors.pjlink.PJLink, 'process_clss') as mock_process_clss: - - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - log_error_text = [call('({ip}) CLSS: {msg}'.format(ip=self.pjlink.name, msg=STATUS_MSG[E_PARAMETER]))] - log_debug_text = [call('({ip}) Processing command "CLSS" with data "ERR2"'.format(ip=self.pjlink.name)), - call('({ip}) Calling function for CLSS'.format(ip=self.pjlink.name))] - - # WHEN: process_command called with ERR2 - pjlink.process_command(cmd='CLSS', data=PJLINK_ERRORS[E_PARAMETER]) - - # THEN: Appropriate log entries should have been made and methods called/not called - mock_log.error.assert_has_calls(log_error_text) - mock_log.debug.assert_has_calls(log_debug_text) - mock_process_clss.assert_called_once_with(data=PJLINK_ERRORS[E_PARAMETER]) - - @skip('Needs update to new setup') - def test_routing_err3(self): - """ - Test ERR3 - Unavailable error - """ - # GIVEN: Test object - with patch.object(openlp.core.projectors.pjlink, 'log') as mock_log, \ - patch.object(openlp.core.projectors.pjlink.PJLink, 'process_clss') as mock_process_clss: - - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - log_error_text = [call('({ip}) CLSS: {msg}'.format(ip=self.pjlink.name, msg=STATUS_MSG[E_UNAVAILABLE]))] - log_debug_text = [call('({ip}) Processing command "CLSS" with data "ERR3"'.format(ip=self.pjlink.name)), - call('({ip}) Calling function for CLSS'.format(ip=self.pjlink.name))] - - # WHEN: process_command called with ERR3 - pjlink.process_command(cmd='CLSS', data=PJLINK_ERRORS[E_UNAVAILABLE]) - - # THEN: Appropriate log entries should have been made and methods called - mock_log.error.assert_has_calls(log_error_text) - mock_log.debug.assert_has_calls(log_debug_text) - mock_process_clss.assert_called_once_with(data=PJLINK_ERRORS[E_UNAVAILABLE]) - - @skip('Needs update to new setup') - def test_routing_err4(self): - """ - Test ERR3 - Unavailable error - """ - # GIVEN: Test object - with patch.object(openlp.core.projectors.pjlink, 'log') as mock_log, \ - patch.object(openlp.core.projectors.pjlink.PJLink, 'process_clss') as mock_process_clss: - - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - log_error_text = [call('({ip}) CLSS: {msg}'.format(ip=self.pjlink.name, msg=STATUS_MSG[E_PROJECTOR]))] - log_debug_text = [call('({ip}) Processing command "CLSS" with data "ERR4"'.format(ip=self.pjlink.name)), - call('({ip}) Calling function for CLSS'.format(ip=self.pjlink.name))] - - # WHEN: process_command called with ERR4 - pjlink.process_command(cmd='CLSS', data=PJLINK_ERRORS[E_PROJECTOR]) - - # THEN: Appropriate log entries should have been made and methods called - mock_log.error.assert_has_calls(log_error_text) - mock_log.debug.assert_has_calls(log_debug_text) - mock_process_clss.assert_called_once_with(data=PJLINK_ERRORS[E_PROJECTOR]) - - @skip('Needs update to new setup') - def test_routing_erra(self): - """ - Test ERRA - Authentication Error - """ - # GIVEN: Test object - with patch.object(openlp.core.projectors.pjlink, 'log') as mock_log, \ - patch.object(openlp.core.projectors.pjlink.PJLink, 'process_pjlink') as mock_process_pjlink, \ - patch.object(openlp.core.projectors.pjlink.PJLink, 'change_status') as mock_change_status, \ - patch.object(openlp.core.projectors.pjlink.PJLink, 'disconnect_from_host') as mock_disconnect, \ - patch.object(openlp.core.projectors.pjlink.PJLink, 'projectorAuthentication') as mock_authentication: - - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - log_error_calls = [call('({ip}) PJLINK: {msg}'.format(ip=self.pjlink.name, - msg=STATUS_MSG[E_AUTHENTICATION]))] - log_debug_calls = [call('({ip}) Processing command "PJLINK" with data "ERRA"'.format(ip=self.pjlink.name))] - - # WHEN: process_command called with ERRA - pjlink.process_command(cmd='PJLINK', data=PJLINK_ERRORS[E_AUTHENTICATION]) - - # THEN: Appropriate log entries should have been made and methods called/not called - assert mock_disconnect.called is True, 'disconnect_from_host should have been called' - mock_log.error.assert_has_calls(log_error_calls) - mock_log.debug.assert_has_calls(log_debug_calls) - mock_change_status.assert_called_once_with(status=E_AUTHENTICATION) - mock_authentication.emit.assert_called_once_with(pjlink.name) - mock_process_pjlink.assert_not_called() From 7aa7e5c6351d80d8623c639d8a8a6af51f6cee06 Mon Sep 17 00:00:00 2001 From: Phill Date: Sat, 4 May 2019 12:49:20 +0100 Subject: [PATCH 11/22] Move some changes out of annother branch --- openlp/core/common/__init__.py | 6 +++--- openlp/core/lib/mediamanageritem.py | 10 +++++----- openlp/plugins/presentations/lib/mediaitem.py | 18 ++++++++---------- .../openlp_core/ui/test_thememanager.py | 4 ++-- 4 files changed, 18 insertions(+), 20 deletions(-) diff --git a/openlp/core/common/__init__.py b/openlp/core/common/__init__.py index fd251be14..c7bc25b29 100644 --- a/openlp/core/common/__init__.py +++ b/openlp/core/common/__init__.py @@ -463,8 +463,8 @@ def get_file_encoding(file_path): Utility function to incrementally detect the file encoding. :param openlp.core.common.path.Path file_path: Filename for the file to determine the encoding for. - :return: A dict with the keys 'encoding' and 'confidence' - :rtype: dict[str, float] + :return: The name of the encoding detected + :rtype: str """ detector = UniversalDetector() try: @@ -477,7 +477,7 @@ def get_file_encoding(file_path): except OSError: log.exception('Error detecting file encoding') finally: - return detector.close() + return detector.close()['encoding'] def normalize_str(irregular_string): diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py index 50f8497ab..0511eeb16 100644 --- a/openlp/core/lib/mediamanageritem.py +++ b/openlp/core/lib/mediamanageritem.py @@ -333,7 +333,7 @@ class MediaManagerItem(QtWidgets.QWidget, RegistryProperties): self.validate_and_load(file_paths) self.application.set_normal_cursor() - def load_file(self, data): + def handle_mime_data(self, data): """ Turn file from Drag and Drop into an array so the Validate code can run it. @@ -379,11 +379,11 @@ class MediaManagerItem(QtWidgets.QWidget, RegistryProperties): duplicates_found = False files_added = False for file_path in file_paths: - if path_to_str(file_path) in full_list: + if file_path in full_list: duplicates_found = True else: files_added = True - full_list.append(path_to_str(file_path)) + full_list.append(file_path) if full_list and files_added: if target_group is None: self.list_view.clear() @@ -416,8 +416,8 @@ class MediaManagerItem(QtWidgets.QWidget, RegistryProperties): file_paths = [] for index in range(self.list_view.count()): list_item = self.list_view.item(index) - filename = list_item.data(QtCore.Qt.UserRole) - file_paths.append(str_to_path(filename)) + file_path = list_item.data(QtCore.Qt.UserRole) + file_paths.append(file_path) return file_paths def load_list(self, load_list, target_group): diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py index b11140489..dda2a485c 100644 --- a/openlp/plugins/presentations/lib/mediaitem.py +++ b/openlp/plugins/presentations/lib/mediaitem.py @@ -24,7 +24,7 @@ import logging from PyQt5 import QtCore, QtWidgets from openlp.core.common.i18n import UiStrings, get_natural_key, translate -from openlp.core.common.path import path_to_str, str_to_path +from openlp.core.common.path import path_to_str from openlp.core.common.registry import Registry from openlp.core.common.settings import Settings from openlp.core.lib import ServiceItemContext, build_icon, check_item_selected, create_thumb, validate_thumb @@ -127,7 +127,7 @@ class PresentationMediaItem(MediaManagerItem): """ self.list_view.setIconSize(QtCore.QSize(88, 50)) file_paths = Settings().value(self.settings_section + '/presentations files') - self.load_list([path_to_str(path) for path in file_paths], initial_load=True) + self.load_list(file_paths, initial_load=True) self.populate_display_types() def populate_display_types(self): @@ -158,7 +158,6 @@ class PresentationMediaItem(MediaManagerItem): :param list[openlp.core.common.path.Path] file_paths: List of file paths to add to the media manager. """ - file_paths = [str_to_path(filename) for filename in file_paths] current_paths = self.get_file_list() titles = [file_path.name for file_path in current_paths] self.application.set_busy_cursor() @@ -175,7 +174,7 @@ class PresentationMediaItem(MediaManagerItem): if not file_path.exists(): item_name = QtWidgets.QListWidgetItem(file_name) item_name.setIcon(UiIcons().delete) - item_name.setData(QtCore.Qt.UserRole, path_to_str(file_path)) + item_name.setData(QtCore.Qt.UserRole, file_path) item_name.setToolTip(str(file_path)) self.list_view.addItem(item_name) else: @@ -211,7 +210,7 @@ class PresentationMediaItem(MediaManagerItem): 'This type of presentation is not supported.')) continue item_name = QtWidgets.QListWidgetItem(file_name) - item_name.setData(QtCore.Qt.UserRole, path_to_str(file_path)) + item_name.setData(QtCore.Qt.UserRole, file_path) item_name.setIcon(icon) item_name.setToolTip(str(file_path)) self.list_view.addItem(item_name) @@ -230,8 +229,7 @@ class PresentationMediaItem(MediaManagerItem): self.application.set_busy_cursor() self.main_window.display_progress_bar(len(row_list)) for item in items: - file_path = str_to_path(item.data(QtCore.Qt.UserRole)) - self.clean_up_thumbnails(file_path) + self.clean_up_thumbnails(item.data(QtCore.Qt.UserRole)) self.main_window.increment_progress_bar() self.main_window.finished_progress_bar() for row in row_list: @@ -278,7 +276,7 @@ class PresentationMediaItem(MediaManagerItem): if len(items) > 1: return False if file_path is None: - file_path = str_to_path(items[0].data(QtCore.Qt.UserRole)) + file_path = items[0].data(QtCore.Qt.UserRole) file_type = file_path.suffix.lower()[1:] if not self.display_type_combo_box.currentText(): return False @@ -293,7 +291,7 @@ class PresentationMediaItem(MediaManagerItem): service_item.theme = -1 for bitem in items: if file_path is None: - file_path = str_to_path(bitem.data(QtCore.Qt.UserRole)) + file_path = bitem.data(QtCore.Qt.UserRole) path, file_name = file_path.parent, file_path.name service_item.title = file_name if file_path.exists(): @@ -329,7 +327,7 @@ class PresentationMediaItem(MediaManagerItem): service_item.processor = self.display_type_combo_box.currentText() service_item.add_capability(ItemCapabilities.ProvidesOwnDisplay) for bitem in items: - file_path = str_to_path(bitem.data(QtCore.Qt.UserRole)) + file_path = bitem.data(QtCore.Qt.UserRole) path, file_name = file_path.parent, file_path.name service_item.title = file_name if file_path.exists(): diff --git a/tests/functional/openlp_core/ui/test_thememanager.py b/tests/functional/openlp_core/ui/test_thememanager.py index 757ff3faf..e4a2e7988 100644 --- a/tests/functional/openlp_core/ui/test_thememanager.py +++ b/tests/functional/openlp_core/ui/test_thememanager.py @@ -143,7 +143,7 @@ class TestThemeManager(TestCase): mocked_theme.export_theme.return_value = "{}" # WHEN: Calling _write_theme with a theme with a name with special characters in it - theme_manager._write_theme(mocked_theme, None, None) + theme_manager._write_theme(mocked_theme) # THEN: It should have been created assert os.path.exists(os.path.join(self.temp_folder, 'theme æ„› name', 'theme æ„› name.json')) is True, \ @@ -224,7 +224,7 @@ class TestThemeManager(TestCase): theme_manager = ThemeManager(None) # WHEN: unzip_theme is called - theme_manager.unzip_theme('theme.file', 'folder') + theme_manager.unzip_theme(Path('theme.file'), Path('folder')) # THEN: The critical_error_message_box should have been called assert mocked_critical_error_message_box.call_count == 1, 'Should have been called once' From 1d736a58f5ccff7534d0af3078c2266946a184fa Mon Sep 17 00:00:00 2001 From: Phill Date: Sat, 4 May 2019 13:05:53 +0100 Subject: [PATCH 12/22] Fix up tests --- openlp/core/ui/mainwindow.py | 2 ++ tests/functional/openlp_core/common/test_common.py | 4 ++-- tests/functional/openlp_core/test_app.py | 4 ++-- tests/functional/openlp_core/ui/test_mainwindow.py | 2 +- tests/functional/openlp_plugins/bibles/test_csvimport.py | 3 +-- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 703bdc943..7c26ea9a4 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -1356,6 +1356,8 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, LogMixin, RegistryPropert def open_cmd_line_files(self, args): """ Open files passed in through command line arguments + + :param list[str] args: List of remaining positionall arguments """ for arg in args: file_name = os.path.expanduser(arg) diff --git a/tests/functional/openlp_core/common/test_common.py b/tests/functional/openlp_core/common/test_common.py index 349ad6326..715e66ff6 100644 --- a/tests/functional/openlp_core/common/test_common.py +++ b/tests/functional/openlp_core/common/test_common.py @@ -88,7 +88,7 @@ class TestCommonFunctions(TestCase): extension_loader('glob') # THEN: The `ImportError` should be caught and logged - assert mocked_logger.warning.called + assert mocked_logger.exception.called def test_extension_loader_os_error(self): """ @@ -106,7 +106,7 @@ class TestCommonFunctions(TestCase): extension_loader('glob') # THEN: The `OSError` should be caught and logged - assert mocked_logger.warning.called + assert mocked_logger.exception.called def test_de_hump_conversion(self): """ diff --git a/tests/functional/openlp_core/test_app.py b/tests/functional/openlp_core/test_app.py index 744e98a47..37d7e1647 100644 --- a/tests/functional/openlp_core/test_app.py +++ b/tests/functional/openlp_core/test_app.py @@ -138,7 +138,7 @@ def test_parse_options_file(): assert args.loglevel == 'warning', 'The log level should be set to warning' assert args.no_error_form is False, 'The no_error_form should be set to False' assert args.portable is False, 'The portable flag should be set to false' - assert args.rargs == 'dummy_temp', 'The service file should not be blank' + assert args.rargs == ['dummy_temp'], 'The service file should not be blank' def test_parse_options_file_and_debug(): @@ -155,7 +155,7 @@ def test_parse_options_file_and_debug(): assert args.loglevel == ' debug', 'The log level should be set to debug' assert args.no_error_form is False, 'The no_error_form should be set to False' assert args.portable is False, 'The portable flag should be set to false' - assert args.rargs == 'dummy_temp', 'The service file should not be blank' + assert args.rargs == ['dummy_temp'], 'The service file should not be blank' @skip('Figure out why this is causing a segfault') diff --git a/tests/functional/openlp_core/ui/test_mainwindow.py b/tests/functional/openlp_core/ui/test_mainwindow.py index 1d1929286..817e2272e 100644 --- a/tests/functional/openlp_core/ui/test_mainwindow.py +++ b/tests/functional/openlp_core/ui/test_mainwindow.py @@ -96,7 +96,7 @@ class TestMainWindow(TestCase, TestMixin): # WHEN the argument is processed with patch.object(self.main_window.service_manager, 'load_file') as mocked_load_file: - self.main_window.open_cmd_line_files(service) + self.main_window.open_cmd_line_files([service]) # THEN the service from the arguments is loaded mocked_load_file.assert_called_with(Path(service)) diff --git a/tests/functional/openlp_plugins/bibles/test_csvimport.py b/tests/functional/openlp_plugins/bibles/test_csvimport.py index ca3b933ba..0110db597 100644 --- a/tests/functional/openlp_plugins/bibles/test_csvimport.py +++ b/tests/functional/openlp_plugins/bibles/test_csvimport.py @@ -136,8 +136,7 @@ class TestCSVImport(TestCase): mocked_enter_file = MagicMock() mocked_csv_file.open.return_value.__enter__.return_value = mocked_enter_file - with patch('openlp.plugins.bibles.lib.importers.csvbible.get_file_encoding', - return_value={'encoding': 'utf-8', 'confidence': 0.99}), \ + with patch('openlp.plugins.bibles.lib.importers.csvbible.get_file_encoding', return_value='utf-8'), \ patch('openlp.plugins.bibles.lib.importers.csvbible.csv.reader', return_value=iter(test_data)) as mocked_reader: From 5cb0d2a772d679cec4ae7be6994a60cd1917bb6e Mon Sep 17 00:00:00 2001 From: Phill Date: Sat, 4 May 2019 19:13:57 +0100 Subject: [PATCH 13/22] test fix --- tests/functional/openlp_core/test_server.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/functional/openlp_core/test_server.py b/tests/functional/openlp_core/test_server.py index 2f72e7480..96cf55005 100644 --- a/tests/functional/openlp_core/test_server.py +++ b/tests/functional/openlp_core/test_server.py @@ -22,6 +22,7 @@ from unittest import TestCase from unittest.mock import MagicMock, patch +from openlp.core.common.path import Path from openlp.core.common.registry import Registry from openlp.core.server import Server from tests.helpers.testmixin import TestMixin @@ -83,8 +84,8 @@ class TestServer(TestCase, TestMixin): self.server._on_ready_read() # THEN: the service will be loaded - assert service_manager.on_load_service_clicked.call_count == 1 - service_manager.on_load_service_clicked.assert_called_once_with(file_name) + assert service_manager.load_service.call_count == 1 + service_manager.load_service.assert_called_once_with(Path(file_name)) @patch("PyQt5.QtCore.QTextStream") def test_post_to_server(self, mocked_stream): From 3ee9df96aeee18617e79c064c715a7aa3668eb8c Mon Sep 17 00:00:00 2001 From: Phill Date: Sat, 4 May 2019 19:25:59 +0100 Subject: [PATCH 14/22] PEP8 --- openlp/core/lib/mediamanageritem.py | 1 - openlp/core/ui/servicemanager.py | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py index 0511eeb16..876b70da2 100644 --- a/openlp/core/lib/mediamanageritem.py +++ b/openlp/core/lib/mediamanageritem.py @@ -29,7 +29,6 @@ from PyQt5 import QtCore, QtWidgets from openlp.core.common.i18n import UiStrings, translate from openlp.core.common.mixins import RegistryProperties -from openlp.core.common.path import path_to_str, str_to_path from openlp.core.common.registry import Registry from openlp.core.common.settings import Settings from openlp.core.lib import ServiceItemContext diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 3858e1f48..b18f2f9d8 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -38,7 +38,7 @@ from openlp.core.common.applocation import AppLocation from openlp.core.common.i18n import UiStrings, format_time, translate from openlp.core.common.json import OpenLPJsonDecoder, OpenLPJsonEncoder from openlp.core.common.mixins import LogMixin, RegistryProperties -from openlp.core.common.path import Path, str_to_path +from openlp.core.common.path import Path from openlp.core.common.registry import Registry, RegistryBase from openlp.core.common.settings import Settings from openlp.core.lib import build_icon @@ -433,8 +433,8 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi def on_load_service_clicked(self, checked): """ Handle the `fileOpenItem` action - - :param bool checked: Not used. + + :param bool checked: Not used. :rtype: None """ self.load_service() From a7821bdd268634b348730f171a46a16235af80ec Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 4 May 2019 20:47:06 +0100 Subject: [PATCH 15/22] rename additions to arguments --- openlp/core/common/settings.py | 2 +- openlp/core/ui/media/mediatab.py | 22 +++++++++---------- openlp/core/ui/media/vlcplayer.py | 4 ++-- .../openlp_core/ui/media/test_vlcplayer.py | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/openlp/core/common/settings.py b/openlp/core/common/settings.py index 383434698..8decb9c3f 100644 --- a/openlp/core/common/settings.py +++ b/openlp/core/common/settings.py @@ -211,7 +211,7 @@ class Settings(QtCore.QSettings): 'images/background color': '#000000', 'media/media auto start': QtCore.Qt.Unchecked, 'media/stream command': '', - 'media/vlc additions': '', + 'media/vlc arguments': '', 'remotes/download version': '0.0', 'players/background color': '#000000', 'servicemanager/last directory': None, diff --git a/openlp/core/ui/media/mediatab.py b/openlp/core/ui/media/mediatab.py index 547188ed1..ac4e66f42 100644 --- a/openlp/core/ui/media/mediatab.py +++ b/openlp/core/ui/media/mediatab.py @@ -74,14 +74,14 @@ class MediaTab(SettingsTab): self.stream_edit = QtWidgets.QLabel(self) self.stream_media_layout.addWidget(self.stream_edit) self.left_layout.addWidget(self.stream_media_group_box) - self.vlc_additions_group_box = QtWidgets.QGroupBox(self.left_column) - self.vlc_additions_group_box.setObjectName('vlc_additions_group_box') - self.vlc_additions_layout = QtWidgets.QHBoxLayout(self.vlc_additions_group_box) - self.vlc_additions_layout.setObjectName('vlc_additions_layout') - self.vlc_additions_layout.setContentsMargins(0, 0, 0, 0) - self.vlc_additions_edit = QtWidgets.QPlainTextEdit(self) - self.vlc_additions_layout.addWidget(self.vlc_additions_edit) - self.left_layout.addWidget(self.vlc_additions_group_box) + self.vlc_arguments_group_box = QtWidgets.QGroupBox(self.left_column) + self.vlc_arguments_group_box.setObjectName('vlc_arguments_group_box') + self.vlc_arguments_layout = QtWidgets.QHBoxLayout(self.vlc_arguments_group_box) + self.vlc_arguments_layout.setObjectName('vlc_arguments_layout') + self.vlc_arguments_layout.setContentsMargins(0, 0, 0, 0) + self.vlc_arguments_edit = QtWidgets.QPlainTextEdit(self) + self.vlc_arguments_layout.addWidget(self.vlc_arguments_edit) + self.left_layout.addWidget(self.vlc_arguments_group_box) self.left_layout.addStretch() self.right_layout.addStretch() # # Signals and slots @@ -92,7 +92,7 @@ class MediaTab(SettingsTab): """ self.live_media_group_box.setTitle(translate('MediaPlugin.MediaTab', 'Live Media')) self.stream_media_group_box.setTitle(translate('MediaPlugin.MediaTab', 'Stream Media Command')) - self.vlc_additions_group_box.setTitle(translate('MediaPlugin.MediaTab', 'VLC additional commands')) + self.vlc_arguments_group_box.setTitle(translate('MediaPlugin.MediaTab', 'VLC arguments')) self.auto_start_check_box.setText(translate('MediaPlugin.MediaTab', 'Start Live items automatically')) def load(self): @@ -108,7 +108,7 @@ class MediaTab(SettingsTab): self.stream_edit.setText(WIN_STREAM) else: self.stream_edit.setText(OSX_STREAM) - self.vlc_additions_edit.setPlainText(Settings().value(self.settings_section + '/vlc additions')) + self.vlc_arguments_edit.setPlainText(Settings().value(self.settings_section + '/vlc arguments')) if Settings().value('advanced/experimental'): for cam in QCameraInfo.availableCameras(): log.debug(cam.deviceName()) @@ -124,7 +124,7 @@ class MediaTab(SettingsTab): if Settings().value(setting_key) != self.auto_start_check_box.checkState(): Settings().setValue(setting_key, self.auto_start_check_box.checkState()) Settings().setValue(self.settings_section + '/stream command', self.stream_edit.text()) - Settings().setValue(self.settings_section + '/vlc additions', self.vlc_additions_edit.toPlainText()) + Settings().setValue(self.settings_section + '/vlc arguments', self.vlc_arguments_edit.toPlainText()) def post_set_up(self, post_update=False): """ diff --git a/openlp/core/ui/media/vlcplayer.py b/openlp/core/ui/media/vlcplayer.py index c8bf70229..bd82ef14f 100644 --- a/openlp/core/ui/media/vlcplayer.py +++ b/openlp/core/ui/media/vlcplayer.py @@ -167,8 +167,8 @@ class VlcPlayer(MediaPlayer): command_line_options = '--no-video-title-show ' if Settings().value('advanced/hide mouse') and live_display: command_line_options += '--mouse-hide-timeout=0 ' - if Settings().value('media/vlc additions'): - command_line_options += Settings().value('media/vlc additions') + if Settings().value('media/vlc arguments'): + command_line_options += Settings().value('media/vlc arguments') output_display.vlc_instance = vlc.Instance(command_line_options) # creating an empty vlc media player output_display.vlc_media_player = output_display.vlc_instance.media_player_new() diff --git a/tests/functional/openlp_core/ui/media/test_vlcplayer.py b/tests/functional/openlp_core/ui/media/test_vlcplayer.py index 00f999310..08e17377b 100644 --- a/tests/functional/openlp_core/ui/media/test_vlcplayer.py +++ b/tests/functional/openlp_core/ui/media/test_vlcplayer.py @@ -151,7 +151,7 @@ class TestVLCPlayer(TestCase, TestMixin): assert mocked_output_display.vlc_widget == mocked_qframe mocked_qframe.setFrameStyle.assert_called_with(1) mocked_settings.value.assert_any_call('advanced/hide mouse') - mocked_settings.value.assert_any_call('media/vlc additions') + mocked_settings.value.assert_any_call('media/vlc arguments') mocked_vlc.Instance.assert_called_with('--no-video-title-show ') assert mocked_output_display.vlc_instance == mocked_instance mocked_instance.media_player_new.assert_called_with() From 855828939f27bdc1a20e0636d365258a768ed409 Mon Sep 17 00:00:00 2001 From: Ken Roberts Date: Sat, 4 May 2019 21:08:32 -0700 Subject: [PATCH 16/22] PJLink2 update v06 --- openlp/core/projectors/pjlink.py | 54 +- openlp/core/projectors/pjlinkcommands.py | 46 +- .../projectors/test_projector_commands_01.py | 12 +- .../projectors/test_projector_commands_02.py | 708 ++++++++++-------- ...ds_02.py => test_projector_commands_03.py} | 0 .../test_projector_pjlink_base_02.py | 31 - .../test_projector_pjlink_cmd_routing.py | 20 +- 7 files changed, 465 insertions(+), 406 deletions(-) rename tests/openlp_core/projectors/{test_projector_pjlink_commands_02.py => test_projector_commands_03.py} (100%) diff --git a/openlp/core/projectors/pjlink.py b/openlp/core/projectors/pjlink.py index 5aa6f2b20..9859b2825 100644 --- a/openlp/core/projectors/pjlink.py +++ b/openlp/core/projectors/pjlink.py @@ -520,14 +520,23 @@ class PJLink(QtNetwork.QTcpSocket): self.send_busy = False return # Although we have a packet length limit, go ahead and use a larger buffer - read = self.readLine(1024) - log.debug('({ip}) get_socket(): "{buff}"'.format(ip=self.entry.name, buff=read)) - if read == -1: + self.socket_timer.start() + while self.bytesAvailable() >= 1: + data = self.readLine(1024) + data = data.strip() + if not data: + log.warning('({ip}) get_socket(): Ignoring empty packet'.format(ip=self.entry.name)) + if self.bytesAvailable() < 1: + break + + self.socket_timer.stop() + if data: + log.debug('({ip}) get_socket(): "{buff}"'.format(ip=self.entry.name, buff=data)) + if data == -1: # No data available log.debug('({ip}) get_socket(): No data available (-1)'.format(ip=self.entry.name)) - return self.receive_data_signal() - self.socket_timer.stop() - return self.get_data(buff=read) + return + return self.get_data(buff=data) def get_data(self, buff, *args, **kwargs): """ @@ -540,21 +549,22 @@ class PJLink(QtNetwork.QTcpSocket): # NOTE: Class2 has changed to some values being UTF-8 data_in = decode(buff, 'utf-8') if isinstance(buff, bytes) else buff data = data_in.strip() + self.receive_data_signal() # Initial packet checks if (len(data) < 7): self._trash_buffer(msg='get_data(): Invalid packet - length') - return self.receive_data_signal() + return elif len(data) > self.max_size: self._trash_buffer(msg='get_data(): Invalid packet - too long ({length} bytes)'.format(length=len(data))) - return self.receive_data_signal() + return elif not data.startswith(PJLINK_PREFIX): self._trash_buffer(msg='get_data(): Invalid packet - PJLink prefix missing') - return self.receive_data_signal() + return elif data[6] != '=' and data[8] != '=': # data[6] = standard command packet # data[8] = initial PJLink connection (after mangling) self._trash_buffer(msg='get_data(): Invalid reply - Does not have "="') - return self.receive_data_signal() + return log.debug('({ip}) get_data(): Checking new data "{data}"'.format(ip=self.entry.name, data=data)) header, data = data.split('=') log.debug('({ip}) get_data() header="{header}" data="{data}"'.format(ip=self.entry.name, @@ -572,20 +582,20 @@ class PJLink(QtNetwork.QTcpSocket): data=data)) if cmd not in PJLINK_VALID_CMD: self._trash_buffer('get_data(): Invalid packet - unknown command "{data}"'.format(data=cmd)) - return self.receive_data_signal() + return elif version not in PJLINK_VALID_CMD[cmd]['version']: self._trash_buffer(msg='get_data() Command reply version does not match a valid command version') - return self.receive_data_signal() + return elif int(self.pjlink_class) < int(version): if not ignore_class: log.warning('({ip}) get_data(): Projector returned class reply higher ' 'than projector stated class'.format(ip=self.entry.name)) - return self.receive_data_signal() + return chk = process_command(self, cmd, data) if chk is None: # Command processed normally and not initial connection, so skip other checks - return self.receive_data_signal() + return # PJLink initial connection checks elif chk == S_DATA_OK: # Previous command returned OK @@ -612,7 +622,7 @@ class PJLink(QtNetwork.QTcpSocket): self.projectorAuthentication.emit(self.entry.name) self.change_status(status=E_AUTHENTICATION) - return self.receive_data_signal() + return @QtCore.pyqtSlot(QtNetwork.QAbstractSocket.SocketError) def get_error(self, err): @@ -728,17 +738,17 @@ class PJLink(QtNetwork.QTcpSocket): log.debug('({ip}) _send_command(): Normal queue = {data}'.format(ip=self.entry.name, data=self.send_queue)) return - if len(self.priority_queue) != 0: - out = self.priority_queue.pop(0) - log.debug('({ip}) _send_command(): Getting priority queued packet'.format(ip=self.entry.name)) - elif len(self.send_queue) != 0: - out = self.send_queue.pop(0) - log.debug('({ip}) _send_command(): Getting normal queued packet'.format(ip=self.entry.name)) - else: + if not self.priority_queue and not self.send_queue: # No data to send log.warning('({ip}) _send_command(): No data to send'.format(ip=self.entry.name)) self.send_busy = False return + elif self.priority_queue: + out = self.priority_queue.pop(0) + log.debug('({ip}) _send_command(): Getting priority queued packet'.format(ip=self.entry.name)) + elif self.send_queue: + out = self.send_queue.pop(0) + log.debug('({ip}) _send_command(): Getting normal queued packet'.format(ip=self.entry.name)) self.send_busy = True log.debug('({ip}) _send_command(): Sending "{data}"'.format(ip=self.entry.name, data=out.strip())) self.socket_timer.start() diff --git a/openlp/core/projectors/pjlinkcommands.py b/openlp/core/projectors/pjlinkcommands.py index 6df155db1..1a3b416d7 100644 --- a/openlp/core/projectors/pjlinkcommands.py +++ b/openlp/core/projectors/pjlinkcommands.py @@ -153,14 +153,14 @@ def process_clss(projector, data): # fix the class reply is to just remove all non-digit characters. chk = re.findall(r'\d', data) if len(chk) < 1: - log.error('({ip}) No numbers found in class version reply "{data}" - ' - 'defaulting to class "1"'.format(ip=projector.entry.name, data=data)) + log.warning('({ip}) No numbers found in class version reply "{data}" - ' + 'defaulting to class "1"'.format(ip=projector.entry.name, data=data)) clss = '1' else: clss = chk[0] # Should only be the first match elif not data.isdigit(): - log.error('({ip}) NAN CLSS version reply "{data}" - ' - 'defaulting to class "1"'.format(ip=projector.entry.name, data=data)) + log.warning('({ip}) NAN CLSS version reply "{data}" - ' + 'defaulting to class "1"'.format(ip=projector.entry.name, data=data)) clss = '1' else: clss = data @@ -282,12 +282,13 @@ def process_inpt(projector, data): if projector.source_available is not None: # We have available inputs, so verify it's in the list if data not in projector.source_available: - log.warn('({ip}) Input source not listed in available sources - ignoring'.format(ip=projector.entry.name)) + log.warning('({ip}) Input source not listed in available sources - ' + 'ignoring'.format(ip=projector.entry.name)) return elif data not in PJLINK_DEFAULT_CODES: # Hmm - no sources available yet, so check with PJLink defaults - log.warn('({ip}) Input source not listed as a PJLink available source ' - '- ignoring'.format(ip=projector.entry.name)) + log.warning('({ip}) Input source not listed as a PJLink valid source ' + '- ignoring'.format(ip=projector.entry.name)) return projector.source = data log.debug('({ip}) Setting current source to "{data}"'.format(ip=projector.entry.name, data=projector.source)) @@ -326,7 +327,10 @@ def process_lamp(projector, data): lamps = [] lamp_list = data.split() if len(lamp_list) < 2: - lamps.append({'Hours': int(lamp_list[0]), 'On': None}) + # Invalid data - not enough information + log.warning('({ip}) process_lamp(): Invalid data "{data}" - ' + 'Missing data'.format(ip=projector.entry.name, data=data)) + return else: while lamp_list: if not lamp_list[0].isnumeric() or not lamp_list[1].isnumeric(): @@ -411,20 +415,22 @@ def process_powr(projector, data): :param projector: Projector instance :param data: Power status """ - log.debug('({ip}: Processing POWR command'.format(ip=projector.entry.name)) - if data in PJLINK_POWR_STATUS: - power = PJLINK_POWR_STATUS[data] - update_icons = projector.power != power - projector.power = power - projector.change_status(PJLINK_POWR_STATUS[data]) - if update_icons: - projector.projectorUpdateIcons.emit() - # Update the input sources available - if power == S_ON: - projector.send_command('INST') - else: + log.debug('({ip}) Processing POWR command'.format(ip=projector.entry.name)) + if data not in PJLINK_POWR_STATUS: # Log unknown status response log.warning('({ip}) Unknown power response: "{data}"'.format(ip=projector.entry.name, data=data)) + return + + power = PJLINK_POWR_STATUS[data] + update_icons = projector.power != power + if update_icons: + projector.power = power + projector.change_status(PJLINK_POWR_STATUS[data]) + projector.projectorUpdateIcons.emit() + if power == S_ON: + # Input sources list should only be available after power on, so update here + projector.send_command('INST') + if projector.power in [S_ON, S_STANDBY, S_OFF] and 'POWR' in projector.status_timer_checks: projector.status_timer_delete(cmd='POWR') return diff --git a/tests/openlp_core/projectors/test_projector_commands_01.py b/tests/openlp_core/projectors/test_projector_commands_01.py index 64fa4c1fc..07e283031 100644 --- a/tests/openlp_core/projectors/test_projector_commands_01.py +++ b/tests/openlp_core/projectors/test_projector_commands_01.py @@ -246,8 +246,8 @@ class TestPJLinkCommands(TestCase): Test CLSS reply has no class number """ # GIVEN: Test setup - log_error_calls = [call('({ip}) NAN CLSS version reply "Z" - ' - 'defaulting to class "1"'.format(ip=self.pjlink.name))] + log_warning_calls = [call('({ip}) NAN CLSS version reply "Z" - ' + 'defaulting to class "1"'.format(ip=self.pjlink.name))] log_debug_calls = [call('({ip}) Processing command "CLSS" with data "Z"'.format(ip=self.pjlink.name)), call('({ip}) Calling function for CLSS'.format(ip=self.pjlink.name)), call('({ip}) Setting pjlink_class for this projector to "1"'.format(ip=self.pjlink.name))] @@ -257,7 +257,7 @@ class TestPJLinkCommands(TestCase): # THEN: Projector class should be set with default value assert (self.pjlink.pjlink_class == '1'), 'Invalid NaN class reply should have set class=1' - mock_log.error.assert_has_calls(log_error_calls) + mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @patch.object(openlp.core.projectors.pjlinkcommands, 'log') @@ -266,8 +266,8 @@ class TestPJLinkCommands(TestCase): Test CLSS reply has no class number """ # GIVEN: Test object - log_error_calls = [call('({ip}) No numbers found in class version reply "Invalid" ' - '- defaulting to class "1"'.format(ip=self.pjlink.name))] + log_warning_calls = [call('({ip}) No numbers found in class version reply "Invalid" ' + '- defaulting to class "1"'.format(ip=self.pjlink.name))] log_debug_calls = [call('({ip}) Processing command "CLSS" with data "Invalid"'.format(ip=self.pjlink.name)), call('({ip}) Calling function for CLSS'.format(ip=self.pjlink.name)), call('({ip}) Setting pjlink_class for this projector to "1"'.format(ip=self.pjlink.name))] @@ -277,7 +277,7 @@ class TestPJLinkCommands(TestCase): # THEN: Projector class should be set with default value assert (self.pjlink.pjlink_class == '1'), 'Invalid class reply should have set class=1' - mock_log.error.assert_has_calls(log_error_calls) + mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @patch.object(openlp.core.projectors.pjlinkcommands, 'log') diff --git a/tests/openlp_core/projectors/test_projector_commands_02.py b/tests/openlp_core/projectors/test_projector_commands_02.py index f483269a8..e112c27c9 100644 --- a/tests/openlp_core/projectors/test_projector_commands_02.py +++ b/tests/openlp_core/projectors/test_projector_commands_02.py @@ -22,7 +22,7 @@ """ Package to test the openlp.core.projectors.pjlink commands package. """ -from unittest import TestCase, skip +from unittest import TestCase from unittest.mock import call, patch import openlp.core.projectors.pjlink @@ -49,428 +49,502 @@ class TestPJLinkCommands(TestCase): """ del(self.pjlink) - @skip('Needs update to new setup') - def test_projector_process_inpt_valid(self): + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_inpt_good(self, mock_log): """ Test input source status shows current input """ # GIVEN: Test object - with patch.object(openlp.core.projectors.pjlink, 'log') as mock_log: - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.source = '11' - log_debug_calls = [call('({ip}) reset_information() connect status is ' - 'S_NOT_CONNECTED'.format(ip=pjlink.name))] - chk_source_available = ['11', '12', '21', '22', '31', '32'] - pjlink.source_available = chk_source_available + self.pjlink.source = '11' + log_warning_calls = [] + log_debug_calls = [call('({ip}) Processing command "INPT" with data "21"'.format(ip=self.pjlink.name)), + call('({ip}) Calling function for INPT'.format(ip=self.pjlink.name)), + call('({ip}) Setting current source to "21"'.format(ip=self.pjlink.name))] + chk_source_available = ['11', '12', '21', '22', '31', '32'] + self.pjlink.source_available = chk_source_available - # WHEN: Called with input source - process_command(projector=self.pjlink, cmd='INPT', data='21') + # WHEN: Called with input source + process_command(projector=self.pjlink, cmd='INPT', data='21') - # THEN: Input selected should reflect current input - assert pjlink.source == '21', 'Input source should be set to "21"' - mock_log.debug.assert_has_calls(log_debug_calls) + # THEN: Input selected should reflect current input + assert ('21' == self.pjlink.source), 'Input source should be set to "21"' + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) - @skip('Needs update to new setup') - def test_projector_process_input_not_in_list(self): + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_inpt_invalid(self, mock_log): """ - Test setting input outside of available inputs - - TODO: Future test + Test input source returned not valid according to standard """ - pass + # GIVEN: Test object + log_warning_calls = [call('({ip}) Input source not listed as a PJLink valid source - ' + 'ignoring'.format(ip=self.pjlink.name))] + log_debug_calls = [call('({ip}) Processing command "INPT" with data "91"'.format(ip=self.pjlink.name)), + call('({ip}) Calling function for INPT'.format(ip=self.pjlink.name))] + self.pjlink.source = None + self.pjlink.source_available = None - @skip('Needs update to new setup') - def test_projector_process_input_not_in_default(self): - """ - Test setting input with no sources available - TODO: Future test - """ - pass + # WHEN: Called with input source + process_command(projector=self.pjlink, cmd='INPT', data='91') - @skip('Needs update to new setup') - def test_projector_process_input_invalid(self): - """ - Test setting input with an invalid value + # THEN: Input selected should reflect current input + assert (not self.pjlink.source), 'Input source should not have changed' + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) - TODO: Future test + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_inpt_not_in_list(self, mock_log): """ + Test input source not listed in available sources + """ + # GIVEN: Test object + log_warning_calls = [call('({ip}) Input source not listed in available sources - ' + 'ignoring'.format(ip=self.pjlink.name))] + log_debug_calls = [call('({ip}) Processing command "INPT" with data "25"'.format(ip=self.pjlink.name)), + call('({ip}) Calling function for INPT'.format(ip=self.pjlink.name))] + self.pjlink.source = '11' + chk_source_available = ['11', '12', '21', '22', '31', '32'] + self.pjlink.source_available = chk_source_available - @skip('Needs update to new setup') - def test_projector_process_inst_class_1(self): + # WHEN: Called with input source + process_command(projector=self.pjlink, cmd='INPT', data='25') + + # THEN: Input selected should reflect current input + assert ('11' == self.pjlink.source), 'Input source should not have changed' + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_inst_class_1(self, mock_log): """ Test saving video source available information """ # GIVEN: Test object - with patch.object(openlp.core.projectors.pjlink, 'log') as mock_log: - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.source_available = [] - log_debug_calls = [call('({ip}) reset_information() connect status is ' - 'S_NOT_CONNECTED'.format(ip=pjlink.name)), - call('({ip}) Setting projector source_available to ' - '"[\'11\', \'12\', \'21\', \'22\', \'31\', \'32\']"'.format(ip=pjlink.name))] + self.pjlink.source_available = [] + log_warning_calls = [] + log_debug_calls = [call('({ip}) Processing command "INST" with data ' + '"21 12 11 22 32 31"'.format(ip=self.pjlink.name)), + call('({ip}) Calling function for INST'.format(ip=self.pjlink.name)), + call('({ip}) Setting projector source_available to ' + '"[\'11\', \'12\', \'21\', \'22\', \'31\', \'32\']"'.format(ip=self.pjlink.name))] - chk_data = '21 12 11 22 32 31' # Although they should already be sorted, use unsorted to verify method - chk_test = ['11', '12', '21', '22', '31', '32'] + chk_data = '21 12 11 22 32 31' # Although they should already be sorted, use unsorted to check method + chk_test = ['11', '12', '21', '22', '31', '32'] - # WHEN: process_inst called with test data - pjlink.process_inst(data=chk_data) + # WHEN: process_inst called with test data + process_command(projector=self.pjlink, cmd='INST', data=chk_data) - # THEN: Data should have been sorted and saved properly - assert pjlink.source_available == chk_test, "Sources should have been sorted and saved" - mock_log.debug.assert_has_calls(log_debug_calls) + # THEN: Data should have been sorted and saved properly + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + assert (self.pjlink.source_available == chk_test), "Sources should have been sorted and saved" - @skip('Needs update to new setup') - def test_projector_process_lamp_invalid(self): - """ - Test status multiple lamp on/off and hours - """ - # GIVEN: Test object - with patch.object(openlp.core.projectors.pjlink, 'log') as mock_log: - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.lamp = [{'Hours': 00000, 'On': True}, - {'Hours': 11111, 'On': False}] - log_data = [call('({ip}) process_lamp(): Invalid data "11111 1 22222 0 333A3 1"'.format(ip=pjlink.name))] - - # WHEN: Call process_command with invalid lamp data - pjlink.process_lamp('11111 1 22222 0 333A3 1') - - # THEN: lamps should not have changed - assert 2 == len(pjlink.lamp), 'Projector should have kept 2 lamps specified' - assert pjlink.lamp[0]['On'] is True, 'Lamp 1 power status should have stayed TRUE' - assert 00000 == pjlink.lamp[0]['Hours'], 'Lamp 1 hours should have been left at 00000' - assert pjlink.lamp[1]['On'] is False, 'Lamp 2 power status should have stayed FALSE' - assert 11111 == pjlink.lamp[1]['Hours'], 'Lamp 2 hours should have been left at 11111' - mock_log.warning.assert_has_calls(log_data) - - @skip('Needs update to new setup') - def test_projector_process_lamp_multiple(self): - """ - Test status multiple lamp on/off and hours - """ - # GIVEN: Test object - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.lamp = [] - - # WHEN: Call process_command with invalid lamp data - pjlink.process_lamp('11111 1 22222 0 33333 1') - - # THEN: Lamp should have been set with proper lamp status - assert 3 == len(pjlink.lamp), 'Projector should have 3 lamps specified' - assert pjlink.lamp[0]['On'] is True, 'Lamp 1 power status should have been set to TRUE' - assert 11111 == pjlink.lamp[0]['Hours'], 'Lamp 1 hours should have been set to 11111' - assert pjlink.lamp[1]['On'] is False, 'Lamp 2 power status should have been set to FALSE' - assert 22222 == pjlink.lamp[1]['Hours'], 'Lamp 2 hours should have been set to 22222' - assert pjlink.lamp[2]['On'] is True, 'Lamp 3 power status should have been set to TRUE' - assert 33333 == pjlink.lamp[2]['Hours'], 'Lamp 3 hours should have been set to 33333' - - @skip('Needs update to new setup') - def test_projector_process_lamp_single(self): - """ - Test status lamp on/off and hours - """ - - # GIVEN: Test object - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.lamp = [] - - # WHEN: Call process_command with invalid lamp data - pjlink.process_lamp('22222 1') - - # THEN: Lamp should have been set with status=ON and hours=22222 - assert 1 == len(pjlink.lamp), 'Projector should have only 1 lamp' - assert pjlink.lamp[0]['On'] is True, 'Lamp power status should have been set to TRUE' - assert 22222 == pjlink.lamp[0]['Hours'], 'Lamp hours should have been set to 22222' - - @skip('Needs update to new setup') - def test_projector_process_lamp_single_hours_only(self): + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_lamp_invalid_missing_data(self, mock_log): """ Test process lamp with 1 lamp reply hours only and no on/off status """ # GIVEN: Test object - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.lamp = [] + log_warning_calls = [call('({ip}) process_lamp(): Invalid data "45" - ' + 'Missing data'.format(ip=self.pjlink.name))] + log_debug_calls = [call('({ip}) Processing command "LAMP" with data "45"'.format(ip=self.pjlink.name)), + call('({ip}) Calling function for LAMP'.format(ip=self.pjlink.name))] + self.pjlink.lamp = None - # WHEN: Process lamp command called with only hours and no lamp power state - pjlink.process_lamp("45") + # WHEN: Call process_command with 3 lamps + process_command(projector=self.pjlink, cmd='LAMP', data='45') - # THEN: Lamp should show hours as 45 and lamp power as Unavailable - assert 1 == len(pjlink.lamp), 'There should only be 1 lamp available' - assert 45 == pjlink.lamp[0]['Hours'], 'Lamp hours should have equalled 45' - assert pjlink.lamp[0]['On'] is None, 'Lamp power should be "None"' + # THEN: Lamp should have been set with proper lamp status + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + assert (not self.pjlink.lamp), 'Projector lamp info should not have changed' - @skip('Needs update to new setup') - def test_projector_process_name(self): + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_lamp_invalid_nan(self, mock_log): + """ + Test status multiple lamp on/off and hours + """ + # GIVEN: Test object + self.pjlink.lamp = [{'Hours': 00000, 'On': True}, + {'Hours': 11111, 'On': False}] + log_warning_calls = [call('({ip}) process_lamp(): Invalid data "11111 1 22222 0 ' + '333A3 1"'.format(ip=self.pjlink.name))] + log_debug_calls = [call('({ip}) Processing command "LAMP" with data "11111 1 22222 0 ' + '333A3 1"'.format(ip=self.pjlink.name)), + call('({ip}) Calling function for LAMP'.format(ip=self.pjlink.name))] + + # WHEN: Call process_command with invalid lamp data + process_command(projector=self.pjlink, cmd='LAMP', data='11111 1 22222 0 333A3 1') + + # THEN: lamps should not have changed + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + assert (2 == len(self.pjlink.lamp)), 'Projector lamp list should not have changed' + assert self.pjlink.lamp[0]['On'], 'Lamp 1 power status should not have changed' + assert (0 == self.pjlink.lamp[0]['Hours']), 'Lamp 1 hours should not have changed' + assert (not self.pjlink.lamp[1]['On']), 'Lamp 2 power status should not have changed' + assert (11111 == self.pjlink.lamp[1]['Hours']), 'Lamp 2 hours should not have changed' + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_lamp_multiple(self, mock_log): + """ + Test status multiple lamp on/off and hours + """ + # GIVEN: Test object + log_warning_calls = [] + log_debug_calls = [call('({ip}) Processing command "LAMP" with data "11111 1 22222 0 ' + '33333 1"'.format(ip=self.pjlink.name)), + call('({ip}) Calling function for LAMP'.format(ip=self.pjlink.name))] + self.pjlink.lamp = None + + # WHEN: Call process_command with 3 lamps + process_command(projector=self.pjlink, cmd='LAMP', data='11111 1 22222 0 33333 1') + + # THEN: Lamp should have been set with proper lamp status + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + assert (3 == len(self.pjlink.lamp)), 'Projector should have 3 lamps specified' + assert self.pjlink.lamp[0]['On'], 'Lamp 1 power status should have been set to TRUE' + assert (11111 == self.pjlink.lamp[0]['Hours']), 'Lamp 1 hours should have been set to 11111' + assert (not self.pjlink.lamp[1]['On']), 'Lamp 2 power status should have been set to FALSE' + assert (22222 == self.pjlink.lamp[1]['Hours']), 'Lamp 2 hours should have been set to 22222' + assert self.pjlink.lamp[2]['On'], 'Lamp 3 power status should have been set to TRUE' + assert (33333 == self.pjlink.lamp[2]['Hours']), 'Lamp 3 hours should have been set to 33333' + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_lamp_single(self, mock_log): + """ + Test status lamp on/off and hours + """ + # GIVEN: Test object + log_warning_calls = [] + log_debug_calls = [call('({ip}) Processing command "LAMP" with data "11111 1"'.format(ip=self.pjlink.name)), + call('({ip}) Calling function for LAMP'.format(ip=self.pjlink.name))] + self.pjlink.lamp = None + + # WHEN: Call process_command with 3 lamps + process_command(projector=self.pjlink, cmd='LAMP', data='11111 1') + + # THEN: Lamp should have been set with proper lamp status + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + assert (1 == len(self.pjlink.lamp)), 'Projector should have 1 lamp specified' + assert self.pjlink.lamp[0]['On'], 'Lamp 1 power status should have been set to TRUE' + assert (11111 == self.pjlink.lamp[0]['Hours']), 'Lamp 1 hours should have been set to 11111' + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_name(self, mock_log): """ Test saving NAME data from projector """ # GIVEN: Test object - with patch.object(openlp.core.projectors.pjlink, 'log') as mock_log: - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - chk_data = "Some Name the End-User Set IN Projector" - log_debug_calls = [call('({ip}) Setting projector PJLink name to ' - '"Some Name the End-User Set IN Projector"'.format(ip=pjlink.name))] + chk_data = "Some Name the End-User Set IN Projector" + log_warning_calls = [] + log_debug_calls = [call('({ip}) Processing command "NAME" with data ' + '"Some Name the End-User Set IN Projector"'.format(ip=self.pjlink.name)), + call('({ip}) Calling function for NAME'.format(ip=self.pjlink.name)), + call('({ip}) Setting projector PJLink name to ' + '"Some Name the End-User Set IN Projector"'.format(ip=self.pjlink.name))] - # WHEN: process_name called with test data - pjlink.process_name(data=chk_data) + # WHEN: process_name called with test data + process_command(projector=self.pjlink, cmd='NAME', data=chk_data) - # THEN: name should be set and logged - assert pjlink.pjlink_name == chk_data, 'Name test data should have been saved' - mock_log.debug.assert_has_calls(log_debug_calls) + # THEN: name should be set and logged + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + assert (self.pjlink.pjlink_name == chk_data), 'Name test data should have been saved' - @skip('Needs update to new setup') - def test_projector_process_powr_on(self): - """ - Test status power to ON - """ - # GIVEN: Test object - with patch.object(openlp.core.projectors.pjlink.PJLink, 'send_command') as mock_send_command, \ - patch.object(openlp.core.projectors.pjlink.PJLink, 'change_status') as mock_change_status, \ - patch.object(openlp.core.projectors.pjlink.PJLink, 'projectorUpdateIcons') as mock_UpdateIcons: - - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.power = S_STANDBY - - # WHEN: process_name called with test data - pjlink.process_powr(data=PJLINK_POWR_STATUS[S_ON]) - - # THEN: Power should be set to ON - assert pjlink.power == S_ON, 'Power should have been set to ON' - assert mock_UpdateIcons.emit.called is True, 'projectorUpdateIcons should have been called' - mock_send_command.assert_called_once_with('INST') - mock_change_status.assert_called_once_with(S_ON) - - @skip('Needs update to new setup') - def test_projector_process_powr_invalid(self): + @patch.object(openlp.core.projectors.pjlink.PJLink, 'send_command') + @patch.object(openlp.core.projectors.pjlink.PJLink, 'change_status') + @patch.object(openlp.core.projectors.pjlink.PJLink, 'projectorUpdateIcons') + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_powr_invalid(self, mock_log, mock_UpdateIcons, mock_change_status, mock_send_command): """ Test process_powr invalid call """ # GIVEN: Test object - with patch.object(openlp.core.projectors.pjlink, 'log') as mock_log, \ - patch.object(openlp.core.projectors.pjlink.PJLink, 'send_command') as mock_send_command, \ - patch.object(openlp.core.projectors.pjlink.PJLink, 'change_status') as mock_change_status, \ - patch.object(openlp.core.projectors.pjlink.PJLink, 'projectorUpdateIcons') as mock_UpdateIcons: + self.pjlink.power = S_STANDBY + log_warning_calls = [call('({ip}) Unknown power response: "99"'.format(ip=self.pjlink.name))] + log_debug_calls = [call('({ip}) Processing command "POWR" with data "99"'.format(ip=self.pjlink.name)), + call('({ip}) Calling function for POWR'.format(ip=self.pjlink.name)), + call('({ip}) Processing POWR command'.format(ip=self.pjlink.name))] - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.power = S_STANDBY - log_warn_calls = [call('({ip}) Unknown power response: "99"'.format(ip=pjlink.name))] + # WHEN: process_command called with test data + process_command(projector=self.pjlink, cmd='POWR', data='99') - # WHEN: process_name called with test data - pjlink.process_powr(data='99') + # THEN: Projector power should not have changed + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + assert (S_STANDBY == self.pjlink.power), 'Power should not have changed' + mock_UpdateIcons.emit.assert_not_called() + mock_change_status.assert_not_called() + mock_send_command.assert_not_called() - # THEN: Power should be set to ON - assert pjlink.power == S_STANDBY, 'Power should not have changed' - mock_UpdateIcons.emit.assert_not_called() - mock_change_status.assert_not_called() - mock_send_command.assert_not_called() - mock_log.warning.assert_has_calls(log_warn_calls) - - @skip('Needs update to new setup') - def test_projector_process_powr_off(self): + @patch.object(openlp.core.projectors.pjlink.PJLink, 'send_command') + @patch.object(openlp.core.projectors.pjlink.PJLink, 'change_status') + @patch.object(openlp.core.projectors.pjlink.PJLink, 'projectorUpdateIcons') + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_powr_off(self, mock_log, mock_UpdateIcons, mock_change_status, mock_send_command): """ - Test status power to STANDBY + Test status power to OFF """ # GIVEN: Test object - with patch.object(openlp.core.projectors.pjlink.PJLink, 'send_command') as mock_send_command, \ - patch.object(openlp.core.projectors.pjlink.PJLink, 'change_status') as mock_change_status, \ - patch.object(openlp.core.projectors.pjlink.PJLink, 'projectorUpdateIcons') as mock_UpdateIcons: + log_warning_calls = [] + log_debug_calls = [call('({ip}) Processing command "POWR" with data "0"'.format(ip=self.pjlink.name)), + call('({ip}) Calling function for POWR'.format(ip=self.pjlink.name)), + call('({ip}) Processing POWR command'.format(ip=self.pjlink.name))] + self.pjlink.power = S_ON - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.power = S_ON + # WHEN: process_name called with test data + process_command(projector=self.pjlink, cmd='POWR', data=PJLINK_POWR_STATUS[S_STANDBY]) - # WHEN: process_name called with test data - pjlink.process_powr(data=PJLINK_POWR_STATUS[S_STANDBY]) + # THEN: Power should be set to ON + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + assert (S_STANDBY == self.pjlink.power), 'Power should have been set to OFF' + assert mock_UpdateIcons.emit.called, 'projectorUpdateIcons should have been called' + assert (not mock_send_command.called), 'send_command should not have been called' + mock_change_status.assert_called_once_with(S_STANDBY) - # THEN: Power should be set to ON - assert pjlink.power == S_STANDBY, 'Power should have changed to S_STANDBY' - mock_UpdateIcons.emit.assert_called_with() - mock_change_status.assert_called_with(313) - mock_send_command.assert_not_called() + @patch.object(openlp.core.projectors.pjlink.PJLink, 'send_command') + @patch.object(openlp.core.projectors.pjlink.PJLink, 'change_status') + @patch.object(openlp.core.projectors.pjlink.PJLink, 'projectorUpdateIcons') + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_powr_on(self, mock_log, mock_UpdateIcons, mock_change_status, mock_send_command): + """ + Test status power to ON + """ + # GIVEN: Test object + log_warning_calls = [] + log_debug_calls = [call('({ip}) Processing command "POWR" with data "1"'.format(ip=self.pjlink.name)), + call('({ip}) Calling function for POWR'.format(ip=self.pjlink.name)), + call('({ip}) Processing POWR command'.format(ip=self.pjlink.name))] + self.pjlink.power = S_STANDBY - @skip('Needs update to new setup') - def test_projector_process_rfil_save(self): + # WHEN: process_name called with test data + process_command(projector=self.pjlink, cmd='POWR', data=PJLINK_POWR_STATUS[S_ON]) + + # THEN: Power should be set to ON + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + assert (S_ON == self.pjlink.power), 'Power should have been set to ON' + assert mock_UpdateIcons.emit.called, 'projectorUpdateIcons should have been called' + mock_send_command.assert_called_once_with('INST') + mock_change_status.assert_called_once_with(S_ON) + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_rfil_save(self, mock_log): """ Test saving filter type """ - filter_model = 'Filter Type Test' - # GIVEN: Test object - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.model_filter = None + new_data = 'Filter Type Test' + log_warning_calls = [] + log_debug_calls = [call('({ip}) Processing command "RFIL" with data ' + '"{data}"'.format(ip=self.pjlink.name, data=new_data)), + call('({ip}) Calling function for RFIL'.format(ip=self.pjlink.name))] + self.pjlink.model_filter = None # WHEN: Filter model is received - pjlink.process_rfil(data=filter_model) + process_command(projector=self.pjlink, cmd='RFIL', data=new_data) # THEN: Filter model number should be saved - assert pjlink.model_filter == filter_model, 'Filter type should have been saved' + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + assert (self.pjlink.model_filter == new_data), 'Filter model should have been saved' - @skip('Needs update to new setup') - def test_projector_process_rfil_nosave(self): + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_rfil_nosave(self, mock_log): """ Test saving filter type previously saved """ # GIVEN: Test object - with patch.object(openlp.core.projectors.pjlink, 'log') as mock_log: + old_data = 'Old filter type' + new_data = 'Filter Type Test' + log_warning_calls = [call('({ip}) Filter model already set'.format(ip=self.pjlink.name)), + call('({ip}) Saved model: "{data}"'.format(ip=self.pjlink.name, data=old_data)), + call('({ip}) New model: "{data}"'.format(ip=self.pjlink.name, data=new_data))] + log_debug_calls = [call('({ip}) Processing command "RFIL" with data ' + '"{data}"'.format(ip=self.pjlink.name, data=new_data)), + call('({ip}) Calling function for RFIL'.format(ip=self.pjlink.name))] + self.pjlink.model_filter = old_data - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.model_filter = 'Old filter type' - filter_model = 'Filter Type Test' - log_warn_calls = [call('({ip}) Filter model already set'.format(ip=pjlink.name)), - call('({ip}) Saved model: "Old filter type"'.format(ip=pjlink.name)), - call('({ip}) New model: "Filter Type Test"'.format(ip=pjlink.name))] + # WHEN: Filter model is received + process_command(projector=self.pjlink, cmd='RFIL', data=new_data) - # WHEN: Filter model is received - pjlink.process_rfil(data=filter_model) + # THEN: Filter model number should be saved + assert (self.pjlink.model_filter != new_data), 'Filter model should NOT have been saved' + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) - # THEN: Filter model number should be saved - assert pjlink.model_filter != filter_model, 'Filter type should NOT have been saved' - mock_log.warning.assert_has_calls(log_warn_calls) - - @skip('Needs update to new setup') - def test_projector_process_rlmp_save(self): + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_rlmp_save(self, mock_log): """ Test saving lamp type """ # GIVEN: Test object - # GIVEN: Test object - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.model_lamp = None - lamp_model = 'Lamp Type Test' + new_data = 'Lamp Type Test' + log_warning_calls = [] + log_debug_calls = [call('({ip}) Processing command "RLMP" with data ' + '"{data}"'.format(ip=self.pjlink.name, data=new_data)), + call('({ip}) Calling function for RLMP'.format(ip=self.pjlink.name))] + self.pjlink.model_lamp = None # WHEN: Filter model is received - pjlink.process_rlmp(data=lamp_model) + process_command(projector=self.pjlink, cmd='RLMP', data=new_data) # THEN: Filter model number should be saved - assert pjlink.model_lamp == lamp_model, 'Lamp type should have been saved' + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + assert (self.pjlink.model_lamp == new_data), 'Lamp model should have been saved' - @skip('Needs update to new setup') - def test_projector_process_rlmp_nosave(self): + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_rlmp_nosave(self, mock_log): """ Test saving lamp type previously saved """ # GIVEN: Test object - with patch.object(openlp.core.projectors.pjlink, 'log') as mock_log: + old_data = 'Old filter type' + new_data = 'Filter Type Test' + log_warning_calls = [call('({ip}) Lamp model already set'.format(ip=self.pjlink.name)), + call('({ip}) Saved lamp: "{data}"'.format(ip=self.pjlink.name, data=old_data)), + call('({ip}) New lamp: "{data}"'.format(ip=self.pjlink.name, data=new_data))] + log_debug_calls = [call('({ip}) Processing command "RLMP" with data ' + '"{data}"'.format(ip=self.pjlink.name, data=new_data)), + call('({ip}) Calling function for RLMP'.format(ip=self.pjlink.name))] + self.pjlink.model_lamp = old_data - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.model_lamp = 'Old lamp type' - lamp_model = 'Lamp Type Test' - log_warn_calls = [call('({ip}) Lamp model already set'.format(ip=pjlink.name)), - call('({ip}) Saved lamp: "Old lamp type"'.format(ip=pjlink.name)), - call('({ip}) New lamp: "Lamp Type Test"'.format(ip=pjlink.name))] + # WHEN: Filter model is received + process_command(projector=self.pjlink, cmd='RLMP', data=new_data) - # WHEN: Filter model is received - pjlink.process_rlmp(data=lamp_model) + # THEN: Filter model number should be saved + assert (self.pjlink.model_lamp != new_data), 'Lamp model should NOT have been saved' + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) - # THEN: Filter model number should be saved - assert pjlink.model_lamp != lamp_model, 'Lamp type should NOT have been saved' - mock_log.warning.assert_has_calls(log_warn_calls) - - @skip('Needs update to new setup') - def test_projector_process_snum_set(self): - """ - Test saving serial number from projector - """ - # GIVEN: Test object - with patch.object(openlp.core.projectors.pjlink, 'log') as mock_log: - - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.serial_no = None - log_debug_calls = [call('({ip}) Setting projector serial number to ' - '"Test Serial Number"'.format(ip=pjlink.name))] - test_number = 'Test Serial Number' - - # WHEN: No serial number is set and we receive serial number command - pjlink.process_snum(data=test_number) - - # THEN: Serial number should be set - assert pjlink.serial_no == test_number, 'Projector serial number should have been set' - mock_log.debug.assert_has_calls(log_debug_calls) - - @skip('Needs update to new setup') - def test_projector_process_snum_different(self): + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_snum_different(self, mock_log): """ Test projector serial number different than saved serial number """ # GIVEN: Test object - with patch.object(openlp.core.projectors.pjlink, 'log') as mock_log: - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.serial_no = 'Previous serial number' - log_warn_calls = [call('({ip}) Projector serial number does not match ' - 'saved serial number'.format(ip=pjlink.name)), - call('({ip}) Saved: "Previous serial number"'.format(ip=pjlink.name)), - call('({ip}) Received: "Test Serial Number"'.format(ip=pjlink.name)), - call('({ip}) NOT saving serial number'.format(ip=pjlink.name))] - test_number = 'Test Serial Number' + new_data = 'Test Serial Number' + old_data = 'Previous serial number' + log_warning_calls = [call('({ip}) Projector serial number does not match ' + 'saved serial number'.format(ip=self.pjlink.name)), + call('({ip}) Saved: "{data}"'.format(ip=self.pjlink.name, data=old_data)), + call('({ip}) Received: "{data}"'.format(ip=self.pjlink.name, data=new_data)), + call('({ip}) NOT saving serial number'.format(ip=self.pjlink.name))] - # WHEN: No serial number is set and we receive serial number command - pjlink.process_snum(data=test_number) + log_debug_calls = [call('({ip}) Processing command "SNUM" with data ' + '"{data}"'.format(ip=self.pjlink.name, data=new_data)), + call('({ip}) Calling function for SNUM'.format(ip=self.pjlink.name))] + self.pjlink.serial_no = old_data - # THEN: Serial number should be set - assert pjlink.serial_no != test_number, 'Projector serial number should NOT have been set' - mock_log.warning.assert_has_calls(log_warn_calls) + # WHEN: No serial number is set and we receive serial number command + process_command(projector=self.pjlink, cmd='SNUM', data=new_data) - @skip('Needs update to new setup') - def test_projector_process_sver(self): + # THEN: Serial number should be set + assert (self.pjlink.serial_no != new_data), 'Projector serial number should NOT have been set' + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_snum_set(self, mock_log): """ - Test invalid software version information - too long + Test saving serial number from projector """ # GIVEN: Test object - with patch.object(openlp.core.projectors.pjlink, 'log') as mock_log: - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.sw_version = None - pjlink.sw_version_received = None - test_data = 'Test 1 Subtest 1' - log_debug_calls = [call('({ip}) Setting projector software version to ' - '"Test 1 Subtest 1"'.format(ip=pjlink.name))] + new_data = 'Test Serial Number' + self.pjlink.serial_no = None + log_warning_calls = [] + log_debug_calls = [call('({ip}) Processing command "SNUM" with data "{data}"'.format(ip=self.pjlink.name, + data=new_data)), + call('({ip}) Calling function for SNUM'.format(ip=self.pjlink.name)), + call('({ip}) Setting projector serial number to ' + '"{data}"'.format(ip=self.pjlink.name, data=new_data))] - # WHEN: process_sver called with invalid data - pjlink.process_sver(data=test_data) + # WHEN: No serial number is set and we receive serial number command + process_command(projector=self.pjlink, cmd='SNUM', data=new_data) - # THEN: Version information should not change - assert pjlink.sw_version == test_data, 'Software version should have been updated' - mock_log.debug.assert_has_calls(log_debug_calls) + # THEN: Serial number should be set + assert (self.pjlink.serial_no == new_data), 'Projector serial number should have been set' + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) - @skip('Needs update to new setup') - def test_projector_process_sver_changed(self): + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_sver_changed(self, mock_log): """ Test invalid software version information - Received different than saved """ # GIVEN: Test object - with patch.object(openlp.core.projectors.pjlink, 'log') as mock_log: - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - test_data_old = 'Test 1 Subtest 1' - test_data_new = 'Test 1 Subtest 2' - log_warn_calls = [call('({ip}) Projector software version does not match ' - 'saved software version'.format(ip=pjlink.name)), - call('({ip}) Saved: "Test 1 Subtest 1"'.format(ip=pjlink.name)), - call('({ip}) Received: "Test 1 Subtest 2"'.format(ip=pjlink.name)), - call('({ip}) Updating software version'.format(ip=pjlink.name))] - pjlink.sw_version = test_data_old + old_data = 'Test 1 Subtest 1' + new_data = 'Test 1 Subtest 2' + log_warning_calls = [call('({ip}) Projector software version does not match ' + 'saved software version'.format(ip=self.pjlink.name)), + call('({ip}) Saved: "{data}"'.format(ip=self.pjlink.name, data=old_data)), + call('({ip}) Received: "{data}"'.format(ip=self.pjlink.name, data=new_data)), + call('({ip}) Updating software version'.format(ip=self.pjlink.name))] + log_debug_calls = [call('({ip}) Processing command "SVER" with data ' + '"{data}"'.format(ip=self.pjlink.name, data=new_data)), + call('({ip}) Calling function for SVER'.format(ip=self.pjlink.name)), + call('({ip}) Setting projector software version to ' + '"{data}"'.format(ip=self.pjlink.name, data=new_data))] + self.pjlink.sw_version = old_data - # WHEN: process_sver called with invalid data - pjlink.process_sver(data=test_data_new) + # WHEN: process_sver called with invalid data + process_command(self.pjlink, cmd='SVER', data=new_data) - # THEN: Version information should not change - assert pjlink.sw_version == test_data_new, 'Software version should have changed' - mock_log.warning.assert_has_calls(log_warn_calls) + # THEN: Version information should change + assert (self.pjlink.sw_version == new_data), 'Software version should have changed' + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) - @skip('Needs update to new setup') - def test_projector_process_sver_invalid(self): + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_sver_invalid(self, mock_log): """ Test invalid software version information - too long """ - test_data = 'This is a test software version line that is too long based on PJLink version 2 specs' - log_warn_calls = [call('Invalid software version - too long')] - # GIVEN: Test object - with patch.object(openlp.core.projectors.pjlink, 'log') as mock_log: - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.sw_version = None + new_data = 'This is a test software version line that is too long based on PJLink version 2 specs' + log_warning_calls = [call('Invalid software version - too long')] + log_debug_calls = [call('({ip}) Processing command "SVER" with data "{data}"'.format(ip=self.pjlink.name, + data=new_data)), + call('({ip}) Calling function for SVER'.format(ip=self.pjlink.name))] + self.pjlink.sw_version = None + self.pjlink.sw_version_received = None - # WHEN: process_sver called with invalid data - pjlink.process_sver(data=test_data) + # WHEN: process_sver called with invalid data + process_command(projector=self.pjlink, cmd='SVER', data=new_data) - # THEN: Version information should not change - assert pjlink.sw_version is None, 'Software version should not have changed' - assert pjlink.sw_version_received is None, 'Received software version should not have changed' - mock_log.warning.assert_has_calls(log_warn_calls) + # THEN: Version information should not change + assert (not self.pjlink.sw_version), 'Software version should not have changed' + assert (not self.pjlink.sw_version_received), 'Received software version should not have changed' + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_projector_sver_save(self, mock_log): + """ + Test invalid software version information - too long + """ + # GIVEN: Test object + new_data = 'Test 1 Subtest 1' + log_warning_calls = [] + log_debug_calls = [call('({ip}) Processing command "SVER" with data ' + '"{data}"'.format(ip=self.pjlink.name, data=new_data)), + call('({ip}) Calling function for SVER'.format(ip=self.pjlink.name)), + call('({ip}) Setting projector software version to ' + '"{data}"'.format(ip=self.pjlink.name, data=new_data))] + self.pjlink.sw_version = None + self.pjlink.sw_version_received = None + + # WHEN: process_sver called with invalid data + process_command(projector=self.pjlink, cmd='SVER', data=new_data) + + # THEN: Version information should not change + assert (self.pjlink.sw_version == new_data), 'Software version should have been updated' + assert (not self.pjlink.sw_version_received), 'Received version field should not have changed' + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) diff --git a/tests/openlp_core/projectors/test_projector_pjlink_commands_02.py b/tests/openlp_core/projectors/test_projector_commands_03.py similarity index 100% rename from tests/openlp_core/projectors/test_projector_pjlink_commands_02.py rename to tests/openlp_core/projectors/test_projector_commands_03.py diff --git a/tests/openlp_core/projectors/test_projector_pjlink_base_02.py b/tests/openlp_core/projectors/test_projector_pjlink_base_02.py index 78d1e0b80..c45f230a2 100644 --- a/tests/openlp_core/projectors/test_projector_pjlink_base_02.py +++ b/tests/openlp_core/projectors/test_projector_pjlink_base_02.py @@ -132,37 +132,6 @@ class TestPJLinkBase(TestCase): assert (not mock_timer.called), 'Timer should not have been called' assert (not mock_reset.called), 'reset_information() should not have been called' - @patch.object(openlp.core.projectors.pjlink.PJLink, 'state') - @patch.object(openlp.core.projectors.pjlink.PJLink, 'reset_information') - @patch.object(openlp.core.projectors.pjlink, 'log') - def test_local_send_command_no_data_queue_check(self, mock_log, mock_reset, mock_state): - """ - Test _underscore_send_command last queue length check - """ - # GIVEN: Test object - log_error_calls = [] - log_warning_calls = [call('({ip}) _send_command(): No data to send'.format(ip=self.pjlink.name))] - log_debug_calls = [] - mock_state.return_value = QSOCKET_STATE[S_CONNECTED] - self.pjlink.priority_queue = [] - - # WHEN: _send_command called with no data and queue's emtpy - # Patch some attributes here since they are not available until after instantiation - with patch.object(self.pjlink, 'socket_timer') as mock_timer, \ - patch.object(self.pjlink, 'send_queue') as mock_queue: - # Unlikely case of send_queue not really empty, but len(send_queue) returns 0 - mock_queue.return_value = ['test'] - mock_queue.__len__.return_value = 0 - self.pjlink._send_command(data=None) - - # THEN: - mock_log.error.assert_has_calls(log_error_calls) - mock_log.warning.assert_has_calls(log_warning_calls) - mock_log.debug.assert_has_calls(log_debug_calls) - assert (not self.pjlink.priority_queue), 'Priority queue should be empty' - assert (not mock_timer.called), 'Timer should not have been called' - assert (not mock_reset.called), 'reset_information() should not have been called' - @patch.object(openlp.core.projectors.pjlink.PJLink, 'write') @patch.object(openlp.core.projectors.pjlink.PJLink, 'disconnect_from_host') @patch.object(openlp.core.projectors.pjlink.PJLink, 'state') diff --git a/tests/openlp_core/projectors/test_projector_pjlink_cmd_routing.py b/tests/openlp_core/projectors/test_projector_pjlink_cmd_routing.py index 669f0a10a..137a7c4d0 100644 --- a/tests/openlp_core/projectors/test_projector_pjlink_cmd_routing.py +++ b/tests/openlp_core/projectors/test_projector_pjlink_cmd_routing.py @@ -56,9 +56,9 @@ class TestPJLinkRouting(TestCase): Test projector received valid command invalid version """ # GIVEN: Test object - log_warning_text = [call('({ip}) get_data() Command reply version does not match ' - 'a valid command version'.format(ip=self.pjlink.name)), - call('({ip}) _send_command(): Nothing to send - returning'.format(ip=self.pjlink.name))] + log_warning_text = [call('({ip}) _send_command(): Nothing to send - returning'.format(ip=self.pjlink.name)), + call('({ip}) get_data() Command reply version does not match ' + 'a valid command version'.format(ip=self.pjlink.name))] log_debug_text = [call('({ip}) get_data(buffer="{pre}XCLSS=X"'.format(ip=self.pjlink.name, pre=PJLINK_PREFIX)), call('({ip}) get_data(): Checking new data "{pre}XCLSS=X"'.format(ip=self.pjlink.name, pre=PJLINK_PREFIX)), @@ -83,10 +83,10 @@ class TestPJLinkRouting(TestCase): Test projector receiving invalid command """ # GIVEN: Test object - log_warning_text = [call('({ip}) get_data(): Invalid packet - ' - 'unknown command "UNKN"'.format(ip=self.pjlink.name)), - call('({ip}) _send_command(): Nothing to send - ' - 'returning'.format(ip=self.pjlink.name))] + log_warning_text = [call('({ip}) _send_command(): Nothing to send - ' + 'returning'.format(ip=self.pjlink.name)), + call('({ip}) get_data(): Invalid packet - ' + 'unknown command "UNKN"'.format(ip=self.pjlink.name))] log_debug_text = [call('({ip}) get_data(buffer="{pre}1UNKN=Huh?"'.format(ip=self.pjlink.name, pre=PJLINK_PREFIX)), call('({ip}) get_data(): Checking new data "{pre}1UNKN=Huh?"'.format(ip=self.pjlink.name, @@ -113,9 +113,9 @@ class TestPJLinkRouting(TestCase): Test projector received valid command with command version higher than projector """ # GIVEN: Test object - log_warning_text = [call('({ip}) get_data(): Projector returned class reply higher than projector ' - 'stated class'.format(ip=self.pjlink.name)), - call('({ip}) _send_command(): Nothing to send - returning'.format(ip=self.pjlink.name))] + log_warning_text = [call('({ip}) _send_command(): Nothing to send - returning'.format(ip=self.pjlink.name)), + call('({ip}) get_data(): Projector returned class reply higher than projector ' + 'stated class'.format(ip=self.pjlink.name))] log_debug_text = [call('({ip}) get_data(buffer="{pre}2ACKN=X"'.format(ip=self.pjlink.name, pre=PJLINK_PREFIX)), From 22db084375700c5d754eca7e64ef2cd6b8fac88f Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 5 May 2019 06:59:29 +0100 Subject: [PATCH 17/22] fix missing vlc --- openlp/core/ui/media/mediacontroller.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py index 92aa57eb9..69fee7189 100644 --- a/openlp/core/ui/media/mediacontroller.py +++ b/openlp/core/ui/media/mediacontroller.py @@ -139,13 +139,14 @@ class MediaController(RegistryBase, LogMixin, RegistryProperties): Set up the controllers. :return: """ - try: - self.setup_display(self.live_controller.display, False) - except AttributeError: - State().update_pre_conditions('media_live', False) - State().missing_text('media_live', translate('OpenLP.SlideController', - 'No Displays configure so Live Media has been disabled')) - self.setup_display(self.preview_controller.preview_display, True) + if State().check_preconditions('mediacontroller'): + try: + self.setup_display(self.live_controller.display, False) + except AttributeError: + State().update_pre_conditions('media_live', False) + State().missing_text('media_live', translate('OpenLP.SlideController', + 'No Displays configure so Live Media has been disabled')) + self.setup_display(self.preview_controller.preview_display, True) def display_controllers(self, controller_type): """ From 54aea66a16f1e0c023be476f57b1c14cc3d60e27 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 5 May 2019 09:13:10 +0100 Subject: [PATCH 18/22] initial version --- openlp/core/ui/media/vendor/__init__.py | 25 - openlp/core/ui/media/vendor/vlc.py | 8775 ----------------------- openlp/core/ui/media/vlcplayer.py | 91 +- scripts/check_dependencies.py | 3 +- 4 files changed, 49 insertions(+), 8845 deletions(-) delete mode 100644 openlp/core/ui/media/vendor/__init__.py delete mode 100644 openlp/core/ui/media/vendor/vlc.py diff --git a/openlp/core/ui/media/vendor/__init__.py b/openlp/core/ui/media/vendor/__init__.py deleted file mode 100644 index 72950e073..000000000 --- a/openlp/core/ui/media/vendor/__init__.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 - -########################################################################## -# OpenLP - Open Source Lyrics Projection # -# ---------------------------------------------------------------------- # -# Copyright (c) 2008-2019 OpenLP Developers # -# ---------------------------------------------------------------------- # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -########################################################################## -""" -The :mod:`~openlp.core.ui.media.vendor` module contains any scripts or libraries -from 3rd party vendors which are required to make certain media modules work. -""" diff --git a/openlp/core/ui/media/vendor/vlc.py b/openlp/core/ui/media/vendor/vlc.py deleted file mode 100644 index efea5ea76..000000000 --- a/openlp/core/ui/media/vendor/vlc.py +++ /dev/null @@ -1,8775 +0,0 @@ -#! /usr/bin/python -# -*- coding: utf-8 -*- - -# Python ctypes bindings for VLC -# -# Copyright (C) 2009-2017 the VideoLAN team -# $Id: $ -# -# Authors: Olivier Aubert -# Jean Brouwers -# Geoff Salmon -# -# This library is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2.1 of the -# License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA - -"""This module provides bindings for the LibVLC public API, see -U{http://wiki.videolan.org/LibVLC}. - -You can find the documentation and a README file with some examples -at U{http://www.olivieraubert.net/vlc/python-ctypes/}. - -Basically, the most important class is L{Instance}, which is used -to create a libvlc instance. From this instance, you then create -L{MediaPlayer} and L{MediaListPlayer} instances. - -Alternatively, you may create instances of the L{MediaPlayer} and -L{MediaListPlayer} class directly and an instance of L{Instance} -will be implicitly created. The latter can be obtained using the -C{get_instance} method of L{MediaPlayer} and L{MediaListPlayer}. -""" - -import ctypes -from ctypes.util import find_library -import os -import sys -import functools - -# Used by EventManager in override.py -from inspect import getargspec - -import logging - -logger = logging.getLogger(__name__) - -__version__ = "3.0.3104" -__libvlc_version__ = "3.0.3" -__generator_version__ = "1.4" -build_date = "Fri Jul 13 15:18:27 2018 3.0.3" - -# The libvlc doc states that filenames are expected to be in UTF8, do -# not rely on sys.getfilesystemencoding() which will be confused, -# esp. on windows. -DEFAULT_ENCODING = 'utf-8' - -if sys.version_info[0] > 2: - str = str - unicode = str - bytes = bytes - basestring = (str, bytes) - PYTHON3 = True - - - def str_to_bytes(s): - """Translate string or bytes to bytes. - """ - if isinstance(s, str): - return bytes(s, DEFAULT_ENCODING) - else: - return s - - - def bytes_to_str(b): - """Translate bytes to string. - """ - if isinstance(b, bytes): - return b.decode(DEFAULT_ENCODING) - else: - return b -else: - str = str - unicode = unicode - bytes = str - basestring = basestring - PYTHON3 = False - - - def str_to_bytes(s): - """Translate string or bytes to bytes. - """ - if isinstance(s, unicode): - return s.encode(DEFAULT_ENCODING) - else: - return s - - - def bytes_to_str(b): - """Translate bytes to unicode string. - """ - if isinstance(b, str): - return unicode(b, DEFAULT_ENCODING) - else: - return b - -# Internal guard to prevent internal classes to be directly -# instanciated. -_internal_guard = object() - - -def find_lib(): - dll = None - plugin_path = os.environ.get('PYTHON_VLC_MODULE_PATH', None) - if 'PYTHON_VLC_LIB_PATH' in os.environ: - try: - dll = ctypes.CDLL(os.environ['PYTHON_VLC_LIB_PATH']) - except OSError: - logger.error("Cannot load lib specified by PYTHON_VLC_LIB_PATH env. variable") - sys.exit(1) - if plugin_path and not os.path.isdir(plugin_path): - logger.error("Invalid PYTHON_VLC_MODULE_PATH specified. Please fix.") - sys.exit(1) - if dll is not None: - return dll, plugin_path - - if sys.platform.startswith('linux'): - p = find_library('vlc') - try: - dll = ctypes.CDLL(p) - except OSError: # may fail - dll = ctypes.CDLL('libvlc.so.5') - elif sys.platform.startswith('win'): - libname = 'libvlc.dll' - p = find_library(libname) - if p is None: - try: # some registry settings - # leaner than win32api, win32con - if PYTHON3: - import winreg as w - else: - import _winreg as w - for r in w.HKEY_LOCAL_MACHINE, w.HKEY_CURRENT_USER: - try: - r = w.OpenKey(r, 'Software\\VideoLAN\\VLC') - plugin_path, _ = w.QueryValueEx(r, 'InstallDir') - w.CloseKey(r) - break - except w.error: - pass - except ImportError: # no PyWin32 - pass - if plugin_path is None: - # try some standard locations. - programfiles = os.environ["ProgramFiles"] - homedir = os.environ["HOMEDRIVE"] - for p in ('{programfiles}\\VideoLan{libname}', '{homedir}:\\VideoLan{libname}', - '{programfiles}{libname}', '{homedir}:{libname}'): - p = p.format(homedir=homedir, - programfiles=programfiles, - libname='\\VLC\\' + libname) - if os.path.exists(p): - plugin_path = os.path.dirname(p) - break - if plugin_path is not None: # try loading - p = os.getcwd() - os.chdir(plugin_path) - # if chdir failed, this will raise an exception - dll = ctypes.CDLL(libname) - # restore cwd after dll has been loaded - os.chdir(p) - else: # may fail - dll = ctypes.CDLL(libname) - else: - plugin_path = os.path.dirname(p) - dll = ctypes.CDLL(p) - - elif sys.platform.startswith('darwin'): - # FIXME: should find a means to configure path - d = '/Applications/VLC.app/Contents/MacOS/' - c = d + 'lib/libvlccore.dylib' - p = d + 'lib/libvlc.dylib' - if os.path.exists(p) and os.path.exists(c): - # pre-load libvlccore VLC 2.2.8+ - ctypes.CDLL(c) - dll = ctypes.CDLL(p) - for p in ('modules', 'plugins'): - p = d + p - if os.path.isdir(p): - plugin_path = p - break - else: # hope, some [DY]LD_LIBRARY_PATH is set... - # pre-load libvlccore VLC 2.2.8+ - ctypes.CDLL('libvlccore.dylib') - dll = ctypes.CDLL('libvlc.dylib') - - else: - raise NotImplementedError('%s: %s not supported' % (sys.argv[0], sys.platform)) - - return (dll, plugin_path) - - -# plugin_path used on win32 and MacOS in override.py -dll, plugin_path = find_lib() - - -class VLCException(Exception): - """Exception raised by libvlc methods. - """ - pass - - -try: - _Ints = (int, long) -except NameError: # no long in Python 3+ - _Ints = int -_Seqs = (list, tuple) - - -# Used for handling *event_manager() methods. -class memoize_parameterless(object): - """Decorator. Caches a parameterless method's return value each time it is called. - - If called later with the same arguments, the cached value is returned - (not reevaluated). - Adapted from https://wiki.python.org/moin/PythonDecoratorLibrary - """ - - def __init__(self, func): - self.func = func - self._cache = {} - - def __call__(self, obj): - try: - return self._cache[obj] - except KeyError: - v = self._cache[obj] = self.func(obj) - return v - - def __repr__(self): - """Return the function's docstring. - """ - return self.func.__doc__ - - def __get__(self, obj, objtype): - """Support instance methods. - """ - return functools.partial(self.__call__, obj) - - -# Default instance. It is used to instanciate classes directly in the -# OO-wrapper. -_default_instance = None - - -def get_default_instance(): - """Return the default VLC.Instance. - """ - global _default_instance - if _default_instance is None: - _default_instance = Instance() - return _default_instance - - -_Cfunctions = {} # from LibVLC __version__ -_Globals = globals() # sys.modules[__name__].__dict__ - - -def _Cfunction(name, flags, errcheck, *types): - """(INTERNAL) New ctypes function binding. - """ - if hasattr(dll, name) and name in _Globals: - p = ctypes.CFUNCTYPE(*types) - f = p((name, dll), flags) - if errcheck is not None: - f.errcheck = errcheck - # replace the Python function - # in this module, but only when - # running as python -O or -OO - if __debug__: - _Cfunctions[name] = f - else: - _Globals[name] = f - return f - raise NameError('no function %r' % (name,)) - - -def _Cobject(cls, ctype): - """(INTERNAL) New instance from ctypes. - """ - o = object.__new__(cls) - o._as_parameter_ = ctype - return o - - -def _Constructor(cls, ptr=_internal_guard): - """(INTERNAL) New wrapper from ctypes. - """ - if ptr == _internal_guard: - raise VLCException( - "(INTERNAL) ctypes class. You should get references for this class through methods of the LibVLC API.") - if ptr is None or ptr == 0: - return None - return _Cobject(cls, ctypes.c_void_p(ptr)) - - -class _Cstruct(ctypes.Structure): - """(INTERNAL) Base class for ctypes structures. - """ - _fields_ = [] # list of 2-tuples ('name', ctyptes.) - - def __str__(self): - l = [' %s:\t%s' % (n, getattr(self, n)) for n, _ in self._fields_] - return '\n'.join([self.__class__.__name__] + l) - - def __repr__(self): - return '%s.%s' % (self.__class__.__module__, self) - - -class _Ctype(object): - """(INTERNAL) Base class for ctypes. - """ - - @staticmethod - def from_param(this): # not self - """(INTERNAL) ctypes parameter conversion method. - """ - if this is None: - return None - return this._as_parameter_ - - -class ListPOINTER(object): - """Just like a POINTER but accept a list of ctype as an argument. - """ - - def __init__(self, etype): - self.etype = etype - - def from_param(self, param): - if isinstance(param, _Seqs): - return (self.etype * len(param))(*param) - else: - return ctypes.POINTER(param) - - -# errcheck functions for some native functions. -def string_result(result, func, arguments): - """Errcheck function. Returns a string and frees the original pointer. - - It assumes the result is a char *. - """ - if result: - # make a python string copy - s = bytes_to_str(ctypes.string_at(result)) - # free original string ptr - libvlc_free(result) - return s - return None - - -def class_result(classname): - """Errcheck function. Returns a function that creates the specified class. - """ - - def wrap_errcheck(result, func, arguments): - if result is None: - return None - return classname(result) - - return wrap_errcheck - - -# Wrapper for the opaque struct libvlc_log_t -class Log(ctypes.Structure): - pass - - -Log_ptr = ctypes.POINTER(Log) - - -# FILE* ctypes wrapper, copied from -# http://svn.python.org/projects/ctypes/trunk/ctypeslib/ctypeslib/contrib/pythonhdr.py -class FILE(ctypes.Structure): - pass - - -FILE_ptr = ctypes.POINTER(FILE) - -if PYTHON3: - PyFile_FromFd = ctypes.pythonapi.PyFile_FromFd - PyFile_FromFd.restype = ctypes.py_object - PyFile_FromFd.argtypes = [ctypes.c_int, - ctypes.c_char_p, - ctypes.c_char_p, - ctypes.c_int, - ctypes.c_char_p, - ctypes.c_char_p, - ctypes.c_char_p, - ctypes.c_int] - - PyFile_AsFd = ctypes.pythonapi.PyObject_AsFileDescriptor - PyFile_AsFd.restype = ctypes.c_int - PyFile_AsFd.argtypes = [ctypes.py_object] -else: - PyFile_FromFile = ctypes.pythonapi.PyFile_FromFile - PyFile_FromFile.restype = ctypes.py_object - PyFile_FromFile.argtypes = [FILE_ptr, - ctypes.c_char_p, - ctypes.c_char_p, - ctypes.CFUNCTYPE(ctypes.c_int, FILE_ptr)] - - PyFile_AsFile = ctypes.pythonapi.PyFile_AsFile - PyFile_AsFile.restype = FILE_ptr - PyFile_AsFile.argtypes = [ctypes.py_object] - - -# Generated enum types # - -class _Enum(ctypes.c_uint): - '''(INTERNAL) Base class - ''' - _enum_names_ = {} - - def __str__(self): - n = self._enum_names_.get(self.value, '') or ('FIXME_(%r)' % (self.value,)) - return '.'.join((self.__class__.__name__, n)) - - def __hash__(self): - return self.value - - def __repr__(self): - return '.'.join((self.__class__.__module__, self.__str__())) - - def __eq__(self, other): - return ((isinstance(other, _Enum) and self.value == other.value) - or (isinstance(other, _Ints) and self.value == other)) - - def __ne__(self, other): - return not self.__eq__(other) - - -class LogLevel(_Enum): - '''Logging messages level. -\note future libvlc versions may define new levels. - ''' - _enum_names_ = { - 0: 'DEBUG', - 2: 'NOTICE', - 3: 'WARNING', - 4: 'ERROR', - } - - -LogLevel.DEBUG = LogLevel(0) -LogLevel.ERROR = LogLevel(4) -LogLevel.NOTICE = LogLevel(2) -LogLevel.WARNING = LogLevel(3) - - -class MediaDiscovererCategory(_Enum): - '''Category of a media discoverer -See libvlc_media_discoverer_list_get(). - ''' - _enum_names_ = { - 0: 'devices', - 1: 'lan', - 2: 'podcasts', - 3: 'localdirs', - } - - -MediaDiscovererCategory.devices = MediaDiscovererCategory(0) -MediaDiscovererCategory.lan = MediaDiscovererCategory(1) -MediaDiscovererCategory.localdirs = MediaDiscovererCategory(3) -MediaDiscovererCategory.podcasts = MediaDiscovererCategory(2) - - -class DialogQuestionType(_Enum): - '''@defgroup libvlc_dialog libvlc dialog -@ingroup libvlc -@{ -@file -libvlc dialog external api. - ''' - _enum_names_ = { - 0: 'NORMAL', - 1: 'WARNING', - 2: 'CRITICAL', - } - - -DialogQuestionType.CRITICAL = DialogQuestionType(2) -DialogQuestionType.NORMAL = DialogQuestionType(0) -DialogQuestionType.WARNING = DialogQuestionType(1) - - -class EventType(_Enum): - '''Event types. - ''' - _enum_names_ = { - 0: 'MediaMetaChanged', - 1: 'MediaSubItemAdded', - 2: 'MediaDurationChanged', - 3: 'MediaParsedChanged', - 4: 'MediaFreed', - 5: 'MediaStateChanged', - 6: 'MediaSubItemTreeAdded', - 0x100: 'MediaPlayerMediaChanged', - 257: 'MediaPlayerNothingSpecial', - 258: 'MediaPlayerOpening', - 259: 'MediaPlayerBuffering', - 260: 'MediaPlayerPlaying', - 261: 'MediaPlayerPaused', - 262: 'MediaPlayerStopped', - 263: 'MediaPlayerForward', - 264: 'MediaPlayerBackward', - 265: 'MediaPlayerEndReached', - 266: 'MediaPlayerEncounteredError', - 267: 'MediaPlayerTimeChanged', - 268: 'MediaPlayerPositionChanged', - 269: 'MediaPlayerSeekableChanged', - 270: 'MediaPlayerPausableChanged', - 271: 'MediaPlayerTitleChanged', - 272: 'MediaPlayerSnapshotTaken', - 273: 'MediaPlayerLengthChanged', - 274: 'MediaPlayerVout', - 275: 'MediaPlayerScrambledChanged', - 276: 'MediaPlayerESAdded', - 277: 'MediaPlayerESDeleted', - 278: 'MediaPlayerESSelected', - 279: 'MediaPlayerCorked', - 280: 'MediaPlayerUncorked', - 281: 'MediaPlayerMuted', - 282: 'MediaPlayerUnmuted', - 283: 'MediaPlayerAudioVolume', - 284: 'MediaPlayerAudioDevice', - 285: 'MediaPlayerChapterChanged', - 0x200: 'MediaListItemAdded', - 513: 'MediaListWillAddItem', - 514: 'MediaListItemDeleted', - 515: 'MediaListWillDeleteItem', - 516: 'MediaListEndReached', - 0x300: 'MediaListViewItemAdded', - 769: 'MediaListViewWillAddItem', - 770: 'MediaListViewItemDeleted', - 771: 'MediaListViewWillDeleteItem', - 0x400: 'MediaListPlayerPlayed', - 1025: 'MediaListPlayerNextItemSet', - 1026: 'MediaListPlayerStopped', - 0x500: 'MediaDiscovererStarted', - 1281: 'MediaDiscovererEnded', - 1282: 'RendererDiscovererItemAdded', - 1283: 'RendererDiscovererItemDeleted', - 0x600: 'VlmMediaAdded', - 1537: 'VlmMediaRemoved', - 1538: 'VlmMediaChanged', - 1539: 'VlmMediaInstanceStarted', - 1540: 'VlmMediaInstanceStopped', - 1541: 'VlmMediaInstanceStatusInit', - 1542: 'VlmMediaInstanceStatusOpening', - 1543: 'VlmMediaInstanceStatusPlaying', - 1544: 'VlmMediaInstanceStatusPause', - 1545: 'VlmMediaInstanceStatusEnd', - 1546: 'VlmMediaInstanceStatusError', - } - - -EventType.MediaDiscovererEnded = EventType(1281) -EventType.MediaDiscovererStarted = EventType(0x500) -EventType.MediaDurationChanged = EventType(2) -EventType.MediaFreed = EventType(4) -EventType.MediaListEndReached = EventType(516) -EventType.MediaListItemAdded = EventType(0x200) -EventType.MediaListItemDeleted = EventType(514) -EventType.MediaListPlayerNextItemSet = EventType(1025) -EventType.MediaListPlayerPlayed = EventType(0x400) -EventType.MediaListPlayerStopped = EventType(1026) -EventType.MediaListViewItemAdded = EventType(0x300) -EventType.MediaListViewItemDeleted = EventType(770) -EventType.MediaListViewWillAddItem = EventType(769) -EventType.MediaListViewWillDeleteItem = EventType(771) -EventType.MediaListWillAddItem = EventType(513) -EventType.MediaListWillDeleteItem = EventType(515) -EventType.MediaMetaChanged = EventType(0) -EventType.MediaParsedChanged = EventType(3) -EventType.MediaPlayerAudioDevice = EventType(284) -EventType.MediaPlayerAudioVolume = EventType(283) -EventType.MediaPlayerBackward = EventType(264) -EventType.MediaPlayerBuffering = EventType(259) -EventType.MediaPlayerChapterChanged = EventType(285) -EventType.MediaPlayerCorked = EventType(279) -EventType.MediaPlayerESAdded = EventType(276) -EventType.MediaPlayerESDeleted = EventType(277) -EventType.MediaPlayerESSelected = EventType(278) -EventType.MediaPlayerEncounteredError = EventType(266) -EventType.MediaPlayerEndReached = EventType(265) -EventType.MediaPlayerForward = EventType(263) -EventType.MediaPlayerLengthChanged = EventType(273) -EventType.MediaPlayerMediaChanged = EventType(0x100) -EventType.MediaPlayerMuted = EventType(281) -EventType.MediaPlayerNothingSpecial = EventType(257) -EventType.MediaPlayerOpening = EventType(258) -EventType.MediaPlayerPausableChanged = EventType(270) -EventType.MediaPlayerPaused = EventType(261) -EventType.MediaPlayerPlaying = EventType(260) -EventType.MediaPlayerPositionChanged = EventType(268) -EventType.MediaPlayerScrambledChanged = EventType(275) -EventType.MediaPlayerSeekableChanged = EventType(269) -EventType.MediaPlayerSnapshotTaken = EventType(272) -EventType.MediaPlayerStopped = EventType(262) -EventType.MediaPlayerTimeChanged = EventType(267) -EventType.MediaPlayerTitleChanged = EventType(271) -EventType.MediaPlayerUncorked = EventType(280) -EventType.MediaPlayerUnmuted = EventType(282) -EventType.MediaPlayerVout = EventType(274) -EventType.MediaStateChanged = EventType(5) -EventType.MediaSubItemAdded = EventType(1) -EventType.MediaSubItemTreeAdded = EventType(6) -EventType.RendererDiscovererItemAdded = EventType(1282) -EventType.RendererDiscovererItemDeleted = EventType(1283) -EventType.VlmMediaAdded = EventType(0x600) -EventType.VlmMediaChanged = EventType(1538) -EventType.VlmMediaInstanceStarted = EventType(1539) -EventType.VlmMediaInstanceStatusEnd = EventType(1545) -EventType.VlmMediaInstanceStatusError = EventType(1546) -EventType.VlmMediaInstanceStatusInit = EventType(1541) -EventType.VlmMediaInstanceStatusOpening = EventType(1542) -EventType.VlmMediaInstanceStatusPause = EventType(1544) -EventType.VlmMediaInstanceStatusPlaying = EventType(1543) -EventType.VlmMediaInstanceStopped = EventType(1540) -EventType.VlmMediaRemoved = EventType(1537) - - -class Meta(_Enum): - '''Meta data types. - ''' - _enum_names_ = { - 0: 'Title', - 1: 'Artist', - 2: 'Genre', - 3: 'Copyright', - 4: 'Album', - 5: 'TrackNumber', - 6: 'Description', - 7: 'Rating', - 8: 'Date', - 9: 'Setting', - 10: 'URL', - 11: 'Language', - 12: 'NowPlaying', - 13: 'Publisher', - 14: 'EncodedBy', - 15: 'ArtworkURL', - 16: 'TrackID', - 17: 'TrackTotal', - 18: 'Director', - 19: 'Season', - 20: 'Episode', - 21: 'ShowName', - 22: 'Actors', - 23: 'AlbumArtist', - 24: 'DiscNumber', - 25: 'DiscTotal', - } - - -Meta.Actors = Meta(22) -Meta.Album = Meta(4) -Meta.AlbumArtist = Meta(23) -Meta.Artist = Meta(1) -Meta.ArtworkURL = Meta(15) -Meta.Copyright = Meta(3) -Meta.Date = Meta(8) -Meta.Description = Meta(6) -Meta.Director = Meta(18) -Meta.DiscNumber = Meta(24) -Meta.DiscTotal = Meta(25) -Meta.EncodedBy = Meta(14) -Meta.Episode = Meta(20) -Meta.Genre = Meta(2) -Meta.Language = Meta(11) -Meta.NowPlaying = Meta(12) -Meta.Publisher = Meta(13) -Meta.Rating = Meta(7) -Meta.Season = Meta(19) -Meta.Setting = Meta(9) -Meta.ShowName = Meta(21) -Meta.Title = Meta(0) -Meta.TrackID = Meta(16) -Meta.TrackNumber = Meta(5) -Meta.TrackTotal = Meta(17) -Meta.URL = Meta(10) - - -class State(_Enum): - '''Note the order of libvlc_state_t enum must match exactly the order of -See mediacontrol_playerstatus, See input_state_e enums, -and videolan.libvlc.state (at bindings/cil/src/media.cs). -expected states by web plugins are: -idle/close=0, opening=1, playing=3, paused=4, -stopping=5, ended=6, error=7. - ''' - _enum_names_ = { - 0: 'NothingSpecial', - 1: 'Opening', - 2: 'Buffering', - 3: 'Playing', - 4: 'Paused', - 5: 'Stopped', - 6: 'Ended', - 7: 'Error', - } - - -State.Buffering = State(2) -State.Ended = State(6) -State.Error = State(7) -State.NothingSpecial = State(0) -State.Opening = State(1) -State.Paused = State(4) -State.Playing = State(3) -State.Stopped = State(5) - - -class TrackType(_Enum): - '''N/A - ''' - _enum_names_ = { - -1: 'unknown', - 0: 'audio', - 1: 'video', - 2: 'text', - } - - -TrackType.audio = TrackType(0) -TrackType.text = TrackType(2) -TrackType.unknown = TrackType(-1) -TrackType.video = TrackType(1) - - -class VideoOrient(_Enum): - '''N/A - ''' - _enum_names_ = { - 0: 'left', - 1: 'right', - 2: 'left', - 3: 'right', - 4: 'top', - 5: 'bottom', - 6: 'top', - 7: 'bottom', - } - - -VideoOrient.bottom = VideoOrient(5) -VideoOrient.bottom = VideoOrient(7) -VideoOrient.left = VideoOrient(0) -VideoOrient.left = VideoOrient(2) -VideoOrient.right = VideoOrient(1) -VideoOrient.right = VideoOrient(3) -VideoOrient.top = VideoOrient(4) -VideoOrient.top = VideoOrient(6) - - -class VideoProjection(_Enum): - '''N/A - ''' - _enum_names_ = { - 0: 'rectangular', - 1: 'equirectangular', - 0x100: 'standard', - } - - -VideoProjection.equirectangular = VideoProjection(1) -VideoProjection.rectangular = VideoProjection(0) -VideoProjection.standard = VideoProjection(0x100) - - -class MediaType(_Enum): - '''Media type -See libvlc_media_get_type. - ''' - _enum_names_ = { - 0: 'unknown', - 1: 'file', - 2: 'directory', - 3: 'disc', - 4: 'stream', - 5: 'playlist', - } - - -MediaType.directory = MediaType(2) -MediaType.disc = MediaType(3) -MediaType.file = MediaType(1) -MediaType.playlist = MediaType(5) -MediaType.stream = MediaType(4) -MediaType.unknown = MediaType(0) - - -class MediaParseFlag(_Enum): - '''Parse flags used by libvlc_media_parse_with_options() -See libvlc_media_parse_with_options. - ''' - _enum_names_ = { - 0x0: 'local', - 0x1: 'network', - 0x2: 'local', - 0x4: 'network', - 0x8: 'interact', - } - - -MediaParseFlag.interact = MediaParseFlag(0x8) -MediaParseFlag.local = MediaParseFlag(0x0) -MediaParseFlag.local = MediaParseFlag(0x2) -MediaParseFlag.network = MediaParseFlag(0x1) -MediaParseFlag.network = MediaParseFlag(0x4) - - -class MediaParsedStatus(_Enum): - '''Parse status used sent by libvlc_media_parse_with_options() or returned by -libvlc_media_get_parsed_status() -See libvlc_media_parse_with_options -See libvlc_media_get_parsed_status. - ''' - _enum_names_ = { - 1: 'skipped', - 2: 'failed', - 3: 'timeout', - 4: 'done', - } - - -MediaParsedStatus.done = MediaParsedStatus(4) -MediaParsedStatus.failed = MediaParsedStatus(2) -MediaParsedStatus.skipped = MediaParsedStatus(1) -MediaParsedStatus.timeout = MediaParsedStatus(3) - - -class MediaSlaveType(_Enum): - '''Type of a media slave: subtitle or audio. - ''' - _enum_names_ = { - 0: 'subtitle', - 1: 'audio', - } - - -MediaSlaveType.audio = MediaSlaveType(1) -MediaSlaveType.subtitle = MediaSlaveType(0) - - -class VideoMarqueeOption(_Enum): - '''Marq options definition. - ''' - _enum_names_ = { - 0: 'Enable', - 1: 'Text', - 2: 'Color', - 3: 'Opacity', - 4: 'Position', - 5: 'Refresh', - 6: 'Size', - 7: 'Timeout', - 8: 'marquee_X', - 9: 'marquee_Y', - } - - -VideoMarqueeOption.Color = VideoMarqueeOption(2) -VideoMarqueeOption.Enable = VideoMarqueeOption(0) -VideoMarqueeOption.Opacity = VideoMarqueeOption(3) -VideoMarqueeOption.Position = VideoMarqueeOption(4) -VideoMarqueeOption.Refresh = VideoMarqueeOption(5) -VideoMarqueeOption.Size = VideoMarqueeOption(6) -VideoMarqueeOption.Text = VideoMarqueeOption(1) -VideoMarqueeOption.Timeout = VideoMarqueeOption(7) -VideoMarqueeOption.marquee_X = VideoMarqueeOption(8) -VideoMarqueeOption.marquee_Y = VideoMarqueeOption(9) - - -class NavigateMode(_Enum): - '''Navigation mode. - ''' - _enum_names_ = { - 0: 'activate', - 1: 'up', - 2: 'down', - 3: 'left', - 4: 'right', - 5: 'popup', - } - - -NavigateMode.activate = NavigateMode(0) -NavigateMode.down = NavigateMode(2) -NavigateMode.left = NavigateMode(3) -NavigateMode.popup = NavigateMode(5) -NavigateMode.right = NavigateMode(4) -NavigateMode.up = NavigateMode(1) - - -class Position(_Enum): - '''Enumeration of values used to set position (e.g. of video title). - ''' - _enum_names_ = { - -1: 'disable', - 0: 'center', - 1: 'left', - 2: 'right', - 3: 'top', - 4: 'left', - 5: 'right', - 6: 'bottom', - 7: 'left', - 8: 'right', - } - - -Position.bottom = Position(6) -Position.center = Position(0) -Position.disable = Position(-1) -Position.left = Position(1) -Position.left = Position(4) -Position.left = Position(7) -Position.right = Position(2) -Position.right = Position(5) -Position.right = Position(8) -Position.top = Position(3) - - -class TeletextKey(_Enum): - '''Enumeration of teletext keys than can be passed via -libvlc_video_set_teletext(). - ''' - _enum_names_ = { - 7471104: 'red', - 6750208: 'green', - 7929856: 'yellow', - 6422528: 'blue', - 6881280: 'index', - } - - -TeletextKey.blue = TeletextKey(6422528) -TeletextKey.green = TeletextKey(6750208) -TeletextKey.index = TeletextKey(6881280) -TeletextKey.red = TeletextKey(7471104) -TeletextKey.yellow = TeletextKey(7929856) - - -class VideoLogoOption(_Enum): - '''Option values for libvlc_video_{get,set}_logo_{int,string}. - ''' - _enum_names_ = { - 0: 'enable', - 1: 'file', - 2: 'logo_x', - 3: 'logo_y', - 4: 'delay', - 5: 'repeat', - 6: 'opacity', - 7: 'position', - } - - -VideoLogoOption.delay = VideoLogoOption(4) -VideoLogoOption.enable = VideoLogoOption(0) -VideoLogoOption.file = VideoLogoOption(1) -VideoLogoOption.logo_x = VideoLogoOption(2) -VideoLogoOption.logo_y = VideoLogoOption(3) -VideoLogoOption.opacity = VideoLogoOption(6) -VideoLogoOption.position = VideoLogoOption(7) -VideoLogoOption.repeat = VideoLogoOption(5) - - -class VideoAdjustOption(_Enum): - '''Option values for libvlc_video_{get,set}_adjust_{int,float,bool}. - ''' - _enum_names_ = { - 0: 'Enable', - 1: 'Contrast', - 2: 'Brightness', - 3: 'Hue', - 4: 'Saturation', - 5: 'Gamma', - } - - -VideoAdjustOption.Brightness = VideoAdjustOption(2) -VideoAdjustOption.Contrast = VideoAdjustOption(1) -VideoAdjustOption.Enable = VideoAdjustOption(0) -VideoAdjustOption.Gamma = VideoAdjustOption(5) -VideoAdjustOption.Hue = VideoAdjustOption(3) -VideoAdjustOption.Saturation = VideoAdjustOption(4) - - -class AudioOutputDeviceTypes(_Enum): - '''Audio device types. - ''' - _enum_names_ = { - -1: 'Error', - 1: 'Mono', - 2: 'Stereo', - 4: '_2F2R', - 5: '_3F2R', - 6: '_5_1', - 7: '_6_1', - 8: '_7_1', - 10: 'SPDIF', - } - - -AudioOutputDeviceTypes.Error = AudioOutputDeviceTypes(-1) -AudioOutputDeviceTypes.Mono = AudioOutputDeviceTypes(1) -AudioOutputDeviceTypes.SPDIF = AudioOutputDeviceTypes(10) -AudioOutputDeviceTypes.Stereo = AudioOutputDeviceTypes(2) -AudioOutputDeviceTypes._2F2R = AudioOutputDeviceTypes(4) -AudioOutputDeviceTypes._3F2R = AudioOutputDeviceTypes(5) -AudioOutputDeviceTypes._5_1 = AudioOutputDeviceTypes(6) -AudioOutputDeviceTypes._6_1 = AudioOutputDeviceTypes(7) -AudioOutputDeviceTypes._7_1 = AudioOutputDeviceTypes(8) - - -class AudioOutputChannel(_Enum): - '''Audio channels. - ''' - _enum_names_ = { - -1: 'Error', - 1: 'Stereo', - 2: 'RStereo', - 3: 'Left', - 4: 'Right', - 5: 'Dolbys', - } - - -AudioOutputChannel.Dolbys = AudioOutputChannel(5) -AudioOutputChannel.Error = AudioOutputChannel(-1) -AudioOutputChannel.Left = AudioOutputChannel(3) -AudioOutputChannel.RStereo = AudioOutputChannel(2) -AudioOutputChannel.Right = AudioOutputChannel(4) -AudioOutputChannel.Stereo = AudioOutputChannel(1) - - -class MediaPlayerRole(_Enum): - '''Media player roles. -\version libvlc 3.0.0 and later. -see \ref libvlc_media_player_set_role(). - ''' - _enum_names_ = { - 0: '_None', - 1: 'Music', - 2: 'Video', - 3: 'Communication', - 4: 'Game', - 5: 'Notification', - 6: 'Animation', - 7: 'Production', - 8: 'Accessibility', - 9: 'Test', - } - - -MediaPlayerRole.Accessibility = MediaPlayerRole(8) -MediaPlayerRole.Animation = MediaPlayerRole(6) -MediaPlayerRole.Communication = MediaPlayerRole(3) -MediaPlayerRole.Game = MediaPlayerRole(4) -MediaPlayerRole.Music = MediaPlayerRole(1) -MediaPlayerRole.Notification = MediaPlayerRole(5) -MediaPlayerRole.Production = MediaPlayerRole(7) -MediaPlayerRole.Test = MediaPlayerRole(9) -MediaPlayerRole.Video = MediaPlayerRole(2) -MediaPlayerRole._None = MediaPlayerRole(0) - - -class PlaybackMode(_Enum): - '''Defines playback modes for playlist. - ''' - _enum_names_ = { - 0: 'default', - 1: 'loop', - 2: 'repeat', - } - - -PlaybackMode.default = PlaybackMode(0) -PlaybackMode.loop = PlaybackMode(1) -PlaybackMode.repeat = PlaybackMode(2) - - -class Callback(ctypes.c_void_p): - """Callback function notification. - @param p_event: the event triggering the callback. - """ - pass - - -class LogCb(ctypes.c_void_p): - """Callback prototype for LibVLC log message handler. - @param data: data pointer as given to L{libvlc_log_set}(). - @param level: message level (@ref L{LogLevel}). - @param ctx: message context (meta-information about the message). - @param fmt: printf() format string (as defined by ISO C11). - @param args: variable argument list for the format @note Log message handlers B{must} be thread-safe. @warning The message context pointer, the format string parameters and the variable arguments are only valid until the callback returns. - """ - pass - - -class MediaOpenCb(ctypes.c_void_p): - """Callback prototype to open a custom bitstream input media. - The same media item can be opened multiple times. Each time, this callback - is invoked. It should allocate and initialize any instance-specific - resources, then store them in *datap. The instance resources can be freed - in the @ref libvlc_media_close_cb callback. - @param opaque: private pointer as passed to L{libvlc_media_new_callbacks}(). - @return: datap storage space for a private data pointer, sizep byte length of the bitstream or UINT64_MAX if unknown. - """ - pass - - -class MediaReadCb(ctypes.c_void_p): - """Callback prototype to read data from a custom bitstream input media. - @param opaque: private pointer as set by the @ref libvlc_media_open_cb callback. - @param buf: start address of the buffer to read data into. - @param len: bytes length of the buffer. - @return: strictly positive number of bytes read, 0 on end-of-stream, or -1 on non-recoverable error @note If no data is immediately available, then the callback should sleep. @warning The application is responsible for avoiding deadlock situations. In particular, the callback should return an error if playback is stopped; if it does not return, then L{libvlc_media_player_stop}() will never return. - """ - pass - - -class MediaSeekCb(ctypes.c_void_p): - """Callback prototype to seek a custom bitstream input media. - @param opaque: private pointer as set by the @ref libvlc_media_open_cb callback. - @param offset: absolute byte offset to seek to. - @return: 0 on success, -1 on error. - """ - pass - - -class MediaCloseCb(ctypes.c_void_p): - """Callback prototype to close a custom bitstream input media. - @param opaque: private pointer as set by the @ref libvlc_media_open_cb callback. - """ - pass - - -class VideoLockCb(ctypes.c_void_p): - """Callback prototype to allocate and lock a picture buffer. - Whenever a new video frame needs to be decoded, the lock callback is - invoked. Depending on the video chroma, one or three pixel planes of - adequate dimensions must be returned via the second parameter. Those - planes must be aligned on 32-bytes boundaries. - @param opaque: private pointer as passed to L{libvlc_video_set_callbacks}() [IN]. - @param planes: start address of the pixel planes (LibVLC allocates the array of void pointers, this callback must initialize the array) [OUT]. - @return: a private pointer for the display and unlock callbacks to identify the picture buffers. - """ - pass - - -class VideoUnlockCb(ctypes.c_void_p): - """Callback prototype to unlock a picture buffer. - When the video frame decoding is complete, the unlock callback is invoked. - This callback might not be needed at all. It is only an indication that the - application can now read the pixel values if it needs to. - @note: A picture buffer is unlocked after the picture is decoded, - but before the picture is displayed. - @param opaque: private pointer as passed to L{libvlc_video_set_callbacks}() [IN]. - @param picture: private pointer returned from the @ref libvlc_video_lock_cb callback [IN]. - @param planes: pixel planes as defined by the @ref libvlc_video_lock_cb callback (this parameter is only for convenience) [IN]. - """ - pass - - -class VideoDisplayCb(ctypes.c_void_p): - """Callback prototype to display a picture. - When the video frame needs to be shown, as determined by the media playback - clock, the display callback is invoked. - @param opaque: private pointer as passed to L{libvlc_video_set_callbacks}() [IN]. - @param picture: private pointer returned from the @ref libvlc_video_lock_cb callback [IN]. - """ - pass - - -class VideoFormatCb(ctypes.c_void_p): - """Callback prototype to configure picture buffers format. - This callback gets the format of the video as output by the video decoder - and the chain of video filters (if any). It can opt to change any parameter - as it needs. In that case, LibVLC will attempt to convert the video format - (rescaling and chroma conversion) but these operations can be CPU intensive. - @param opaque: pointer to the private pointer passed to L{libvlc_video_set_callbacks}() [IN/OUT]. - @param chroma: pointer to the 4 bytes video format identifier [IN/OUT]. - @param width: pointer to the pixel width [IN/OUT]. - @param height: pointer to the pixel height [IN/OUT]. - @param pitches: table of scanline pitches in bytes for each pixel plane (the table is allocated by LibVLC) [OUT]. - @return: lines table of scanlines count for each plane. - """ - pass - - -class VideoCleanupCb(ctypes.c_void_p): - """Callback prototype to configure picture buffers format. - @param opaque: private pointer as passed to L{libvlc_video_set_callbacks}() (and possibly modified by @ref libvlc_video_format_cb) [IN]. - """ - pass - - -class AudioPlayCb(ctypes.c_void_p): - """Callback prototype for audio playback. - The LibVLC media player decodes and post-processes the audio signal - asynchronously (in an internal thread). Whenever audio samples are ready - to be queued to the output, this callback is invoked. - The number of samples provided per invocation may depend on the file format, - the audio coding algorithm, the decoder plug-in, the post-processing - filters and timing. Application must not assume a certain number of samples. - The exact format of audio samples is determined by L{libvlc_audio_set_format}() - or L{libvlc_audio_set_format_callbacks}() as is the channels layout. - Note that the number of samples is per channel. For instance, if the audio - track sampling rate is 48000 Hz, then 1200 samples represent 25 milliseconds - of audio signal - regardless of the number of audio channels. - @param data: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]. - @param samples: pointer to a table of audio samples to play back [IN]. - @param count: number of audio samples to play back. - @param pts: expected play time stamp (see libvlc_delay()). - """ - pass - - -class AudioPauseCb(ctypes.c_void_p): - """Callback prototype for audio pause. - LibVLC invokes this callback to pause audio playback. - @note: The pause callback is never called if the audio is already paused. - @param data: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]. - @param pts: time stamp of the pause request (should be elapsed already). - """ - pass - - -class AudioResumeCb(ctypes.c_void_p): - """Callback prototype for audio resumption. - LibVLC invokes this callback to resume audio playback after it was - previously paused. - @note: The resume callback is never called if the audio is not paused. - @param data: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]. - @param pts: time stamp of the resumption request (should be elapsed already). - """ - pass - - -class AudioFlushCb(ctypes.c_void_p): - """Callback prototype for audio buffer flush. - LibVLC invokes this callback if it needs to discard all pending buffers and - stop playback as soon as possible. This typically occurs when the media is - stopped. - @param data: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]. - """ - pass - - -class AudioDrainCb(ctypes.c_void_p): - """Callback prototype for audio buffer drain. - LibVLC may invoke this callback when the decoded audio track is ending. - There will be no further decoded samples for the track, but playback should - nevertheless continue until all already pending buffers are rendered. - @param data: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]. - """ - pass - - -class AudioSetVolumeCb(ctypes.c_void_p): - """Callback prototype for audio volume change. - @param data: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]. - @param volume: software volume (1. = nominal, 0. = mute). - @param mute: muted flag. - """ - pass - - -class AudioSetupCb(ctypes.c_void_p): - """Callback prototype to setup the audio playback. - This is called when the media player needs to create a new audio output. - @param opaque: pointer to the data pointer passed to L{libvlc_audio_set_callbacks}() [IN/OUT]. - @param format: 4 bytes sample format [IN/OUT]. - @param rate: sample rate [IN/OUT]. - @param channels: channels count [IN/OUT]. - @return: 0 on success, anything else to skip audio playback. - """ - pass - - -class AudioCleanupCb(ctypes.c_void_p): - """Callback prototype for audio playback cleanup. - This is called when the media player no longer needs an audio output. - @param opaque: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]. - """ - pass - - -class CallbackDecorators(object): - "Class holding various method decorators for callback functions." - Callback = ctypes.CFUNCTYPE(ctypes.c_void_p, ctypes.c_void_p, ctypes.c_void_p) - Callback.__doc__ = '''Callback function notification. - @param p_event: the event triggering the callback. - ''' - LogCb = ctypes.CFUNCTYPE(ctypes.c_void_p, ctypes.c_void_p, ctypes.c_int, Log_ptr, ctypes.c_char_p, ctypes.c_void_p) - LogCb.__doc__ = '''Callback prototype for LibVLC log message handler. - @param data: data pointer as given to L{libvlc_log_set}(). - @param level: message level (@ref L{LogLevel}). - @param ctx: message context (meta-information about the message). - @param fmt: printf() format string (as defined by ISO C11). - @param args: variable argument list for the format @note Log message handlers B{must} be thread-safe. @warning The message context pointer, the format string parameters and the variable arguments are only valid until the callback returns. - ''' - MediaOpenCb = ctypes.CFUNCTYPE(ctypes.POINTER(ctypes.c_int), ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p), - ctypes.POINTER(ctypes.c_uint64)) - MediaOpenCb.__doc__ = '''Callback prototype to open a custom bitstream input media. - The same media item can be opened multiple times. Each time, this callback - is invoked. It should allocate and initialize any instance-specific - resources, then store them in *datap. The instance resources can be freed - in the @ref libvlc_media_close_cb callback. - @param opaque: private pointer as passed to L{libvlc_media_new_callbacks}(). - @return: datap storage space for a private data pointer, sizep byte length of the bitstream or UINT64_MAX if unknown. - ''' - MediaReadCb = ctypes.CFUNCTYPE(ctypes.POINTER(ctypes.c_ssize_t), ctypes.c_void_p, ctypes.c_char_p, ctypes.c_size_t) - MediaReadCb.__doc__ = '''Callback prototype to read data from a custom bitstream input media. - @param opaque: private pointer as set by the @ref libvlc_media_open_cb callback. - @param buf: start address of the buffer to read data into. - @param len: bytes length of the buffer. - @return: strictly positive number of bytes read, 0 on end-of-stream, or -1 on non-recoverable error @note If no data is immediately available, then the callback should sleep. @warning The application is responsible for avoiding deadlock situations. In particular, the callback should return an error if playback is stopped; if it does not return, then L{libvlc_media_player_stop}() will never return. - ''' - MediaSeekCb = ctypes.CFUNCTYPE(ctypes.POINTER(ctypes.c_int), ctypes.c_void_p, ctypes.c_uint64) - MediaSeekCb.__doc__ = '''Callback prototype to seek a custom bitstream input media. - @param opaque: private pointer as set by the @ref libvlc_media_open_cb callback. - @param offset: absolute byte offset to seek to. - @return: 0 on success, -1 on error. - ''' - MediaCloseCb = ctypes.CFUNCTYPE(ctypes.c_void_p, ctypes.c_void_p) - MediaCloseCb.__doc__ = '''Callback prototype to close a custom bitstream input media. - @param opaque: private pointer as set by the @ref libvlc_media_open_cb callback. - ''' - VideoLockCb = ctypes.CFUNCTYPE(ctypes.c_void_p, ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)) - VideoLockCb.__doc__ = '''Callback prototype to allocate and lock a picture buffer. - Whenever a new video frame needs to be decoded, the lock callback is - invoked. Depending on the video chroma, one or three pixel planes of - adequate dimensions must be returned via the second parameter. Those - planes must be aligned on 32-bytes boundaries. - @param opaque: private pointer as passed to L{libvlc_video_set_callbacks}() [IN]. - @param planes: start address of the pixel planes (LibVLC allocates the array of void pointers, this callback must initialize the array) [OUT]. - @return: a private pointer for the display and unlock callbacks to identify the picture buffers. - ''' - VideoUnlockCb = ctypes.CFUNCTYPE(ctypes.c_void_p, ctypes.c_void_p, ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)) - VideoUnlockCb.__doc__ = '''Callback prototype to unlock a picture buffer. - When the video frame decoding is complete, the unlock callback is invoked. - This callback might not be needed at all. It is only an indication that the - application can now read the pixel values if it needs to. - @note: A picture buffer is unlocked after the picture is decoded, - but before the picture is displayed. - @param opaque: private pointer as passed to L{libvlc_video_set_callbacks}() [IN]. - @param picture: private pointer returned from the @ref libvlc_video_lock_cb callback [IN]. - @param planes: pixel planes as defined by the @ref libvlc_video_lock_cb callback (this parameter is only for convenience) [IN]. - ''' - VideoDisplayCb = ctypes.CFUNCTYPE(ctypes.c_void_p, ctypes.c_void_p, ctypes.c_void_p) - VideoDisplayCb.__doc__ = '''Callback prototype to display a picture. - When the video frame needs to be shown, as determined by the media playback - clock, the display callback is invoked. - @param opaque: private pointer as passed to L{libvlc_video_set_callbacks}() [IN]. - @param picture: private pointer returned from the @ref libvlc_video_lock_cb callback [IN]. - ''' - VideoFormatCb = ctypes.CFUNCTYPE(ctypes.POINTER(ctypes.c_uint), ctypes.POINTER(ctypes.c_void_p), ctypes.c_char_p, - ctypes.POINTER(ctypes.c_uint), ctypes.POINTER(ctypes.c_uint), - ctypes.POINTER(ctypes.c_uint), ctypes.POINTER(ctypes.c_uint)) - VideoFormatCb.__doc__ = '''Callback prototype to configure picture buffers format. - This callback gets the format of the video as output by the video decoder - and the chain of video filters (if any). It can opt to change any parameter - as it needs. In that case, LibVLC will attempt to convert the video format - (rescaling and chroma conversion) but these operations can be CPU intensive. - @param opaque: pointer to the private pointer passed to L{libvlc_video_set_callbacks}() [IN/OUT]. - @param chroma: pointer to the 4 bytes video format identifier [IN/OUT]. - @param width: pointer to the pixel width [IN/OUT]. - @param height: pointer to the pixel height [IN/OUT]. - @param pitches: table of scanline pitches in bytes for each pixel plane (the table is allocated by LibVLC) [OUT]. - @return: lines table of scanlines count for each plane. - ''' - VideoCleanupCb = ctypes.CFUNCTYPE(ctypes.c_void_p, ctypes.c_void_p) - VideoCleanupCb.__doc__ = '''Callback prototype to configure picture buffers format. - @param opaque: private pointer as passed to L{libvlc_video_set_callbacks}() (and possibly modified by @ref libvlc_video_format_cb) [IN]. - ''' - AudioPlayCb = ctypes.CFUNCTYPE(ctypes.c_void_p, ctypes.c_void_p, ctypes.c_void_p, ctypes.c_uint, ctypes.c_int64) - AudioPlayCb.__doc__ = '''Callback prototype for audio playback. - The LibVLC media player decodes and post-processes the audio signal - asynchronously (in an internal thread). Whenever audio samples are ready - to be queued to the output, this callback is invoked. - The number of samples provided per invocation may depend on the file format, - the audio coding algorithm, the decoder plug-in, the post-processing - filters and timing. Application must not assume a certain number of samples. - The exact format of audio samples is determined by L{libvlc_audio_set_format}() - or L{libvlc_audio_set_format_callbacks}() as is the channels layout. - Note that the number of samples is per channel. For instance, if the audio - track sampling rate is 48000 Hz, then 1200 samples represent 25 milliseconds - of audio signal - regardless of the number of audio channels. - @param data: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]. - @param samples: pointer to a table of audio samples to play back [IN]. - @param count: number of audio samples to play back. - @param pts: expected play time stamp (see libvlc_delay()). - ''' - AudioPauseCb = ctypes.CFUNCTYPE(ctypes.c_void_p, ctypes.c_void_p, ctypes.c_int64) - AudioPauseCb.__doc__ = '''Callback prototype for audio pause. - LibVLC invokes this callback to pause audio playback. - @note: The pause callback is never called if the audio is already paused. - @param data: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]. - @param pts: time stamp of the pause request (should be elapsed already). - ''' - AudioResumeCb = ctypes.CFUNCTYPE(ctypes.c_void_p, ctypes.c_void_p, ctypes.c_int64) - AudioResumeCb.__doc__ = '''Callback prototype for audio resumption. - LibVLC invokes this callback to resume audio playback after it was - previously paused. - @note: The resume callback is never called if the audio is not paused. - @param data: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]. - @param pts: time stamp of the resumption request (should be elapsed already). - ''' - AudioFlushCb = ctypes.CFUNCTYPE(ctypes.c_void_p, ctypes.c_void_p, ctypes.c_int64) - AudioFlushCb.__doc__ = '''Callback prototype for audio buffer flush. - LibVLC invokes this callback if it needs to discard all pending buffers and - stop playback as soon as possible. This typically occurs when the media is - stopped. - @param data: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]. - ''' - AudioDrainCb = ctypes.CFUNCTYPE(ctypes.c_void_p, ctypes.c_void_p) - AudioDrainCb.__doc__ = '''Callback prototype for audio buffer drain. - LibVLC may invoke this callback when the decoded audio track is ending. - There will be no further decoded samples for the track, but playback should - nevertheless continue until all already pending buffers are rendered. - @param data: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]. - ''' - AudioSetVolumeCb = ctypes.CFUNCTYPE(ctypes.c_void_p, ctypes.c_void_p, ctypes.c_float, ctypes.c_bool) - AudioSetVolumeCb.__doc__ = '''Callback prototype for audio volume change. - @param data: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]. - @param volume: software volume (1. = nominal, 0. = mute). - @param mute: muted flag. - ''' - AudioSetupCb = ctypes.CFUNCTYPE(ctypes.POINTER(ctypes.c_int), ctypes.POINTER(ctypes.c_void_p), ctypes.c_char_p, - ctypes.POINTER(ctypes.c_uint), ctypes.POINTER(ctypes.c_uint)) - AudioSetupCb.__doc__ = '''Callback prototype to setup the audio playback. - This is called when the media player needs to create a new audio output. - @param opaque: pointer to the data pointer passed to L{libvlc_audio_set_callbacks}() [IN/OUT]. - @param format: 4 bytes sample format [IN/OUT]. - @param rate: sample rate [IN/OUT]. - @param channels: channels count [IN/OUT]. - @return: 0 on success, anything else to skip audio playback. - ''' - AudioCleanupCb = ctypes.CFUNCTYPE(ctypes.c_void_p, ctypes.c_void_p) - AudioCleanupCb.__doc__ = '''Callback prototype for audio playback cleanup. - This is called when the media player no longer needs an audio output. - @param opaque: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]. - ''' - - -cb = CallbackDecorators - - -# End of generated enum types # - -# From libvlc_structures.h - -class AudioOutput(_Cstruct): - - def __str__(self): - return '%s(%s:%s)' % (self.__class__.__name__, self.name, self.description) - - -AudioOutput._fields_ = [ # recursive struct - ('name', ctypes.c_char_p), - ('description', ctypes.c_char_p), - ('next', ctypes.POINTER(AudioOutput)), -] - - -class LogMessage(_Cstruct): - _fields_ = [ - ('size', ctypes.c_uint), - ('severity', ctypes.c_int), - ('type', ctypes.c_char_p), - ('name', ctypes.c_char_p), - ('header', ctypes.c_char_p), - ('message', ctypes.c_char_p), - ] - - def __init__(self): - super(LogMessage, self).__init__() - self.size = ctypes.sizeof(self) - - def __str__(self): - return '%s(%d:%s): %s' % (self.__class__.__name__, self.severity, self.type, self.message) - - -class MediaEvent(_Cstruct): - _fields_ = [ - ('media_name', ctypes.c_char_p), - ('instance_name', ctypes.c_char_p), - ] - - -class MediaStats(_Cstruct): - _fields_ = [ - ('read_bytes', ctypes.c_int), - ('input_bitrate', ctypes.c_float), - ('demux_read_bytes', ctypes.c_int), - ('demux_bitrate', ctypes.c_float), - ('demux_corrupted', ctypes.c_int), - ('demux_discontinuity', ctypes.c_int), - ('decoded_video', ctypes.c_int), - ('decoded_audio', ctypes.c_int), - ('displayed_pictures', ctypes.c_int), - ('lost_pictures', ctypes.c_int), - ('played_abuffers', ctypes.c_int), - ('lost_abuffers', ctypes.c_int), - ('sent_packets', ctypes.c_int), - ('sent_bytes', ctypes.c_int), - ('send_bitrate', ctypes.c_float), - ] - - -class MediaTrackInfo(_Cstruct): - _fields_ = [ - ('codec', ctypes.c_uint32), - ('id', ctypes.c_int), - ('type', TrackType), - ('profile', ctypes.c_int), - ('level', ctypes.c_int), - ('channels_or_height', ctypes.c_uint), - ('rate_or_width', ctypes.c_uint), - ] - - -class AudioTrack(_Cstruct): - _fields_ = [ - ('channels', ctypes.c_uint), - ('rate', ctypes.c_uint), - ] - - -class VideoTrack(_Cstruct): - _fields_ = [ - ('height', ctypes.c_uint), - ('width', ctypes.c_uint), - ('sar_num', ctypes.c_uint), - ('sar_den', ctypes.c_uint), - ('frame_rate_num', ctypes.c_uint), - ('frame_rate_den', ctypes.c_uint), - ] - - -class SubtitleTrack(_Cstruct): - _fields_ = [ - ('encoding', ctypes.c_char_p), - ] - - -class MediaTrackTracks(ctypes.Union): - _fields_ = [ - ('audio', ctypes.POINTER(AudioTrack)), - ('video', ctypes.POINTER(VideoTrack)), - ('subtitle', ctypes.POINTER(SubtitleTrack)), - ] - - -class MediaTrack(_Cstruct): - _anonymous_ = ("u",) - _fields_ = [ - ('codec', ctypes.c_uint32), - ('original_fourcc', ctypes.c_uint32), - ('id', ctypes.c_int), - ('type', TrackType), - ('profile', ctypes.c_int), - ('level', ctypes.c_int), - - ('u', MediaTrackTracks), - ('bitrate', ctypes.c_uint), - ('language', ctypes.c_char_p), - ('description', ctypes.c_char_p), - ] - - -class PlaylistItem(_Cstruct): - _fields_ = [ - ('id', ctypes.c_int), - ('uri', ctypes.c_char_p), - ('name', ctypes.c_char_p), - ] - - def __str__(self): - return '%s #%d %s (uri %s)' % (self.__class__.__name__, self.id, self.name, self.uri) - - -class Position(object): - """Enum-like, immutable window position constants. - - See e.g. VideoMarqueeOption.Position. - """ - Center = 0 - Left = 1 - CenterLeft = 1 - Right = 2 - CenterRight = 2 - Top = 4 - TopCenter = 4 - TopLeft = 5 - TopRight = 6 - Bottom = 8 - BottomCenter = 8 - BottomLeft = 9 - BottomRight = 10 - - def __init__(self, *unused): - raise TypeError('constants only') - - def __setattr__(self, *unused): # PYCHOK expected - raise TypeError('immutable constants') - - -class Rectangle(_Cstruct): - _fields_ = [ - ('top', ctypes.c_int), - ('left', ctypes.c_int), - ('bottom', ctypes.c_int), - ('right', ctypes.c_int), - ] - - -class TrackDescription(_Cstruct): - - def __str__(self): - return '%s(%d:%s)' % (self.__class__.__name__, self.id, self.name) - - -TrackDescription._fields_ = [ # recursive struct - ('id', ctypes.c_int), - ('name', ctypes.c_char_p), - ('next', ctypes.POINTER(TrackDescription)), -] - - -def track_description_list(head): - """Convert a TrackDescription linked list to a Python list (and release the former). - """ - r = [] - if head: - item = head - while item: - item = item.contents - r.append((item.id, item.name)) - item = item.next - try: - libvlc_track_description_release(head) - except NameError: - libvlc_track_description_list_release(head) - - return r - - -class EventUnion(ctypes.Union): - _fields_ = [ - ('meta_type', ctypes.c_uint), - ('new_child', ctypes.c_uint), - ('new_duration', ctypes.c_longlong), - ('new_status', ctypes.c_int), - ('media', ctypes.c_void_p), - ('new_state', ctypes.c_uint), - # FIXME: Media instance - ('new_cache', ctypes.c_float), - ('new_position', ctypes.c_float), - ('new_time', ctypes.c_longlong), - ('new_title', ctypes.c_int), - ('new_seekable', ctypes.c_longlong), - ('new_pausable', ctypes.c_longlong), - ('new_scrambled', ctypes.c_longlong), - ('new_count', ctypes.c_longlong), - # FIXME: Skipped MediaList and MediaListView... - ('filename', ctypes.c_char_p), - ('new_length', ctypes.c_longlong), - ('media_event', MediaEvent), - ] - - -class Event(_Cstruct): - _fields_ = [ - ('type', EventType), - ('object', ctypes.c_void_p), - ('u', EventUnion), - ] - - -class ModuleDescription(_Cstruct): - - def __str__(self): - return '%s %s (%s)' % (self.__class__.__name__, self.shortname, self.name) - - -ModuleDescription._fields_ = [ # recursive struct - ('name', ctypes.c_char_p), - ('shortname', ctypes.c_char_p), - ('longname', ctypes.c_char_p), - ('help', ctypes.c_char_p), - ('next', ctypes.POINTER(ModuleDescription)), -] - - -def module_description_list(head): - """Convert a ModuleDescription linked list to a Python list (and release the former). - """ - r = [] - if head: - item = head - while item: - item = item.contents - r.append((item.name, item.shortname, item.longname, item.help)) - item = item.next - libvlc_module_description_list_release(head) - return r - - -class AudioOutputDevice(_Cstruct): - - def __str__(self): - return '%s(%d:%s)' % (self.__class__.__name__, self.id, self.name) - - -AudioOutputDevice._fields_ = [ # recursive struct - ('next', ctypes.POINTER(AudioOutputDevice)), - ('device', ctypes.c_char_p), - ('description', ctypes.c_char_p), -] - - -class TitleDescription(_Cstruct): - _fields_ = [ - ('duration', ctypes.c_longlong), - ('name', ctypes.c_char_p), - ('menu', ctypes.c_bool), - ] - - -class ChapterDescription(_Cstruct): - _fields_ = [ - ('time_offset', ctypes.c_longlong), - ('duration', ctypes.c_longlong), - ('name', ctypes.c_char_p), - ] - - -class VideoViewpoint(_Cstruct): - _fields_ = [ - ('yaw', ctypes.c_float), - ('pitch', ctypes.c_float), - ('roll', ctypes.c_float), - ('field_of_view', ctypes.c_float), - ] - - -class MediaDiscovererDescription(_Cstruct): - _fields_ = [ - ('name', ctypes.c_char_p), - ('longname', ctypes.c_char_p), - ('cat', MediaDiscovererCategory), - ] - - def __str__(self): - return '%s %s (%d) - %s' % (self.__class__.__name__, self.name, self.cat, self.longname) - - -# This struct depends on the MediaSlaveType enum that is defined only -# in > 2.2 -if 'MediaSlaveType' in locals(): - class MediaSlave(_Cstruct): - _fields_ = [ - ('psz_uri', ctypes.c_char_p), - ('i_type', MediaSlaveType), - ('i_priority', ctypes.c_uint) - ] - - -class RDDescription(_Cstruct): - _fields_ = [ - ('name', ctypes.c_char_p), - ('longname', ctypes.c_char_p) - ] - - -# End of header.py # -class EventManager(_Ctype): - '''Create an event manager with callback handler. - - This class interposes the registration and handling of - event notifications in order to (a) remove the need for - decorating each callback functions with the decorator - '@callbackmethod', (b) allow any number of positional - and/or keyword arguments to the callback (in addition - to the Event instance) and (c) to preserve the Python - objects such that the callback and argument objects - remain alive (i.e. are not garbage collected) until - B{after} the notification has been unregistered. - - @note: Only a single notification can be registered - for each event type in an EventManager instance. - - ''' - - _callback_handler = None - _callbacks = {} - - def __new__(cls, ptr=_internal_guard): - if ptr == _internal_guard: - raise VLCException( - "(INTERNAL) ctypes class.\nYou should get a reference to EventManager through the MediaPlayer.event_manager() method.") - return _Constructor(cls, ptr) - - def event_attach(self, eventtype, callback, *args, **kwds): - """Register an event notification. - - @param eventtype: the desired event type to be notified about. - @param callback: the function to call when the event occurs. - @param args: optional positional arguments for the callback. - @param kwds: optional keyword arguments for the callback. - @return: 0 on success, ENOMEM on error. - - @note: The callback function must have at least one argument, - an Event instance. Any other, optional positional and keyword - arguments are in B{addition} to the first one. - """ - if not isinstance(eventtype, EventType): - raise VLCException("%s required: %r" % ('EventType', eventtype)) - if not hasattr(callback, '__call__'): # callable() - raise VLCException("%s required: %r" % ('callable', callback)) - # check that the callback expects arguments - if not any(getargspec(callback)[:2]): # list(...) - raise VLCException("%s required: %r" % ('argument', callback)) - - if self._callback_handler is None: - _called_from_ctypes = ctypes.CFUNCTYPE(None, ctypes.POINTER(Event), ctypes.c_void_p) - - @_called_from_ctypes - def _callback_handler(event, k): - """(INTERNAL) handle callback call from ctypes. - - @note: We cannot simply make this an EventManager - method since ctypes does not prepend self as the - first parameter, hence this closure. - """ - try: # retrieve Python callback and arguments - call, args, kwds = self._callbacks[k] - # deref event.contents to simplify callback code - call(event.contents, *args, **kwds) - except KeyError: # detached? - pass - - self._callback_handler = _callback_handler - self._callbacks = {} - - k = eventtype.value - r = libvlc_event_attach(self, k, self._callback_handler, k) - if not r: - self._callbacks[k] = (callback, args, kwds) - return r - - def event_detach(self, eventtype): - """Unregister an event notification. - - @param eventtype: the event type notification to be removed. - """ - if not isinstance(eventtype, EventType): - raise VLCException("%s required: %r" % ('EventType', eventtype)) - - k = eventtype.value - if k in self._callbacks: - del self._callbacks[k] # remove, regardless of libvlc return value - libvlc_event_detach(self, k, self._callback_handler, k) - - -class Instance(_Ctype): - '''Create a new Instance instance. - - It may take as parameter either: - - a string - - a list of strings as first parameters - - the parameters given as the constructor parameters (must be strings) - - ''' - - def __new__(cls, *args): - if len(args) == 1: - # Only 1 arg. It is either a C pointer, or an arg string, - # or a tuple. - i = args[0] - if isinstance(i, _Ints): - return _Constructor(cls, i) - elif isinstance(i, basestring): - args = i.strip().split() - elif isinstance(i, _Seqs): - args = list(i) - else: - raise VLCException('Instance %r' % (args,)) - else: - args = list(args) - - if not args: # no parameters passed - args = ['vlc'] - elif args[0] != 'vlc': - args.insert(0, 'vlc') - - if plugin_path is not None: - # set plugin_path if detected, win32 and MacOS, - # if the user did not specify it itself. - os.environ.setdefault('VLC_PLUGIN_PATH', plugin_path) - - if PYTHON3: - args = [str_to_bytes(a) for a in args] - return libvlc_new(len(args), args) - - def media_player_new(self, uri=None): - """Create a new MediaPlayer instance. - - @param uri: an optional URI to play in the player. - """ - p = libvlc_media_player_new(self) - if uri: - p.set_media(self.media_new(uri)) - p._instance = self - return p - - def media_list_player_new(self): - """Create a new MediaListPlayer instance. - """ - p = libvlc_media_list_player_new(self) - p._instance = self - return p - - def media_new(self, mrl, *options): - """Create a new Media instance. - - If mrl contains a colon (:) preceded by more than 1 letter, it - will be treated as a URL. Else, it will be considered as a - local path. If you need more control, directly use - media_new_location/media_new_path methods. - - Options can be specified as supplementary string parameters, - but note that many options cannot be set at the media level, - and rather at the Instance level. For instance, the marquee - filter must be specified when creating the vlc.Instance or - vlc.MediaPlayer. - - Alternatively, options can be added to the media using the - Media.add_options method (with the same limitation). - - @param options: optional media option=value strings - """ - if ':' in mrl and mrl.index(':') > 1: - # Assume it is a URL - m = libvlc_media_new_location(self, str_to_bytes(mrl)) - else: - # Else it should be a local path. - m = libvlc_media_new_path(self, str_to_bytes(os.path.normpath(mrl))) - for o in options: - libvlc_media_add_option(m, str_to_bytes(o)) - m._instance = self - return m - - def media_list_new(self, mrls=None): - """Create a new MediaList instance. - @param mrls: optional list of MRL strings - """ - l = libvlc_media_list_new(self) - # We should take the lock, but since we did not leak the - # reference, nobody else can access it. - if mrls: - for m in mrls: - l.add_media(m) - l._instance = self - return l - - def audio_output_enumerate_devices(self): - """Enumerate the defined audio output devices. - - @return: list of dicts {name:, description:, devices:} - """ - r = [] - head = libvlc_audio_output_list_get(self) - if head: - i = head - while i: - i = i.contents - d = [{'id': libvlc_audio_output_device_id(self, i.name, d), - 'longname': libvlc_audio_output_device_longname(self, i.name, d)} - for d in range(libvlc_audio_output_device_count(self, i.name))] - r.append({'name': i.name, 'description': i.description, 'devices': d}) - i = i.next - libvlc_audio_output_list_release(head) - return r - - def audio_filter_list_get(self): - """Returns a list of available audio filters. - - """ - return module_description_list(libvlc_audio_filter_list_get(self)) - - def video_filter_list_get(self): - """Returns a list of available video filters. - - """ - return module_description_list(libvlc_video_filter_list_get(self)) - - def release(self): - '''Decrement the reference count of a libvlc instance, and destroy it - if it reaches zero. - ''' - return libvlc_release(self) - - def retain(self): - '''Increments the reference count of a libvlc instance. - The initial reference count is 1 after L{new}() returns. - ''' - return libvlc_retain(self) - - def add_intf(self, name): - '''Try to start a user interface for the libvlc instance. - @param name: interface name, or None for default. - @return: 0 on success, -1 on error. - ''' - return libvlc_add_intf(self, str_to_bytes(name)) - - def set_user_agent(self, name, http): - '''Sets the application name. LibVLC passes this as the user agent string - when a protocol requires it. - @param name: human-readable application name, e.g. "FooBar player 1.2.3". - @param http: HTTP User Agent, e.g. "FooBar/1.2.3 Python/2.6.0". - @version: LibVLC 1.1.1 or later. - ''' - return libvlc_set_user_agent(self, str_to_bytes(name), str_to_bytes(http)) - - def set_app_id(self, id, version, icon): - '''Sets some meta-information about the application. - See also L{set_user_agent}(). - @param id: Java-style application identifier, e.g. "com.acme.foobar". - @param version: application version numbers, e.g. "1.2.3". - @param icon: application icon name, e.g. "foobar". - @version: LibVLC 2.1.0 or later. - ''' - return libvlc_set_app_id(self, str_to_bytes(id), str_to_bytes(version), str_to_bytes(icon)) - - def log_unset(self): - '''Unsets the logging callback. - This function deregisters the logging callback for a LibVLC instance. - This is rarely needed as the callback is implicitly unset when the instance - is destroyed. - @note: This function will wait for any pending callbacks invocation to - complete (causing a deadlock if called from within the callback). - @version: LibVLC 2.1.0 or later. - ''' - return libvlc_log_unset(self) - - def log_set(self, cb, data): - '''Sets the logging callback for a LibVLC instance. - This function is thread-safe: it will wait for any pending callbacks - invocation to complete. - @param data: opaque data pointer for the callback function @note Some log messages (especially debug) are emitted by LibVLC while is being initialized. These messages cannot be captured with this interface. @warning A deadlock may occur if this function is called from the callback. - @param p_instance: libvlc instance. - @version: LibVLC 2.1.0 or later. - ''' - return libvlc_log_set(self, cb, data) - - def log_set_file(self, stream): - '''Sets up logging to a file. - @param stream: FILE pointer opened for writing (the FILE pointer must remain valid until L{log_unset}()). - @version: LibVLC 2.1.0 or later. - ''' - return libvlc_log_set_file(self, stream) - - def media_discoverer_new(self, psz_name): - '''Create a media discoverer object by name. - After this object is created, you should attach to media_list events in - order to be notified of new items discovered. - You need to call L{media_discoverer_start}() in order to start the - discovery. - See L{media_discoverer_media_list} - See L{media_discoverer_event_manager} - See L{media_discoverer_start}. - @param psz_name: service name; use L{media_discoverer_list_get}() to get a list of the discoverer names available in this libVLC instance. - @return: media discover object or None in case of error. - @version: LibVLC 3.0.0 or later. - ''' - return libvlc_media_discoverer_new(self, str_to_bytes(psz_name)) - - def media_discoverer_list_get(self, i_cat, ppp_services): - '''Get media discoverer services by category. - @param i_cat: category of services to fetch. - @param ppp_services: address to store an allocated array of media discoverer services (must be freed with L{media_discoverer_list_release}() by the caller) [OUT]. - @return: the number of media discoverer services (0 on error). - @version: LibVLC 3.0.0 and later. - ''' - return libvlc_media_discoverer_list_get(self, i_cat, ppp_services) - - def media_library_new(self): - '''Create an new Media Library object. - @return: a new object or None on error. - ''' - return libvlc_media_library_new(self) - - def vlm_release(self): - '''Release the vlm instance related to the given L{Instance}. - ''' - return libvlc_vlm_release(self) - - def vlm_add_broadcast(self, psz_name, psz_input, psz_output, i_options, ppsz_options, b_enabled, b_loop): - '''Add a broadcast, with one input. - @param psz_name: the name of the new broadcast. - @param psz_input: the input MRL. - @param psz_output: the output MRL (the parameter to the "sout" variable). - @param i_options: number of additional options. - @param ppsz_options: additional options. - @param b_enabled: boolean for enabling the new broadcast. - @param b_loop: Should this broadcast be played in loop ? - @return: 0 on success, -1 on error. - ''' - return libvlc_vlm_add_broadcast(self, str_to_bytes(psz_name), str_to_bytes(psz_input), str_to_bytes(psz_output), - i_options, ppsz_options, b_enabled, b_loop) - - def vlm_add_vod(self, psz_name, psz_input, i_options, ppsz_options, b_enabled, psz_mux): - '''Add a vod, with one input. - @param psz_name: the name of the new vod media. - @param psz_input: the input MRL. - @param i_options: number of additional options. - @param ppsz_options: additional options. - @param b_enabled: boolean for enabling the new vod. - @param psz_mux: the muxer of the vod media. - @return: 0 on success, -1 on error. - ''' - return libvlc_vlm_add_vod(self, str_to_bytes(psz_name), str_to_bytes(psz_input), i_options, ppsz_options, - b_enabled, str_to_bytes(psz_mux)) - - def vlm_del_media(self, psz_name): - '''Delete a media (VOD or broadcast). - @param psz_name: the media to delete. - @return: 0 on success, -1 on error. - ''' - return libvlc_vlm_del_media(self, str_to_bytes(psz_name)) - - def vlm_set_enabled(self, psz_name, b_enabled): - '''Enable or disable a media (VOD or broadcast). - @param psz_name: the media to work on. - @param b_enabled: the new status. - @return: 0 on success, -1 on error. - ''' - return libvlc_vlm_set_enabled(self, str_to_bytes(psz_name), b_enabled) - - def vlm_set_output(self, psz_name, psz_output): - '''Set the output for a media. - @param psz_name: the media to work on. - @param psz_output: the output MRL (the parameter to the "sout" variable). - @return: 0 on success, -1 on error. - ''' - return libvlc_vlm_set_output(self, str_to_bytes(psz_name), str_to_bytes(psz_output)) - - def vlm_set_input(self, psz_name, psz_input): - '''Set a media's input MRL. This will delete all existing inputs and - add the specified one. - @param psz_name: the media to work on. - @param psz_input: the input MRL. - @return: 0 on success, -1 on error. - ''' - return libvlc_vlm_set_input(self, str_to_bytes(psz_name), str_to_bytes(psz_input)) - - def vlm_add_input(self, psz_name, psz_input): - '''Add a media's input MRL. This will add the specified one. - @param psz_name: the media to work on. - @param psz_input: the input MRL. - @return: 0 on success, -1 on error. - ''' - return libvlc_vlm_add_input(self, str_to_bytes(psz_name), str_to_bytes(psz_input)) - - def vlm_set_loop(self, psz_name, b_loop): - '''Set a media's loop status. - @param psz_name: the media to work on. - @param b_loop: the new status. - @return: 0 on success, -1 on error. - ''' - return libvlc_vlm_set_loop(self, str_to_bytes(psz_name), b_loop) - - def vlm_set_mux(self, psz_name, psz_mux): - '''Set a media's vod muxer. - @param psz_name: the media to work on. - @param psz_mux: the new muxer. - @return: 0 on success, -1 on error. - ''' - return libvlc_vlm_set_mux(self, str_to_bytes(psz_name), str_to_bytes(psz_mux)) - - def vlm_change_media(self, psz_name, psz_input, psz_output, i_options, ppsz_options, b_enabled, b_loop): - '''Edit the parameters of a media. This will delete all existing inputs and - add the specified one. - @param psz_name: the name of the new broadcast. - @param psz_input: the input MRL. - @param psz_output: the output MRL (the parameter to the "sout" variable). - @param i_options: number of additional options. - @param ppsz_options: additional options. - @param b_enabled: boolean for enabling the new broadcast. - @param b_loop: Should this broadcast be played in loop ? - @return: 0 on success, -1 on error. - ''' - return libvlc_vlm_change_media(self, str_to_bytes(psz_name), str_to_bytes(psz_input), str_to_bytes(psz_output), - i_options, ppsz_options, b_enabled, b_loop) - - def vlm_play_media(self, psz_name): - '''Play the named broadcast. - @param psz_name: the name of the broadcast. - @return: 0 on success, -1 on error. - ''' - return libvlc_vlm_play_media(self, str_to_bytes(psz_name)) - - def vlm_stop_media(self, psz_name): - '''Stop the named broadcast. - @param psz_name: the name of the broadcast. - @return: 0 on success, -1 on error. - ''' - return libvlc_vlm_stop_media(self, str_to_bytes(psz_name)) - - def vlm_pause_media(self, psz_name): - '''Pause the named broadcast. - @param psz_name: the name of the broadcast. - @return: 0 on success, -1 on error. - ''' - return libvlc_vlm_pause_media(self, str_to_bytes(psz_name)) - - def vlm_seek_media(self, psz_name, f_percentage): - '''Seek in the named broadcast. - @param psz_name: the name of the broadcast. - @param f_percentage: the percentage to seek to. - @return: 0 on success, -1 on error. - ''' - return libvlc_vlm_seek_media(self, str_to_bytes(psz_name), f_percentage) - - def vlm_show_media(self, psz_name): - '''Return information about the named media as a JSON - string representation. - This function is mainly intended for debugging use, - if you want programmatic access to the state of - a vlm_media_instance_t, please use the corresponding - libvlc_vlm_get_media_instance_xxx -functions. - Currently there are no such functions available for - vlm_media_t though. - @param psz_name: the name of the media, if the name is an empty string, all media is described. - @return: string with information about named media, or None on error. - ''' - return libvlc_vlm_show_media(self, str_to_bytes(psz_name)) - - def vlm_get_media_instance_position(self, psz_name, i_instance): - '''Get vlm_media instance position by name or instance id. - @param psz_name: name of vlm media instance. - @param i_instance: instance id. - @return: position as float or -1. on error. - ''' - return libvlc_vlm_get_media_instance_position(self, str_to_bytes(psz_name), i_instance) - - def vlm_get_media_instance_time(self, psz_name, i_instance): - '''Get vlm_media instance time by name or instance id. - @param psz_name: name of vlm media instance. - @param i_instance: instance id. - @return: time as integer or -1 on error. - ''' - return libvlc_vlm_get_media_instance_time(self, str_to_bytes(psz_name), i_instance) - - def vlm_get_media_instance_length(self, psz_name, i_instance): - '''Get vlm_media instance length by name or instance id. - @param psz_name: name of vlm media instance. - @param i_instance: instance id. - @return: length of media item or -1 on error. - ''' - return libvlc_vlm_get_media_instance_length(self, str_to_bytes(psz_name), i_instance) - - def vlm_get_media_instance_rate(self, psz_name, i_instance): - '''Get vlm_media instance playback rate by name or instance id. - @param psz_name: name of vlm media instance. - @param i_instance: instance id. - @return: playback rate or -1 on error. - ''' - return libvlc_vlm_get_media_instance_rate(self, str_to_bytes(psz_name), i_instance) - - def vlm_get_media_instance_title(self, psz_name, i_instance): - '''Get vlm_media instance title number by name or instance id. - @param psz_name: name of vlm media instance. - @param i_instance: instance id. - @return: title as number or -1 on error. - @bug: will always return 0. - ''' - return libvlc_vlm_get_media_instance_title(self, str_to_bytes(psz_name), i_instance) - - def vlm_get_media_instance_chapter(self, psz_name, i_instance): - '''Get vlm_media instance chapter number by name or instance id. - @param psz_name: name of vlm media instance. - @param i_instance: instance id. - @return: chapter as number or -1 on error. - @bug: will always return 0. - ''' - return libvlc_vlm_get_media_instance_chapter(self, str_to_bytes(psz_name), i_instance) - - def vlm_get_media_instance_seekable(self, psz_name, i_instance): - '''Is libvlc instance seekable ? - @param psz_name: name of vlm media instance. - @param i_instance: instance id. - @return: 1 if seekable, 0 if not, -1 if media does not exist. - @bug: will always return 0. - ''' - return libvlc_vlm_get_media_instance_seekable(self, str_to_bytes(psz_name), i_instance) - - @memoize_parameterless - def vlm_get_event_manager(self): - '''Get libvlc_event_manager from a vlm media. - The p_event_manager is immutable, so you don't have to hold the lock. - @return: libvlc_event_manager. - ''' - return libvlc_vlm_get_event_manager(self) - - def media_new_location(self, psz_mrl): - '''Create a media with a certain given media resource location, - for instance a valid URL. - @note: To refer to a local file with this function, - the file://... URI syntax B{must} be used (see IETF RFC3986). - We recommend using L{media_new_path}() instead when dealing with - local files. - See L{media_release}. - @param psz_mrl: the media location. - @return: the newly created media or None on error. - ''' - return libvlc_media_new_location(self, str_to_bytes(psz_mrl)) - - def media_new_path(self, path): - '''Create a media for a certain file path. - See L{media_release}. - @param path: local filesystem path. - @return: the newly created media or None on error. - ''' - return libvlc_media_new_path(self, str_to_bytes(path)) - - def media_new_fd(self, fd): - '''Create a media for an already open file descriptor. - The file descriptor shall be open for reading (or reading and writing). - Regular file descriptors, pipe read descriptors and character device - descriptors (including TTYs) are supported on all platforms. - Block device descriptors are supported where available. - Directory descriptors are supported on systems that provide fdopendir(). - Sockets are supported on all platforms where they are file descriptors, - i.e. all except Windows. - @note: This library will B{not} automatically close the file descriptor - under any circumstance. Nevertheless, a file descriptor can usually only be - rendered once in a media player. To render it a second time, the file - descriptor should probably be rewound to the beginning with lseek(). - See L{media_release}. - @param fd: open file descriptor. - @return: the newly created media or None on error. - @version: LibVLC 1.1.5 and later. - ''' - return libvlc_media_new_fd(self, fd) - - def media_new_callbacks(self, open_cb, read_cb, seek_cb, close_cb, opaque): - '''Create a media with custom callbacks to read the data from. - @param open_cb: callback to open the custom bitstream input media. - @param read_cb: callback to read data (must not be None). - @param seek_cb: callback to seek, or None if seeking is not supported. - @param close_cb: callback to close the media, or None if unnecessary. - @param opaque: data pointer for the open callback. - @return: the newly created media or None on error @note If open_cb is None, the opaque pointer will be passed to read_cb, seek_cb and close_cb, and the stream size will be treated as unknown. @note The callbacks may be called asynchronously (from another thread). A single stream instance need not be reentrant. However the open_cb needs to be reentrant if the media is used by multiple player instances. @warning The callbacks may be used until all or any player instances that were supplied the media item are stopped. See L{media_release}. - @version: LibVLC 3.0.0 and later. - ''' - return libvlc_media_new_callbacks(self, open_cb, read_cb, seek_cb, close_cb, opaque) - - def media_new_as_node(self, psz_name): - '''Create a media as an empty node with a given name. - See L{media_release}. - @param psz_name: the name of the node. - @return: the new empty media or None on error. - ''' - return libvlc_media_new_as_node(self, str_to_bytes(psz_name)) - - def renderer_discoverer_new(self, psz_name): - '''Create a renderer discoverer object by name - After this object is created, you should attach to events in order to be - notified of the discoverer events. - You need to call L{renderer_discoverer_start}() in order to start the - discovery. - See L{renderer_discoverer_event_manager}() - See L{renderer_discoverer_start}(). - @param psz_name: service name; use L{renderer_discoverer_list_get}() to get a list of the discoverer names available in this libVLC instance. - @return: media discover object or None in case of error. - @version: LibVLC 3.0.0 or later. - ''' - return libvlc_renderer_discoverer_new(self, str_to_bytes(psz_name)) - - def renderer_discoverer_list_get(self, ppp_services): - '''Get media discoverer services - See libvlc_renderer_list_release(). - @param ppp_services: address to store an allocated array of renderer discoverer services (must be freed with libvlc_renderer_list_release() by the caller) [OUT]. - @return: the number of media discoverer services (0 on error). - @version: LibVLC 3.0.0 and later. - ''' - return libvlc_renderer_discoverer_list_get(self, ppp_services) - - def audio_output_device_count(self, psz_audio_output): - '''Backward compatibility stub. Do not use in new code. - \deprecated Use L{audio_output_device_list_get}() instead. - @return: always 0. - ''' - return libvlc_audio_output_device_count(self, str_to_bytes(psz_audio_output)) - - def audio_output_device_longname(self, psz_output, i_device): - '''Backward compatibility stub. Do not use in new code. - \deprecated Use L{audio_output_device_list_get}() instead. - @return: always None. - ''' - return libvlc_audio_output_device_longname(self, str_to_bytes(psz_output), i_device) - - def audio_output_device_id(self, psz_audio_output, i_device): - '''Backward compatibility stub. Do not use in new code. - \deprecated Use L{audio_output_device_list_get}() instead. - @return: always None. - ''' - return libvlc_audio_output_device_id(self, str_to_bytes(psz_audio_output), i_device) - - def media_discoverer_new_from_name(self, psz_name): - '''\deprecated Use L{media_discoverer_new}() and L{media_discoverer_start}(). - ''' - return libvlc_media_discoverer_new_from_name(self, str_to_bytes(psz_name)) - - def wait(self): - '''Waits until an interface causes the instance to exit. - You should start at least one interface first, using L{add_intf}(). - ''' - return libvlc_wait(self) - - def get_log_verbosity(self): - '''Always returns minus one. - This function is only provided for backward compatibility. - @return: always -1. - ''' - return libvlc_get_log_verbosity(self) - - def set_log_verbosity(self, level): - '''This function does nothing. - It is only provided for backward compatibility. - @param level: ignored. - ''' - return libvlc_set_log_verbosity(self, level) - - def log_open(self): - '''This function does nothing useful. - It is only provided for backward compatibility. - @return: an unique pointer or None on error. - ''' - return libvlc_log_open(self) - - def playlist_play(self, i_id, i_options, ppsz_options): - '''Start playing (if there is any item in the playlist). - Additionnal playlist item options can be specified for addition to the - item before it is played. - @param i_id: the item to play. If this is a negative number, the next item will be selected. Otherwise, the item with the given ID will be played. - @param i_options: the number of options to add to the item. - @param ppsz_options: the options to add to the item. - ''' - return libvlc_playlist_play(self, i_id, i_options, ppsz_options) - - def audio_output_list_get(self): - '''Gets the list of available audio output modules. - @return: list of available audio outputs. It must be freed with In case of error, None is returned. - ''' - return libvlc_audio_output_list_get(self) - - def audio_output_device_list_get(self, aout): - '''Gets a list of audio output devices for a given audio output module, - See L{audio_output_device_set}(). - @note: Not all audio outputs support this. In particular, an empty (None) - list of devices does B{not} imply that the specified audio output does - not work. - @note: The list might not be exhaustive. - @warning: Some audio output devices in the list might not actually work in - some circumstances. By default, it is recommended to not specify any - explicit audio device. - @param aout: audio output name (as returned by L{audio_output_list_get}()). - @return: A None-terminated linked list of potential audio output devices. It must be freed with L{audio_output_device_list_release}(). - @version: LibVLC 2.1.0 or later. - ''' - return libvlc_audio_output_device_list_get(self, str_to_bytes(aout)) - - -class LogIterator(_Ctype): - '''Create a new VLC log iterator. - - ''' - - def __new__(cls, ptr=_internal_guard): - '''(INTERNAL) ctypes wrapper constructor. - ''' - return _Constructor(cls, ptr) - - def __iter__(self): - return self - - def next(self): - if self.has_next(): - b = LogMessage() - i = libvlc_log_iterator_next(self, b) - return i.contents - raise StopIteration - - def __next__(self): - return self.next() - - def free(self): - '''Frees memory allocated by L{log_get_iterator}(). - ''' - return libvlc_log_iterator_free(self) - - def has_next(self): - '''Always returns zero. - This function is only provided for backward compatibility. - @return: always zero. - ''' - return libvlc_log_iterator_has_next(self) - - -class Media(_Ctype): - '''Create a new Media instance. - - Usage: Media(MRL, *options) - - See vlc.Instance.media_new documentation for details. - - ''' - - def __new__(cls, *args): - if args: - i = args[0] - if isinstance(i, _Ints): - return _Constructor(cls, i) - if isinstance(i, Instance): - return i.media_new(*args[1:]) - - o = get_default_instance().media_new(*args) - return o - - def get_instance(self): - return getattr(self, '_instance', None) - - def add_options(self, *options): - """Add a list of options to the media. - - Options must be written without the double-dash. Warning: most - audio and video options, such as text renderer, have no - effects on an individual media. These options must be set at - the vlc.Instance or vlc.MediaPlayer instanciation. - - @param options: optional media option=value strings - """ - for o in options: - self.add_option(o) - - def tracks_get(self): - """Get media descriptor's elementary streams description - Note, you need to call L{parse}() or play the media at least once - before calling this function. - Not doing this will result in an empty array. - The result must be freed with L{tracks_release}. - @version: LibVLC 2.1.0 and later. - """ - mediaTrack_pp = ctypes.POINTER(MediaTrack)() - n = libvlc_media_tracks_get(self, ctypes.byref(mediaTrack_pp)) - info = ctypes.cast(mediaTrack_pp, ctypes.POINTER(ctypes.POINTER(MediaTrack) * n)) - try: - contents = info.contents - except ValueError: - # Media not parsed, no info. - return None - tracks = (contents[i].contents for i in range(len(contents))) - # libvlc_media_tracks_release(mediaTrack_pp, n) - return tracks - - def add_option(self, psz_options): - '''Add an option to the media. - This option will be used to determine how the media_player will - read the media. This allows to use VLC's advanced - reading/streaming options on a per-media basis. - @note: The options are listed in 'vlc --long-help' from the command line, - e.g. "-sout-all". Keep in mind that available options and their semantics - vary across LibVLC versions and builds. - @warning: Not all options affects L{Media} objects: - Specifically, due to architectural issues most audio and video options, - such as text renderer options, have no effects on an individual media. - These options must be set through L{new}() instead. - @param psz_options: the options (as a string). - ''' - return libvlc_media_add_option(self, str_to_bytes(psz_options)) - - def add_option_flag(self, psz_options, i_flags): - '''Add an option to the media with configurable flags. - This option will be used to determine how the media_player will - read the media. This allows to use VLC's advanced - reading/streaming options on a per-media basis. - The options are detailed in vlc --long-help, for instance - "--sout-all". Note that all options are not usable on medias: - specifically, due to architectural issues, video-related options - such as text renderer options cannot be set on a single media. They - must be set on the whole libvlc instance instead. - @param psz_options: the options (as a string). - @param i_flags: the flags for this option. - ''' - return libvlc_media_add_option_flag(self, str_to_bytes(psz_options), i_flags) - - def retain(self): - '''Retain a reference to a media descriptor object (L{Media}). Use - L{release}() to decrement the reference count of a - media descriptor object. - ''' - return libvlc_media_retain(self) - - def release(self): - '''Decrement the reference count of a media descriptor object. If the - reference count is 0, then L{release}() will release the - media descriptor object. It will send out an libvlc_MediaFreed event - to all listeners. If the media descriptor object has been released it - should not be used again. - ''' - return libvlc_media_release(self) - - def get_mrl(self): - '''Get the media resource locator (mrl) from a media descriptor object. - @return: string with mrl of media descriptor object. - ''' - return libvlc_media_get_mrl(self) - - def duplicate(self): - '''Duplicate a media descriptor object. - ''' - return libvlc_media_duplicate(self) - - def get_meta(self, e_meta): - '''Read the meta of the media. - If the media has not yet been parsed this will return None. - See L{parse} - See L{parse_with_options} - See libvlc_MediaMetaChanged. - @param e_meta: the meta to read. - @return: the media's meta. - ''' - return libvlc_media_get_meta(self, e_meta) - - def set_meta(self, e_meta, psz_value): - '''Set the meta of the media (this function will not save the meta, call - L{save_meta} in order to save the meta). - @param e_meta: the meta to write. - @param psz_value: the media's meta. - ''' - return libvlc_media_set_meta(self, e_meta, str_to_bytes(psz_value)) - - def save_meta(self): - '''Save the meta previously set. - @return: true if the write operation was successful. - ''' - return libvlc_media_save_meta(self) - - def get_state(self): - '''Get current state of media descriptor object. Possible media states are - libvlc_NothingSpecial=0, libvlc_Opening, libvlc_Playing, libvlc_Paused, - libvlc_Stopped, libvlc_Ended, libvlc_Error. - See L{State}. - @return: state of media descriptor object. - ''' - return libvlc_media_get_state(self) - - def get_stats(self, p_stats): - '''Get the current statistics about the media. - @param p_stats:: structure that contain the statistics about the media (this structure must be allocated by the caller). - @return: true if the statistics are available, false otherwise \libvlc_return_bool. - ''' - return libvlc_media_get_stats(self, p_stats) - - def subitems(self): - '''Get subitems of media descriptor object. This will increment - the reference count of supplied media descriptor object. Use - L{list_release}() to decrement the reference counting. - @return: list of media descriptor subitems or None. - ''' - return libvlc_media_subitems(self) - - @memoize_parameterless - def event_manager(self): - '''Get event manager from media descriptor object. - NOTE: this function doesn't increment reference counting. - @return: event manager object. - ''' - return libvlc_media_event_manager(self) - - def get_duration(self): - '''Get duration (in ms) of media descriptor object item. - @return: duration of media item or -1 on error. - ''' - return libvlc_media_get_duration(self) - - def parse_with_options(self, parse_flag, timeout): - '''Parse the media asynchronously with options. - This fetches (local or network) art, meta data and/or tracks information. - This method is the extended version of L{parse_with_options}(). - To track when this is over you can listen to libvlc_MediaParsedChanged - event. However if this functions returns an error, you will not receive any - events. - It uses a flag to specify parse options (see L{MediaParseFlag}). All - these flags can be combined. By default, media is parsed if it's a local - file. - @note: Parsing can be aborted with L{parse_stop}(). - See libvlc_MediaParsedChanged - See L{get_meta} - See L{tracks_get} - See L{get_parsed_status} - See L{MediaParseFlag}. - @param parse_flag: parse options: - @param timeout: maximum time allowed to preparse the media. If -1, the default "preparse-timeout" option will be used as a timeout. If 0, it will wait indefinitely. If > 0, the timeout will be used (in milliseconds). - @return: -1 in case of error, 0 otherwise. - @version: LibVLC 3.0.0 or later. - ''' - return libvlc_media_parse_with_options(self, parse_flag, timeout) - - def parse_stop(self): - '''Stop the parsing of the media - When the media parsing is stopped, the libvlc_MediaParsedChanged event will - be sent with the libvlc_media_parsed_status_timeout status. - See L{parse_with_options}. - @version: LibVLC 3.0.0 or later. - ''' - return libvlc_media_parse_stop(self) - - def get_parsed_status(self): - '''Get Parsed status for media descriptor object. - See libvlc_MediaParsedChanged - See L{MediaParsedStatus}. - @return: a value of the L{MediaParsedStatus} enum. - @version: LibVLC 3.0.0 or later. - ''' - return libvlc_media_get_parsed_status(self) - - def set_user_data(self, p_new_user_data): - '''Sets media descriptor's user_data. user_data is specialized data - accessed by the host application, VLC.framework uses it as a pointer to - an native object that references a L{Media} pointer. - @param p_new_user_data: pointer to user data. - ''' - return libvlc_media_set_user_data(self, p_new_user_data) - - def get_user_data(self): - '''Get media descriptor's user_data. user_data is specialized data - accessed by the host application, VLC.framework uses it as a pointer to - an native object that references a L{Media} pointer. - ''' - return libvlc_media_get_user_data(self) - - def get_type(self): - '''Get the media type of the media descriptor object. - @return: media type. - @version: LibVLC 3.0.0 and later. See L{MediaType}. - ''' - return libvlc_media_get_type(self) - - def slaves_add(self, i_type, i_priority, psz_uri): - '''Add a slave to the current media. - A slave is an external input source that may contains an additional subtitle - track (like a .srt) or an additional audio track (like a .ac3). - @note: This function must be called before the media is parsed (via - L{parse_with_options}()) or before the media is played (via - L{player_play}()). - @param i_type: subtitle or audio. - @param i_priority: from 0 (low priority) to 4 (high priority). - @param psz_uri: Uri of the slave (should contain a valid scheme). - @return: 0 on success, -1 on error. - @version: LibVLC 3.0.0 and later. - ''' - return libvlc_media_slaves_add(self, i_type, i_priority, str_to_bytes(psz_uri)) - - def slaves_clear(self): - '''Clear all slaves previously added by L{slaves_add}() or - internally. - @version: LibVLC 3.0.0 and later. - ''' - return libvlc_media_slaves_clear(self) - - def slaves_get(self, ppp_slaves): - '''Get a media descriptor's slave list - The list will contain slaves parsed by VLC or previously added by - L{slaves_add}(). The typical use case of this function is to save - a list of slave in a database for a later use. - @param ppp_slaves: address to store an allocated array of slaves (must be freed with L{slaves_release}()) [OUT]. - @return: the number of slaves (zero on error). - @version: LibVLC 3.0.0 and later. See L{slaves_add}. - ''' - return libvlc_media_slaves_get(self, ppp_slaves) - - def parse(self): - '''Parse a media. - This fetches (local) art, meta data and tracks information. - The method is synchronous. - \deprecated This function could block indefinitely. - Use L{parse_with_options}() instead - See L{parse_with_options} - See L{get_meta} - See L{get_tracks_info}. - ''' - return libvlc_media_parse(self) - - def parse_async(self): - '''Parse a media. - This fetches (local) art, meta data and tracks information. - The method is the asynchronous of L{parse}(). - To track when this is over you can listen to libvlc_MediaParsedChanged - event. However if the media was already parsed you will not receive this - event. - \deprecated You can't be sure to receive the libvlc_MediaParsedChanged - event (you can wait indefinitely for this event). - Use L{parse_with_options}() instead - See L{parse} - See libvlc_MediaParsedChanged - See L{get_meta} - See L{get_tracks_info}. - ''' - return libvlc_media_parse_async(self) - - def is_parsed(self): - '''Return true is the media descriptor object is parsed - \deprecated This can return true in case of failure. - Use L{get_parsed_status}() instead - See libvlc_MediaParsedChanged. - @return: true if media object has been parsed otherwise it returns false \libvlc_return_bool. - ''' - return libvlc_media_is_parsed(self) - - def get_tracks_info(self): - '''Get media descriptor's elementary streams description - Note, you need to call L{parse}() or play the media at least once - before calling this function. - Not doing this will result in an empty array. - \deprecated Use L{tracks_get}() instead. - @param tracks: address to store an allocated array of Elementary Streams descriptions (must be freed by the caller) [OUT]. - @return: the number of Elementary Streams. - ''' - return libvlc_media_get_tracks_info(self) - - def player_new_from_media(self): - '''Create a Media Player object from a Media. - @return: a new media player object, or None on error. - ''' - return libvlc_media_player_new_from_media(self) - - -class MediaDiscoverer(_Ctype): - '''N/A - ''' - - def __new__(cls, ptr=_internal_guard): - '''(INTERNAL) ctypes wrapper constructor. - ''' - return _Constructor(cls, ptr) - - def start(self): - '''Start media discovery. - To stop it, call L{stop}() or - L{list_release}() directly. - See L{stop}. - @return: -1 in case of error, 0 otherwise. - @version: LibVLC 3.0.0 or later. - ''' - return libvlc_media_discoverer_start(self) - - def stop(self): - '''Stop media discovery. - See L{start}. - @version: LibVLC 3.0.0 or later. - ''' - return libvlc_media_discoverer_stop(self) - - def release(self): - '''Release media discover object. If the reference count reaches 0, then - the object will be released. - ''' - return libvlc_media_discoverer_release(self) - - def media_list(self): - '''Get media service discover media list. - @return: list of media items. - ''' - return libvlc_media_discoverer_media_list(self) - - def is_running(self): - '''Query if media service discover object is running. - @return: true if running, false if not \libvlc_return_bool. - ''' - return libvlc_media_discoverer_is_running(self) - - def localized_name(self): - '''Get media service discover object its localized name. - \deprecated Useless, use L{list_get}() to get the - longname of the service discovery. - @return: localized name or None if the media_discoverer is not started. - ''' - return libvlc_media_discoverer_localized_name(self) - - @memoize_parameterless - def event_manager(self): - '''Get event manager from media service discover object. - \deprecated Useless, media_discoverer events are only triggered when calling - L{start}() and L{stop}(). - @return: event manager object. - ''' - return libvlc_media_discoverer_event_manager(self) - - -class MediaLibrary(_Ctype): - '''N/A - ''' - - def __new__(cls, ptr=_internal_guard): - '''(INTERNAL) ctypes wrapper constructor. - ''' - return _Constructor(cls, ptr) - - def release(self): - '''Release media library object. This functions decrements the - reference count of the media library object. If it reaches 0, - then the object will be released. - ''' - return libvlc_media_library_release(self) - - def retain(self): - '''Retain a reference to a media library object. This function will - increment the reference counting for this object. Use - L{release}() to decrement the reference count. - ''' - return libvlc_media_library_retain(self) - - def load(self): - '''Load media library. - @return: 0 on success, -1 on error. - ''' - return libvlc_media_library_load(self) - - def media_list(self): - '''Get media library subitems. - @return: media list subitems. - ''' - return libvlc_media_library_media_list(self) - - -class MediaList(_Ctype): - '''Create a new MediaList instance. - - Usage: MediaList(list_of_MRLs) - - See vlc.Instance.media_list_new documentation for details. - - ''' - - def __new__(cls, *args): - if args: - i = args[0] - if isinstance(i, _Ints): - return _Constructor(cls, i) - if isinstance(i, Instance): - return i.media_list_new(*args[1:]) - - o = get_default_instance().media_list_new(*args) - return o - - def get_instance(self): - return getattr(self, '_instance', None) - - def add_media(self, mrl): - """Add media instance to media list. - - The L{lock} should be held upon entering this function. - @param mrl: a media instance or a MRL. - @return: 0 on success, -1 if the media list is read-only. - """ - if isinstance(mrl, basestring): - mrl = (self.get_instance() or get_default_instance()).media_new(mrl) - return libvlc_media_list_add_media(self, mrl) - - def release(self): - '''Release media list created with L{new}(). - ''' - return libvlc_media_list_release(self) - - def retain(self): - '''Retain reference to a media list. - ''' - return libvlc_media_list_retain(self) - - def set_media(self, p_md): - '''Associate media instance with this media list instance. - If another media instance was present it will be released. - The L{lock} should NOT be held upon entering this function. - @param p_md: media instance to add. - ''' - return libvlc_media_list_set_media(self, p_md) - - def media(self): - '''Get media instance from this media list instance. This action will increase - the refcount on the media instance. - The L{lock} should NOT be held upon entering this function. - @return: media instance. - ''' - return libvlc_media_list_media(self) - - def insert_media(self, p_md, i_pos): - '''Insert media instance in media list on a position - The L{lock} should be held upon entering this function. - @param p_md: a media instance. - @param i_pos: position in array where to insert. - @return: 0 on success, -1 if the media list is read-only. - ''' - return libvlc_media_list_insert_media(self, p_md, i_pos) - - def remove_index(self, i_pos): - '''Remove media instance from media list on a position - The L{lock} should be held upon entering this function. - @param i_pos: position in array where to insert. - @return: 0 on success, -1 if the list is read-only or the item was not found. - ''' - return libvlc_media_list_remove_index(self, i_pos) - - def count(self): - '''Get count on media list items - The L{lock} should be held upon entering this function. - @return: number of items in media list. - ''' - return libvlc_media_list_count(self) - - def __len__(self): - return libvlc_media_list_count(self) - - def item_at_index(self, i_pos): - '''List media instance in media list at a position - The L{lock} should be held upon entering this function. - @param i_pos: position in array where to insert. - @return: media instance at position i_pos, or None if not found. In case of success, L{media_retain}() is called to increase the refcount on the media. - ''' - return libvlc_media_list_item_at_index(self, i_pos) - - def __getitem__(self, i): - return libvlc_media_list_item_at_index(self, i) - - def __iter__(self): - for i in range(len(self)): - yield self[i] - - def index_of_item(self, p_md): - '''Find index position of List media instance in media list. - Warning: the function will return the first matched position. - The L{lock} should be held upon entering this function. - @param p_md: media instance. - @return: position of media instance or -1 if media not found. - ''' - return libvlc_media_list_index_of_item(self, p_md) - - def is_readonly(self): - '''This indicates if this media list is read-only from a user point of view. - @return: 1 on readonly, 0 on readwrite \libvlc_return_bool. - ''' - return libvlc_media_list_is_readonly(self) - - def lock(self): - '''Get lock on media list items. - ''' - return libvlc_media_list_lock(self) - - def unlock(self): - '''Release lock on media list items - The L{lock} should be held upon entering this function. - ''' - return libvlc_media_list_unlock(self) - - @memoize_parameterless - def event_manager(self): - '''Get libvlc_event_manager from this media list instance. - The p_event_manager is immutable, so you don't have to hold the lock. - @return: libvlc_event_manager. - ''' - return libvlc_media_list_event_manager(self) - - -class MediaListPlayer(_Ctype): - '''Create a new MediaListPlayer instance. - - It may take as parameter either: - - a vlc.Instance - - nothing - - ''' - - def __new__(cls, arg=None): - if arg is None: - i = get_default_instance() - elif isinstance(arg, Instance): - i = arg - elif isinstance(arg, _Ints): - return _Constructor(cls, arg) - else: - raise TypeError('MediaListPlayer %r' % (arg,)) - - return i.media_list_player_new() - - def get_instance(self): - """Return the associated Instance. - """ - return self._instance # PYCHOK expected - - def release(self): - '''Release a media_list_player after use - Decrement the reference count of a media player object. If the - reference count is 0, then L{release}() will - release the media player object. If the media player object - has been released, then it should not be used again. - ''' - return libvlc_media_list_player_release(self) - - def retain(self): - '''Retain a reference to a media player list object. Use - L{release}() to decrement reference count. - ''' - return libvlc_media_list_player_retain(self) - - @memoize_parameterless - def event_manager(self): - '''Return the event manager of this media_list_player. - @return: the event manager. - ''' - return libvlc_media_list_player_event_manager(self) - - def set_media_player(self, p_mi): - '''Replace media player in media_list_player with this instance. - @param p_mi: media player instance. - ''' - return libvlc_media_list_player_set_media_player(self, p_mi) - - def get_media_player(self): - '''Get media player of the media_list_player instance. - @return: media player instance @note the caller is responsible for releasing the returned instance. - ''' - return libvlc_media_list_player_get_media_player(self) - - def set_media_list(self, p_mlist): - '''Set the media list associated with the player. - @param p_mlist: list of media. - ''' - return libvlc_media_list_player_set_media_list(self, p_mlist) - - def play(self): - '''Play media list. - ''' - return libvlc_media_list_player_play(self) - - def pause(self): - '''Toggle pause (or resume) media list. - ''' - return libvlc_media_list_player_pause(self) - - def set_pause(self, do_pause): - '''Pause or resume media list. - @param do_pause: play/resume if zero, pause if non-zero. - @version: LibVLC 3.0.0 or later. - ''' - return libvlc_media_list_player_set_pause(self, do_pause) - - def is_playing(self): - '''Is media list playing? - @return: true for playing and false for not playing \libvlc_return_bool. - ''' - return libvlc_media_list_player_is_playing(self) - - def get_state(self): - '''Get current libvlc_state of media list player. - @return: L{State} for media list player. - ''' - return libvlc_media_list_player_get_state(self) - - def play_item_at_index(self, i_index): - '''Play media list item at position index. - @param i_index: index in media list to play. - @return: 0 upon success -1 if the item wasn't found. - ''' - return libvlc_media_list_player_play_item_at_index(self, i_index) - - def __getitem__(self, i): - return libvlc_media_list_player_play_item_at_index(self, i) - - def __iter__(self): - for i in range(len(self)): - yield self[i] - - def play_item(self, p_md): - '''Play the given media item. - @param p_md: the media instance. - @return: 0 upon success, -1 if the media is not part of the media list. - ''' - return libvlc_media_list_player_play_item(self, p_md) - - def stop(self): - '''Stop playing media list. - ''' - return libvlc_media_list_player_stop(self) - - def next(self): - '''Play next item from media list. - @return: 0 upon success -1 if there is no next item. - ''' - return libvlc_media_list_player_next(self) - - def previous(self): - '''Play previous item from media list. - @return: 0 upon success -1 if there is no previous item. - ''' - return libvlc_media_list_player_previous(self) - - def set_playback_mode(self, e_mode): - '''Sets the playback mode for the playlist. - @param e_mode: playback mode specification. - ''' - return libvlc_media_list_player_set_playback_mode(self, e_mode) - - -class MediaPlayer(_Ctype): - '''Create a new MediaPlayer instance. - - It may take as parameter either: - - a string (media URI), options... In this case, a vlc.Instance will be created. - - a vlc.Instance, a string (media URI), options... - - ''' - - def __new__(cls, *args): - if len(args) == 1 and isinstance(args[0], _Ints): - return _Constructor(cls, args[0]) - - if args and isinstance(args[0], Instance): - instance = args[0] - args = args[1:] - else: - instance = get_default_instance() - - o = instance.media_player_new() - if args: - o.set_media(instance.media_new(*args)) - return o - - def get_instance(self): - """Return the associated Instance. - """ - return self._instance # PYCHOK expected - - def set_mrl(self, mrl, *options): - """Set the MRL to play. - - Warning: most audio and video options, such as text renderer, - have no effects on an individual media. These options must be - set at the vlc.Instance or vlc.MediaPlayer instanciation. - - @param mrl: The MRL - @param options: optional media option=value strings - @return: the Media object - """ - m = self.get_instance().media_new(mrl, *options) - self.set_media(m) - return m - - def video_get_spu_description(self): - """Get the description of available video subtitles. - """ - return track_description_list(libvlc_video_get_spu_description(self)) - - def video_get_title_description(self): - """Get the description of available titles. - """ - return track_description_list(libvlc_video_get_title_description(self)) - - def video_get_chapter_description(self, title): - """Get the description of available chapters for specific title. - - @param title: selected title (int) - """ - return track_description_list(libvlc_video_get_chapter_description(self, title)) - - def video_get_track_description(self): - """Get the description of available video tracks. - """ - return track_description_list(libvlc_video_get_track_description(self)) - - def audio_get_track_description(self): - """Get the description of available audio tracks. - """ - return track_description_list(libvlc_audio_get_track_description(self)) - - def get_full_title_descriptions(self): - '''Get the full description of available titles. - @return: the titles list - @version: LibVLC 3.0.0 and later. - ''' - titleDescription_pp = ctypes.POINTER(TitleDescription)() - n = libvlc_media_player_get_full_title_descriptions(self, ctypes.byref(titleDescription_pp)) - info = ctypes.cast(titleDescription_pp, ctypes.POINTER(ctypes.POINTER(TitleDescription) * n)) - try: - contents = info.contents - except ValueError: - # Media not parsed, no info. - return None - descr = (contents[i].contents for i in range(len(contents))) - return descr - - def get_full_chapter_descriptions(self, i_chapters_of_title): - '''Get the full description of available chapters. - @param i_chapters_of_title: index of the title to query for chapters (uses current title if set to -1). - @return: the chapters list - @version: LibVLC 3.0.0 and later. - ''' - chapterDescription_pp = ctypes.POINTER(ChapterDescription)() - n = libvlc_media_player_get_full_chapter_descriptions(self, ctypes.byref(chapterDescription_pp)) - info = ctypes.cast(chapterDescription_pp, ctypes.POINTER(ctypes.POINTER(ChapterDescription) * n)) - try: - contents = info.contents - except ValueError: - # Media not parsed, no info. - return None - descr = (contents[i].contents for i in range(len(contents))) - return descr - - def video_get_size(self, num=0): - """Get the video size in pixels as 2-tuple (width, height). - - @param num: video number (default 0). - """ - r = libvlc_video_get_size(self, num) - if isinstance(r, tuple) and len(r) == 2: - return r - else: - raise VLCException('invalid video number (%s)' % (num,)) - - def set_hwnd(self, drawable): - """Set a Win32/Win64 API window handle (HWND). - - Specify where the media player should render its video - output. If LibVLC was built without Win32/Win64 API output - support, then this has no effects. - - @param drawable: windows handle of the drawable. - """ - if not isinstance(drawable, ctypes.c_void_p): - drawable = ctypes.c_void_p(int(drawable)) - libvlc_media_player_set_hwnd(self, drawable) - - def video_get_width(self, num=0): - """Get the width of a video in pixels. - - @param num: video number (default 0). - """ - return self.video_get_size(num)[0] - - def video_get_height(self, num=0): - """Get the height of a video in pixels. - - @param num: video number (default 0). - """ - return self.video_get_size(num)[1] - - def video_get_cursor(self, num=0): - """Get the mouse pointer coordinates over a video as 2-tuple (x, y). - - Coordinates are expressed in terms of the decoded video resolution, - B{not} in terms of pixels on the screen/viewport. To get the - latter, you must query your windowing system directly. - - Either coordinate may be negative or larger than the corresponding - size of the video, if the cursor is outside the rendering area. - - @warning: The coordinates may be out-of-date if the pointer is not - located on the video rendering area. LibVLC does not track the - mouse pointer if the latter is outside the video widget. - - @note: LibVLC does not support multiple mouse pointers (but does - support multiple input devices sharing the same pointer). - - @param num: video number (default 0). - """ - r = libvlc_video_get_cursor(self, num) - if isinstance(r, tuple) and len(r) == 2: - return r - raise VLCException('invalid video number (%s)' % (num,)) - - def get_fps(self): - '''Get movie fps rate - This function is provided for backward compatibility. It cannot deal with - multiple video tracks. In LibVLC versions prior to 3.0, it would also fail - if the file format did not convey the frame rate explicitly. - \deprecated Consider using L{media_tracks_get}() instead. - @return: frames per second (fps) for this playing movie, or 0 if unspecified. - ''' - return libvlc_media_player_get_fps(self) - - def set_agl(self, drawable): - '''\deprecated Use L{set_nsobject}() instead. - ''' - return libvlc_media_player_set_agl(self, drawable) - - def get_agl(self): - '''\deprecated Use L{get_nsobject}() instead. - ''' - return libvlc_media_player_get_agl(self) - - def video_set_subtitle_file(self, psz_subtitle): - '''Set new video subtitle file. - \deprecated Use L{add_slave}() instead. - @param psz_subtitle: new video subtitle file. - @return: the success status (boolean). - ''' - return libvlc_video_set_subtitle_file(self, str_to_bytes(psz_subtitle)) - - def toggle_teletext(self): - '''Toggle teletext transparent status on video output. - \deprecated use L{video_set_teletext}() instead. - ''' - return libvlc_toggle_teletext(self) - - def release(self): - '''Release a media_player after use - Decrement the reference count of a media player object. If the - reference count is 0, then L{release}() will - release the media player object. If the media player object - has been released, then it should not be used again. - ''' - return libvlc_media_player_release(self) - - def retain(self): - '''Retain a reference to a media player object. Use - L{release}() to decrement reference count. - ''' - return libvlc_media_player_retain(self) - - def set_media(self, p_md): - '''Set the media that will be used by the media_player. If any, - previous md will be released. - @param p_md: the Media. Afterwards the p_md can be safely destroyed. - ''' - return libvlc_media_player_set_media(self, p_md) - - def get_media(self): - '''Get the media used by the media_player. - @return: the media associated with p_mi, or None if no media is associated. - ''' - return libvlc_media_player_get_media(self) - - @memoize_parameterless - def event_manager(self): - '''Get the Event Manager from which the media player send event. - @return: the event manager associated with p_mi. - ''' - return libvlc_media_player_event_manager(self) - - def is_playing(self): - '''is_playing. - @return: 1 if the media player is playing, 0 otherwise \libvlc_return_bool. - ''' - return libvlc_media_player_is_playing(self) - - def play(self): - '''Play. - @return: 0 if playback started (and was already started), or -1 on error. - ''' - return libvlc_media_player_play(self) - - def set_pause(self, do_pause): - '''Pause or resume (no effect if there is no media). - @param do_pause: play/resume if zero, pause if non-zero. - @version: LibVLC 1.1.1 or later. - ''' - return libvlc_media_player_set_pause(self, do_pause) - - def pause(self): - '''Toggle pause (no effect if there is no media). - ''' - return libvlc_media_player_pause(self) - - def stop(self): - '''Stop (no effect if there is no media). - ''' - return libvlc_media_player_stop(self) - - def set_renderer(self, p_item): - '''Set a renderer to the media player - @note: must be called before the first call of L{play}() to - take effect. - See L{renderer_discoverer_new}. - @param p_item: an item discovered by L{renderer_discoverer_start}(). - @return: 0 on success, -1 on error. - @version: LibVLC 3.0.0 or later. - ''' - return libvlc_media_player_set_renderer(self, p_item) - - def video_set_callbacks(self, lock, unlock, display, opaque): - '''Set callbacks and private data to render decoded video to a custom area - in memory. - Use L{video_set_format}() or L{video_set_format_callbacks}() - to configure the decoded format. - @warning: Rendering video into custom memory buffers is considerably less - efficient than rendering in a custom window as normal. - For optimal perfomances, VLC media player renders into a custom window, and - does not use this function and associated callbacks. It is B{highly - recommended} that other LibVLC-based application do likewise. - To embed video in a window, use libvlc_media_player_set_xid() or equivalent - depending on the operating system. - If window embedding does not fit the application use case, then a custom - LibVLC video output display plugin is required to maintain optimal video - rendering performances. - The following limitations affect performance: - - Hardware video decoding acceleration will either be disabled completely, - or require (relatively slow) copy from video/DSP memory to main memory. - - Sub-pictures (subtitles, on-screen display, etc.) must be blent into the - main picture by the CPU instead of the GPU. - - Depending on the video format, pixel format conversion, picture scaling, - cropping and/or picture re-orientation, must be performed by the CPU - instead of the GPU. - - Memory copying is required between LibVLC reference picture buffers and - application buffers (between lock and unlock callbacks). - @param lock: callback to lock video memory (must not be None). - @param unlock: callback to unlock video memory (or None if not needed). - @param display: callback to display video (or None if not needed). - @param opaque: private pointer for the three callbacks (as first parameter). - @version: LibVLC 1.1.1 or later. - ''' - return libvlc_video_set_callbacks(self, lock, unlock, display, opaque) - - def video_set_format(self, chroma, width, height, pitch): - '''Set decoded video chroma and dimensions. - This only works in combination with L{video_set_callbacks}(), - and is mutually exclusive with L{video_set_format_callbacks}(). - @param chroma: a four-characters string identifying the chroma (e.g. "RV32" or "YUYV"). - @param width: pixel width. - @param height: pixel height. - @param pitch: line pitch (in bytes). - @version: LibVLC 1.1.1 or later. - @bug: All pixel planes are expected to have the same pitch. To use the YCbCr color space with chrominance subsampling, consider using L{video_set_format_callbacks}() instead. - ''' - return libvlc_video_set_format(self, str_to_bytes(chroma), width, height, pitch) - - def video_set_format_callbacks(self, setup, cleanup): - '''Set decoded video chroma and dimensions. This only works in combination with - L{video_set_callbacks}(). - @param setup: callback to select the video format (cannot be None). - @param cleanup: callback to release any allocated resources (or None). - @version: LibVLC 2.0.0 or later. - ''' - return libvlc_video_set_format_callbacks(self, setup, cleanup) - - def set_nsobject(self, drawable): - '''Set the NSView handler where the media player should render its video output. - Use the vout called "macosx". - The drawable is an NSObject that follow the VLCOpenGLVideoViewEmbedding - protocol: - @code.m - \@protocol VLCOpenGLVideoViewEmbedding - - (void)addVoutSubview:(NSView *)view; - - (void)removeVoutSubview:(NSView *)view; - \@end - @endcode - Or it can be an NSView object. - If you want to use it along with Qt see the QMacCocoaViewContainer. Then - the following code should work: - @code.mm - - NSView *video = [[NSView alloc] init]; - QMacCocoaViewContainer *container = new QMacCocoaViewContainer(video, parent); - L{set_nsobject}(mp, video); - [video release]; - - @endcode - You can find a live example in VLCVideoView in VLCKit.framework. - @param drawable: the drawable that is either an NSView or an object following the VLCOpenGLVideoViewEmbedding protocol. - ''' - return libvlc_media_player_set_nsobject(self, drawable) - - def get_nsobject(self): - '''Get the NSView handler previously set with L{set_nsobject}(). - @return: the NSView handler or 0 if none where set. - ''' - return libvlc_media_player_get_nsobject(self) - - def set_xwindow(self, drawable): - '''Set an X Window System drawable where the media player should render its - video output. The call takes effect when the playback starts. If it is - already started, it might need to be stopped before changes apply. - If LibVLC was built without X11 output support, then this function has no - effects. - By default, LibVLC will capture input events on the video rendering area. - Use L{video_set_mouse_input}() and L{video_set_key_input}() to - disable that and deliver events to the parent window / to the application - instead. By design, the X11 protocol delivers input events to only one - recipient. - @warning - The application must call the XInitThreads() function from Xlib before - L{new}(), and before any call to XOpenDisplay() directly or via any - other library. Failure to call XInitThreads() will seriously impede LibVLC - performance. Calling XOpenDisplay() before XInitThreads() will eventually - crash the process. That is a limitation of Xlib. - @param drawable: X11 window ID @note The specified identifier must correspond to an existing Input/Output class X11 window. Pixmaps are B{not} currently supported. The default X11 server is assumed, i.e. that specified in the DISPLAY environment variable. @warning LibVLC can deal with invalid X11 handle errors, however some display drivers (EGL, GLX, VA and/or VDPAU) can unfortunately not. Thus the window handle must remain valid until playback is stopped, otherwise the process may abort or crash. - @bug No more than one window handle per media player instance can be specified. If the media has multiple simultaneously active video tracks, extra tracks will be rendered into external windows beyond the control of the application. - ''' - return libvlc_media_player_set_xwindow(self, drawable) - - def get_xwindow(self): - '''Get the X Window System window identifier previously set with - L{set_xwindow}(). Note that this will return the identifier - even if VLC is not currently using it (for instance if it is playing an - audio-only input). - @return: an X window ID, or 0 if none where set. - ''' - return libvlc_media_player_get_xwindow(self) - - def get_hwnd(self): - '''Get the Windows API window handle (HWND) previously set with - L{set_hwnd}(). The handle will be returned even if LibVLC - is not currently outputting any video to it. - @return: a window handle or None if there are none. - ''' - return libvlc_media_player_get_hwnd(self) - - def set_android_context(self, p_awindow_handler): - '''Set the android context. - @param p_awindow_handler: org.videolan.libvlc.AWindow jobject owned by the org.videolan.libvlc.MediaPlayer class from the libvlc-android project. - @version: LibVLC 3.0.0 and later. - ''' - return libvlc_media_player_set_android_context(self, p_awindow_handler) - - def set_evas_object(self, p_evas_object): - '''Set the EFL Evas Object. - @param p_evas_object: a valid EFL Evas Object (Evas_Object). - @return: -1 if an error was detected, 0 otherwise. - @version: LibVLC 3.0.0 and later. - ''' - return libvlc_media_player_set_evas_object(self, p_evas_object) - - def audio_set_callbacks(self, play, pause, resume, flush, drain, opaque): - '''Sets callbacks and private data for decoded audio. - Use L{audio_set_format}() or L{audio_set_format_callbacks}() - to configure the decoded audio format. - @note: The audio callbacks override any other audio output mechanism. - If the callbacks are set, LibVLC will B{not} output audio in any way. - @param play: callback to play audio samples (must not be None). - @param pause: callback to pause playback (or None to ignore). - @param resume: callback to resume playback (or None to ignore). - @param flush: callback to flush audio buffers (or None to ignore). - @param drain: callback to drain audio buffers (or None to ignore). - @param opaque: private pointer for the audio callbacks (as first parameter). - @version: LibVLC 2.0.0 or later. - ''' - return libvlc_audio_set_callbacks(self, play, pause, resume, flush, drain, opaque) - - def audio_set_volume_callback(self, set_volume): - '''Set callbacks and private data for decoded audio. This only works in - combination with L{audio_set_callbacks}(). - Use L{audio_set_format}() or L{audio_set_format_callbacks}() - to configure the decoded audio format. - @param set_volume: callback to apply audio volume, or None to apply volume in software. - @version: LibVLC 2.0.0 or later. - ''' - return libvlc_audio_set_volume_callback(self, set_volume) - - def audio_set_format_callbacks(self, setup, cleanup): - '''Sets decoded audio format via callbacks. - This only works in combination with L{audio_set_callbacks}(). - @param setup: callback to select the audio format (cannot be None). - @param cleanup: callback to release any allocated resources (or None). - @version: LibVLC 2.0.0 or later. - ''' - return libvlc_audio_set_format_callbacks(self, setup, cleanup) - - def audio_set_format(self, format, rate, channels): - '''Sets a fixed decoded audio format. - This only works in combination with L{audio_set_callbacks}(), - and is mutually exclusive with L{audio_set_format_callbacks}(). - @param format: a four-characters string identifying the sample format (e.g. "S16N" or "FL32"). - @param rate: sample rate (expressed in Hz). - @param channels: channels count. - @version: LibVLC 2.0.0 or later. - ''' - return libvlc_audio_set_format(self, str_to_bytes(format), rate, channels) - - def get_length(self): - '''Get the current movie length (in ms). - @return: the movie length (in ms), or -1 if there is no media. - ''' - return libvlc_media_player_get_length(self) - - def get_time(self): - '''Get the current movie time (in ms). - @return: the movie time (in ms), or -1 if there is no media. - ''' - return libvlc_media_player_get_time(self) - - def set_time(self, i_time): - '''Set the movie time (in ms). This has no effect if no media is being played. - Not all formats and protocols support this. - @param i_time: the movie time (in ms). - ''' - return libvlc_media_player_set_time(self, i_time) - - def get_position(self): - '''Get movie position as percentage between 0.0 and 1.0. - @return: movie position, or -1. in case of error. - ''' - return libvlc_media_player_get_position(self) - - def set_position(self, f_pos): - '''Set movie position as percentage between 0.0 and 1.0. - This has no effect if playback is not enabled. - This might not work depending on the underlying input format and protocol. - @param f_pos: the position. - ''' - return libvlc_media_player_set_position(self, f_pos) - - def set_chapter(self, i_chapter): - '''Set movie chapter (if applicable). - @param i_chapter: chapter number to play. - ''' - return libvlc_media_player_set_chapter(self, i_chapter) - - def get_chapter(self): - '''Get movie chapter. - @return: chapter number currently playing, or -1 if there is no media. - ''' - return libvlc_media_player_get_chapter(self) - - def get_chapter_count(self): - '''Get movie chapter count. - @return: number of chapters in movie, or -1. - ''' - return libvlc_media_player_get_chapter_count(self) - - def will_play(self): - '''Is the player able to play. - @return: boolean \libvlc_return_bool. - ''' - return libvlc_media_player_will_play(self) - - def get_chapter_count_for_title(self, i_title): - '''Get title chapter count. - @param i_title: title. - @return: number of chapters in title, or -1. - ''' - return libvlc_media_player_get_chapter_count_for_title(self, i_title) - - def set_title(self, i_title): - '''Set movie title. - @param i_title: title number to play. - ''' - return libvlc_media_player_set_title(self, i_title) - - def get_title(self): - '''Get movie title. - @return: title number currently playing, or -1. - ''' - return libvlc_media_player_get_title(self) - - def get_title_count(self): - '''Get movie title count. - @return: title number count, or -1. - ''' - return libvlc_media_player_get_title_count(self) - - def previous_chapter(self): - '''Set previous chapter (if applicable). - ''' - return libvlc_media_player_previous_chapter(self) - - def next_chapter(self): - '''Set next chapter (if applicable). - ''' - return libvlc_media_player_next_chapter(self) - - def get_rate(self): - '''Get the requested movie play rate. - @warning: Depending on the underlying media, the requested rate may be - different from the real playback rate. - @return: movie play rate. - ''' - return libvlc_media_player_get_rate(self) - - def set_rate(self, rate): - '''Set movie play rate. - @param rate: movie play rate to set. - @return: -1 if an error was detected, 0 otherwise (but even then, it might not actually work depending on the underlying media protocol). - ''' - return libvlc_media_player_set_rate(self, rate) - - def get_state(self): - '''Get current movie state. - @return: the current state of the media player (playing, paused, ...) See L{State}. - ''' - return libvlc_media_player_get_state(self) - - def has_vout(self): - '''How many video outputs does this media player have? - @return: the number of video outputs. - ''' - return libvlc_media_player_has_vout(self) - - def is_seekable(self): - '''Is this media player seekable? - @return: true if the media player can seek \libvlc_return_bool. - ''' - return libvlc_media_player_is_seekable(self) - - def can_pause(self): - '''Can this media player be paused? - @return: true if the media player can pause \libvlc_return_bool. - ''' - return libvlc_media_player_can_pause(self) - - def program_scrambled(self): - '''Check if the current program is scrambled. - @return: true if the current program is scrambled \libvlc_return_bool. - @version: LibVLC 2.2.0 or later. - ''' - return libvlc_media_player_program_scrambled(self) - - def next_frame(self): - '''Display the next frame (if supported). - ''' - return libvlc_media_player_next_frame(self) - - def navigate(self, navigate): - '''Navigate through DVD Menu. - @param navigate: the Navigation mode. - @version: libVLC 2.0.0 or later. - ''' - return libvlc_media_player_navigate(self, navigate) - - def set_video_title_display(self, position, timeout): - '''Set if, and how, the video title will be shown when media is played. - @param position: position at which to display the title, or libvlc_position_disable to prevent the title from being displayed. - @param timeout: title display timeout in milliseconds (ignored if libvlc_position_disable). - @version: libVLC 2.1.0 or later. - ''' - return libvlc_media_player_set_video_title_display(self, position, timeout) - - def add_slave(self, i_type, psz_uri, b_select): - '''Add a slave to the current media player. - @note: If the player is playing, the slave will be added directly. This call - will also update the slave list of the attached L{Media}. - @param i_type: subtitle or audio. - @param psz_uri: Uri of the slave (should contain a valid scheme). - @param b_select: True if this slave should be selected when it's loaded. - @return: 0 on success, -1 on error. - @version: LibVLC 3.0.0 and later. See L{media_slaves_add}. - ''' - return libvlc_media_player_add_slave(self, i_type, str_to_bytes(psz_uri), b_select) - - def toggle_fullscreen(self): - '''Toggle fullscreen status on non-embedded video outputs. - @warning: The same limitations applies to this function - as to L{set_fullscreen}(). - ''' - return libvlc_toggle_fullscreen(self) - - def set_fullscreen(self, b_fullscreen): - '''Enable or disable fullscreen. - @warning: With most window managers, only a top-level windows can be in - full-screen mode. Hence, this function will not operate properly if - L{set_xwindow}() was used to embed the video in a - non-top-level window. In that case, the embedding window must be reparented - to the root window B{before} fullscreen mode is enabled. You will want - to reparent it back to its normal parent when disabling fullscreen. - @param b_fullscreen: boolean for fullscreen status. - ''' - return libvlc_set_fullscreen(self, b_fullscreen) - - def get_fullscreen(self): - '''Get current fullscreen status. - @return: the fullscreen status (boolean) \libvlc_return_bool. - ''' - return libvlc_get_fullscreen(self) - - def video_set_key_input(self, on): - '''Enable or disable key press events handling, according to the LibVLC hotkeys - configuration. By default and for historical reasons, keyboard events are - handled by the LibVLC video widget. - @note: On X11, there can be only one subscriber for key press and mouse - click events per window. If your application has subscribed to those events - for the X window ID of the video widget, then LibVLC will not be able to - handle key presses and mouse clicks in any case. - @warning: This function is only implemented for X11 and Win32 at the moment. - @param on: true to handle key press events, false to ignore them. - ''' - return libvlc_video_set_key_input(self, on) - - def video_set_mouse_input(self, on): - '''Enable or disable mouse click events handling. By default, those events are - handled. This is needed for DVD menus to work, as well as a few video - filters such as "puzzle". - See L{video_set_key_input}(). - @warning: This function is only implemented for X11 and Win32 at the moment. - @param on: true to handle mouse click events, false to ignore them. - ''' - return libvlc_video_set_mouse_input(self, on) - - def video_get_scale(self): - '''Get the current video scaling factor. - See also L{video_set_scale}(). - @return: the currently configured zoom factor, or 0. if the video is set to fit to the output window/drawable automatically. - ''' - return libvlc_video_get_scale(self) - - def video_set_scale(self, f_factor): - '''Set the video scaling factor. That is the ratio of the number of pixels on - screen to the number of pixels in the original decoded video in each - dimension. Zero is a special value; it will adjust the video to the output - window/drawable (in windowed mode) or the entire screen. - Note that not all video outputs support scaling. - @param f_factor: the scaling factor, or zero. - ''' - return libvlc_video_set_scale(self, f_factor) - - def video_get_aspect_ratio(self): - '''Get current video aspect ratio. - @return: the video aspect ratio or None if unspecified (the result must be released with free() or L{free}()). - ''' - return libvlc_video_get_aspect_ratio(self) - - def video_set_aspect_ratio(self, psz_aspect): - '''Set new video aspect ratio. - @param psz_aspect: new video aspect-ratio or None to reset to default @note Invalid aspect ratios are ignored. - ''' - return libvlc_video_set_aspect_ratio(self, str_to_bytes(psz_aspect)) - - def video_update_viewpoint(self, p_viewpoint, b_absolute): - '''Update the video viewpoint information. - @note: It is safe to call this function before the media player is started. - @param p_viewpoint: video viewpoint allocated via L{video_new_viewpoint}(). - @param b_absolute: if true replace the old viewpoint with the new one. If false, increase/decrease it. - @return: -1 in case of error, 0 otherwise @note the values are set asynchronously, it will be used by the next frame displayed. - @version: LibVLC 3.0.0 and later. - ''' - return libvlc_video_update_viewpoint(self, p_viewpoint, b_absolute) - - def video_get_spu(self): - '''Get current video subtitle. - @return: the video subtitle selected, or -1 if none. - ''' - return libvlc_video_get_spu(self) - - def video_get_spu_count(self): - '''Get the number of available video subtitles. - @return: the number of available video subtitles. - ''' - return libvlc_video_get_spu_count(self) - - def video_set_spu(self, i_spu): - '''Set new video subtitle. - @param i_spu: video subtitle track to select (i_id from track description). - @return: 0 on success, -1 if out of range. - ''' - return libvlc_video_set_spu(self, i_spu) - - def video_get_spu_delay(self): - '''Get the current subtitle delay. Positive values means subtitles are being - displayed later, negative values earlier. - @return: time (in microseconds) the display of subtitles is being delayed. - @version: LibVLC 2.0.0 or later. - ''' - return libvlc_video_get_spu_delay(self) - - def video_set_spu_delay(self, i_delay): - '''Set the subtitle delay. This affects the timing of when the subtitle will - be displayed. Positive values result in subtitles being displayed later, - while negative values will result in subtitles being displayed earlier. - The subtitle delay will be reset to zero each time the media changes. - @param i_delay: time (in microseconds) the display of subtitles should be delayed. - @return: 0 on success, -1 on error. - @version: LibVLC 2.0.0 or later. - ''' - return libvlc_video_set_spu_delay(self, i_delay) - - def video_get_crop_geometry(self): - '''Get current crop filter geometry. - @return: the crop filter geometry or None if unset. - ''' - return libvlc_video_get_crop_geometry(self) - - def video_set_crop_geometry(self, psz_geometry): - '''Set new crop filter geometry. - @param psz_geometry: new crop filter geometry (None to unset). - ''' - return libvlc_video_set_crop_geometry(self, str_to_bytes(psz_geometry)) - - def video_get_teletext(self): - '''Get current teletext page requested or 0 if it's disabled. - Teletext is disabled by default, call L{video_set_teletext}() to enable - it. - @return: the current teletext page requested. - ''' - return libvlc_video_get_teletext(self) - - def video_set_teletext(self, i_page): - '''Set new teletext page to retrieve. - This function can also be used to send a teletext key. - @param i_page: teletex page number requested. This value can be 0 to disable teletext, a number in the range ]0;1000[ to show the requested page, or a \ref L{TeletextKey}. 100 is the default teletext page. - ''' - return libvlc_video_set_teletext(self, i_page) - - def video_get_track_count(self): - '''Get number of available video tracks. - @return: the number of available video tracks (int). - ''' - return libvlc_video_get_track_count(self) - - def video_get_track(self): - '''Get current video track. - @return: the video track ID (int) or -1 if no active input. - ''' - return libvlc_video_get_track(self) - - def video_set_track(self, i_track): - '''Set video track. - @param i_track: the track ID (i_id field from track description). - @return: 0 on success, -1 if out of range. - ''' - return libvlc_video_set_track(self, i_track) - - def video_take_snapshot(self, num, psz_filepath, i_width, i_height): - '''Take a snapshot of the current video window. - If i_width AND i_height is 0, original size is used. - If i_width XOR i_height is 0, original aspect-ratio is preserved. - @param num: number of video output (typically 0 for the first/only one). - @param psz_filepath: the path of a file or a folder to save the screenshot into. - @param i_width: the snapshot's width. - @param i_height: the snapshot's height. - @return: 0 on success, -1 if the video was not found. - ''' - return libvlc_video_take_snapshot(self, num, str_to_bytes(psz_filepath), i_width, i_height) - - def video_set_deinterlace(self, psz_mode): - '''Enable or disable deinterlace filter. - @param psz_mode: type of deinterlace filter, None to disable. - ''' - return libvlc_video_set_deinterlace(self, str_to_bytes(psz_mode)) - - def video_get_marquee_int(self, option): - '''Get an integer marquee option value. - @param option: marq option to get See libvlc_video_marquee_int_option_t. - ''' - return libvlc_video_get_marquee_int(self, option) - - def video_get_marquee_string(self, option): - '''Get a string marquee option value. - @param option: marq option to get See libvlc_video_marquee_string_option_t. - ''' - return libvlc_video_get_marquee_string(self, option) - - def video_set_marquee_int(self, option, i_val): - '''Enable, disable or set an integer marquee option - Setting libvlc_marquee_Enable has the side effect of enabling (arg !0) - or disabling (arg 0) the marq filter. - @param option: marq option to set See libvlc_video_marquee_int_option_t. - @param i_val: marq option value. - ''' - return libvlc_video_set_marquee_int(self, option, i_val) - - def video_set_marquee_string(self, option, psz_text): - '''Set a marquee string option. - @param option: marq option to set See libvlc_video_marquee_string_option_t. - @param psz_text: marq option value. - ''' - return libvlc_video_set_marquee_string(self, option, str_to_bytes(psz_text)) - - def video_get_logo_int(self, option): - '''Get integer logo option. - @param option: logo option to get, values of L{VideoLogoOption}. - ''' - return libvlc_video_get_logo_int(self, option) - - def video_set_logo_int(self, option, value): - '''Set logo option as integer. Options that take a different type value - are ignored. - Passing libvlc_logo_enable as option value has the side effect of - starting (arg !0) or stopping (arg 0) the logo filter. - @param option: logo option to set, values of L{VideoLogoOption}. - @param value: logo option value. - ''' - return libvlc_video_set_logo_int(self, option, value) - - def video_set_logo_string(self, option, psz_value): - '''Set logo option as string. Options that take a different type value - are ignored. - @param option: logo option to set, values of L{VideoLogoOption}. - @param psz_value: logo option value. - ''' - return libvlc_video_set_logo_string(self, option, str_to_bytes(psz_value)) - - def video_get_adjust_int(self, option): - '''Get integer adjust option. - @param option: adjust option to get, values of L{VideoAdjustOption}. - @version: LibVLC 1.1.1 and later. - ''' - return libvlc_video_get_adjust_int(self, option) - - def video_set_adjust_int(self, option, value): - '''Set adjust option as integer. Options that take a different type value - are ignored. - Passing libvlc_adjust_enable as option value has the side effect of - starting (arg !0) or stopping (arg 0) the adjust filter. - @param option: adust option to set, values of L{VideoAdjustOption}. - @param value: adjust option value. - @version: LibVLC 1.1.1 and later. - ''' - return libvlc_video_set_adjust_int(self, option, value) - - def video_get_adjust_float(self, option): - '''Get float adjust option. - @param option: adjust option to get, values of L{VideoAdjustOption}. - @version: LibVLC 1.1.1 and later. - ''' - return libvlc_video_get_adjust_float(self, option) - - def video_set_adjust_float(self, option, value): - '''Set adjust option as float. Options that take a different type value - are ignored. - @param option: adust option to set, values of L{VideoAdjustOption}. - @param value: adjust option value. - @version: LibVLC 1.1.1 and later. - ''' - return libvlc_video_set_adjust_float(self, option, value) - - def audio_output_set(self, psz_name): - '''Selects an audio output module. - @note: Any change will take be effect only after playback is stopped and - restarted. Audio output cannot be changed while playing. - @param psz_name: name of audio output, use psz_name of See L{AudioOutput}. - @return: 0 if function succeeded, -1 on error. - ''' - return libvlc_audio_output_set(self, str_to_bytes(psz_name)) - - def audio_output_device_enum(self): - '''Gets a list of potential audio output devices, - See L{audio_output_device_set}(). - @note: Not all audio outputs support enumerating devices. - The audio output may be functional even if the list is empty (None). - @note: The list may not be exhaustive. - @warning: Some audio output devices in the list might not actually work in - some circumstances. By default, it is recommended to not specify any - explicit audio device. - @return: A None-terminated linked list of potential audio output devices. It must be freed with L{audio_output_device_list_release}(). - @version: LibVLC 2.2.0 or later. - ''' - return libvlc_audio_output_device_enum(self) - - def audio_output_device_set(self, module, device_id): - '''Configures an explicit audio output device. - If the module paramater is None, audio output will be moved to the device - specified by the device identifier string immediately. This is the - recommended usage. - A list of adequate potential device strings can be obtained with - L{audio_output_device_enum}(). - However passing None is supported in LibVLC version 2.2.0 and later only; - in earlier versions, this function would have no effects when the module - parameter was None. - If the module parameter is not None, the device parameter of the - corresponding audio output, if it exists, will be set to the specified - string. Note that some audio output modules do not have such a parameter - (notably MMDevice and PulseAudio). - A list of adequate potential device strings can be obtained with - L{audio_output_device_list_get}(). - @note: This function does not select the specified audio output plugin. - L{audio_output_set}() is used for that purpose. - @warning: The syntax for the device parameter depends on the audio output. - Some audio output modules require further parameters (e.g. a channels map - in the case of ALSA). - @param module: If None, current audio output module. if non-None, name of audio output module. - @param device_id: device identifier string. - @return: Nothing. Errors are ignored (this is a design bug). - ''' - return libvlc_audio_output_device_set(self, str_to_bytes(module), str_to_bytes(device_id)) - - def audio_output_device_get(self): - '''Get the current audio output device identifier. - This complements L{audio_output_device_set}(). - @warning: The initial value for the current audio output device identifier - may not be set or may be some unknown value. A LibVLC application should - compare this value against the known device identifiers (e.g. those that - were previously retrieved by a call to L{audio_output_device_enum} or - L{audio_output_device_list_get}) to find the current audio output device. - It is possible that the selected audio output device changes (an external - change) without a call to L{audio_output_device_set}. That may make this - method unsuitable to use if a LibVLC application is attempting to track - dynamic audio device changes as they happen. - @return: the current audio output device identifier None if no device is selected or in case of error (the result must be released with free() or L{free}()). - @version: LibVLC 3.0.0 or later. - ''' - return libvlc_audio_output_device_get(self) - - def audio_toggle_mute(self): - '''Toggle mute status. - ''' - return libvlc_audio_toggle_mute(self) - - def audio_get_mute(self): - '''Get current mute status. - @return: the mute status (boolean) if defined, -1 if undefined/unapplicable. - ''' - return libvlc_audio_get_mute(self) - - def audio_set_mute(self, status): - '''Set mute status. - @param status: If status is true then mute, otherwise unmute @warning This function does not always work. If there are no active audio playback stream, the mute status might not be available. If digital pass-through (S/PDIF, HDMI...) is in use, muting may be unapplicable. Also some audio output plugins do not support muting at all. @note To force silent playback, disable all audio tracks. This is more efficient and reliable than mute. - ''' - return libvlc_audio_set_mute(self, status) - - def audio_get_volume(self): - '''Get current software audio volume. - @return: the software volume in percents (0 = mute, 100 = nominal / 0dB). - ''' - return libvlc_audio_get_volume(self) - - def audio_set_volume(self, i_volume): - '''Set current software audio volume. - @param i_volume: the volume in percents (0 = mute, 100 = 0dB). - @return: 0 if the volume was set, -1 if it was out of range. - ''' - return libvlc_audio_set_volume(self, i_volume) - - def audio_get_track_count(self): - '''Get number of available audio tracks. - @return: the number of available audio tracks (int), or -1 if unavailable. - ''' - return libvlc_audio_get_track_count(self) - - def audio_get_track(self): - '''Get current audio track. - @return: the audio track ID or -1 if no active input. - ''' - return libvlc_audio_get_track(self) - - def audio_set_track(self, i_track): - '''Set current audio track. - @param i_track: the track ID (i_id field from track description). - @return: 0 on success, -1 on error. - ''' - return libvlc_audio_set_track(self, i_track) - - def audio_get_channel(self): - '''Get current audio channel. - @return: the audio channel See L{AudioOutputChannel}. - ''' - return libvlc_audio_get_channel(self) - - def audio_set_channel(self, channel): - '''Set current audio channel. - @param channel: the audio channel, See L{AudioOutputChannel}. - @return: 0 on success, -1 on error. - ''' - return libvlc_audio_set_channel(self, channel) - - def audio_get_delay(self): - '''Get current audio delay. - @return: the audio delay (microseconds). - @version: LibVLC 1.1.1 or later. - ''' - return libvlc_audio_get_delay(self) - - def audio_set_delay(self, i_delay): - '''Set current audio delay. The audio delay will be reset to zero each time the media changes. - @param i_delay: the audio delay (microseconds). - @return: 0 on success, -1 on error. - @version: LibVLC 1.1.1 or later. - ''' - return libvlc_audio_set_delay(self, i_delay) - - def set_equalizer(self, p_equalizer): - '''Apply new equalizer settings to a media player. - The equalizer is first created by invoking L{audio_equalizer_new}() or - L{audio_equalizer_new_from_preset}(). - It is possible to apply new equalizer settings to a media player whether the media - player is currently playing media or not. - Invoking this method will immediately apply the new equalizer settings to the audio - output of the currently playing media if there is any. - If there is no currently playing media, the new equalizer settings will be applied - later if and when new media is played. - Equalizer settings will automatically be applied to subsequently played media. - To disable the equalizer for a media player invoke this method passing None for the - p_equalizer parameter. - The media player does not keep a reference to the supplied equalizer so it is safe - for an application to release the equalizer reference any time after this method - returns. - @param p_equalizer: opaque equalizer handle, or None to disable the equalizer for this media player. - @return: zero on success, -1 on error. - @version: LibVLC 2.2.0 or later. - ''' - return libvlc_media_player_set_equalizer(self, p_equalizer) - - def get_role(self): - '''Gets the media role. - @return: the media player role (\ref libvlc_media_player_role_t). - @version: LibVLC 3.0.0 and later. - ''' - return libvlc_media_player_get_role(self) - - def set_role(self, role): - '''Sets the media role. - @param role: the media player role (\ref libvlc_media_player_role_t). - @return: 0 on success, -1 on error. - ''' - return libvlc_media_player_set_role(self, role) - - -# LibVLC __version__ functions # - -def libvlc_clearerr(): - '''Clears the LibVLC error status for the current thread. This is optional. - By default, the error status is automatically overridden when a new error - occurs, and destroyed when the thread exits. - ''' - f = _Cfunctions.get('libvlc_clearerr', None) or \ - _Cfunction('libvlc_clearerr', (), None, - None) - return f() - - -def libvlc_vprinterr(fmt, ap): - '''Sets the LibVLC error status and message for the current thread. - Any previous error is overridden. - @param fmt: the format string. - @param ap: the arguments. - @return: a nul terminated string in any case. - ''' - f = _Cfunctions.get('libvlc_vprinterr', None) or \ - _Cfunction('libvlc_vprinterr', ((1,), (1,),), None, - ctypes.c_char_p, ctypes.c_char_p, ctypes.c_void_p) - return f(fmt, ap) - - -def libvlc_new(argc, argv): - '''Create and initialize a libvlc instance. - This functions accept a list of "command line" arguments similar to the - main(). These arguments affect the LibVLC instance default configuration. - @note - LibVLC may create threads. Therefore, any thread-unsafe process - initialization must be performed before calling L{libvlc_new}(). In particular - and where applicable: - - setlocale() and textdomain(), - - setenv(), unsetenv() and putenv(), - - with the X11 display system, XInitThreads() - (see also L{libvlc_media_player_set_xwindow}()) and - - on Microsoft Windows, SetErrorMode(). - - sigprocmask() shall never be invoked; pthread_sigmask() can be used. - On POSIX systems, the SIGCHLD signal B{must not} be ignored, i.e. the - signal handler must set to SIG_DFL or a function pointer, not SIG_IGN. - Also while LibVLC is active, the wait() function shall not be called, and - any call to waitpid() shall use a strictly positive value for the first - parameter (i.e. the PID). Failure to follow those rules may lead to a - deadlock or a busy loop. - Also on POSIX systems, it is recommended that the SIGPIPE signal be blocked, - even if it is not, in principles, necessary, e.g.: - @code - @endcode - On Microsoft Windows Vista/2008, the process error mode - SEM_FAILCRITICALERRORS flag B{must} be set before using LibVLC. - On later versions, that is optional and unnecessary. - Also on Microsoft Windows (Vista and any later version), setting the default - DLL directories to SYSTEM32 exclusively is strongly recommended for - security reasons: - @code - @endcode. - @param argc: the number of arguments (should be 0). - @param argv: list of arguments (should be None). - @return: the libvlc instance or None in case of error. - @version Arguments are meant to be passed from the command line to LibVLC, just like VLC media player does. The list of valid arguments depends on the LibVLC version, the operating system and platform, and set of available LibVLC plugins. Invalid or unsupported arguments will cause the function to fail (i.e. return None). Also, some arguments may alter the behaviour or otherwise interfere with other LibVLC functions. @warning There is absolutely no warranty or promise of forward, backward and cross-platform compatibility with regards to L{libvlc_new}() arguments. We recommend that you do not use them, other than when debugging. - ''' - f = _Cfunctions.get('libvlc_new', None) or \ - _Cfunction('libvlc_new', ((1,), (1,),), class_result(Instance), - ctypes.c_void_p, ctypes.c_int, ListPOINTER(ctypes.c_char_p)) - return f(argc, argv) - - -def libvlc_release(p_instance): - '''Decrement the reference count of a libvlc instance, and destroy it - if it reaches zero. - @param p_instance: the instance to destroy. - ''' - f = _Cfunctions.get('libvlc_release', None) or \ - _Cfunction('libvlc_release', ((1,),), None, - None, Instance) - return f(p_instance) - - -def libvlc_retain(p_instance): - '''Increments the reference count of a libvlc instance. - The initial reference count is 1 after L{libvlc_new}() returns. - @param p_instance: the instance to reference. - ''' - f = _Cfunctions.get('libvlc_retain', None) or \ - _Cfunction('libvlc_retain', ((1,),), None, - None, Instance) - return f(p_instance) - - -def libvlc_add_intf(p_instance, name): - '''Try to start a user interface for the libvlc instance. - @param p_instance: the instance. - @param name: interface name, or None for default. - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_add_intf', None) or \ - _Cfunction('libvlc_add_intf', ((1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p) - return f(p_instance, name) - - -def libvlc_set_user_agent(p_instance, name, http): - '''Sets the application name. LibVLC passes this as the user agent string - when a protocol requires it. - @param p_instance: LibVLC instance. - @param name: human-readable application name, e.g. "FooBar player 1.2.3". - @param http: HTTP User Agent, e.g. "FooBar/1.2.3 Python/2.6.0". - @version: LibVLC 1.1.1 or later. - ''' - f = _Cfunctions.get('libvlc_set_user_agent', None) or \ - _Cfunction('libvlc_set_user_agent', ((1,), (1,), (1,),), None, - None, Instance, ctypes.c_char_p, ctypes.c_char_p) - return f(p_instance, name, http) - - -def libvlc_set_app_id(p_instance, id, version, icon): - '''Sets some meta-information about the application. - See also L{libvlc_set_user_agent}(). - @param p_instance: LibVLC instance. - @param id: Java-style application identifier, e.g. "com.acme.foobar". - @param version: application version numbers, e.g. "1.2.3". - @param icon: application icon name, e.g. "foobar". - @version: LibVLC 2.1.0 or later. - ''' - f = _Cfunctions.get('libvlc_set_app_id', None) or \ - _Cfunction('libvlc_set_app_id', ((1,), (1,), (1,), (1,),), None, - None, Instance, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_char_p) - return f(p_instance, id, version, icon) - - -def libvlc_get_version(): - '''Retrieve libvlc version. - Example: "1.1.0-git The Luggage". - @return: a string containing the libvlc version. - ''' - f = _Cfunctions.get('libvlc_get_version', None) or \ - _Cfunction('libvlc_get_version', (), None, - ctypes.c_char_p) - return f() - - -def libvlc_get_compiler(): - '''Retrieve libvlc compiler version. - Example: "gcc version 4.2.3 (Ubuntu 4.2.3-2ubuntu6)". - @return: a string containing the libvlc compiler version. - ''' - f = _Cfunctions.get('libvlc_get_compiler', None) or \ - _Cfunction('libvlc_get_compiler', (), None, - ctypes.c_char_p) - return f() - - -def libvlc_get_changeset(): - '''Retrieve libvlc changeset. - Example: "aa9bce0bc4". - @return: a string containing the libvlc changeset. - ''' - f = _Cfunctions.get('libvlc_get_changeset', None) or \ - _Cfunction('libvlc_get_changeset', (), None, - ctypes.c_char_p) - return f() - - -def libvlc_free(ptr): - '''Frees an heap allocation returned by a LibVLC function. - If you know you're using the same underlying C run-time as the LibVLC - implementation, then you can call ANSI C free() directly instead. - @param ptr: the pointer. - ''' - f = _Cfunctions.get('libvlc_free', None) or \ - _Cfunction('libvlc_free', ((1,),), None, - None, ctypes.c_void_p) - return f(ptr) - - -def libvlc_event_attach(p_event_manager, i_event_type, f_callback, user_data): - '''Register for an event notification. - @param p_event_manager: the event manager to which you want to attach to. Generally it is obtained by vlc_my_object_event_manager() where my_object is the object you want to listen to. - @param i_event_type: the desired event to which we want to listen. - @param f_callback: the function to call when i_event_type occurs. - @param user_data: user provided data to carry with the event. - @return: 0 on success, ENOMEM on error. - ''' - f = _Cfunctions.get('libvlc_event_attach', None) or \ - _Cfunction('libvlc_event_attach', ((1,), (1,), (1,), (1,),), None, - ctypes.c_int, EventManager, ctypes.c_uint, Callback, ctypes.c_void_p) - return f(p_event_manager, i_event_type, f_callback, user_data) - - -def libvlc_event_detach(p_event_manager, i_event_type, f_callback, p_user_data): - '''Unregister an event notification. - @param p_event_manager: the event manager. - @param i_event_type: the desired event to which we want to unregister. - @param f_callback: the function to call when i_event_type occurs. - @param p_user_data: user provided data to carry with the event. - ''' - f = _Cfunctions.get('libvlc_event_detach', None) or \ - _Cfunction('libvlc_event_detach', ((1,), (1,), (1,), (1,),), None, - None, EventManager, ctypes.c_uint, Callback, ctypes.c_void_p) - return f(p_event_manager, i_event_type, f_callback, p_user_data) - - -def libvlc_event_type_name(event_type): - '''Get an event's type name. - @param event_type: the desired event. - ''' - f = _Cfunctions.get('libvlc_event_type_name', None) or \ - _Cfunction('libvlc_event_type_name', ((1,),), None, - ctypes.c_char_p, ctypes.c_uint) - return f(event_type) - - -def libvlc_log_get_context(ctx): - '''Gets log message debug infos. - This function retrieves self-debug information about a log message: - - the name of the VLC module emitting the message, - - the name of the source code module (i.e. file) and - - the line number within the source code module. - The returned module name and file name will be None if unknown. - The returned line number will similarly be zero if unknown. - @param ctx: message context (as passed to the @ref libvlc_log_cb callback). - @return: module module name storage (or None), file source code file name storage (or None), line source code file line number storage (or None). - @version: LibVLC 2.1.0 or later. - ''' - f = _Cfunctions.get('libvlc_log_get_context', None) or \ - _Cfunction('libvlc_log_get_context', ((1,), (2,), (2,), (2,),), None, - None, Log_ptr, ListPOINTER(ctypes.c_char_p), ListPOINTER(ctypes.c_char_p), - ctypes.POINTER(ctypes.c_uint)) - return f(ctx) - - -def libvlc_log_get_object(ctx, id): - '''Gets log message info. - This function retrieves meta-information about a log message: - - the type name of the VLC object emitting the message, - - the object header if any, and - - a temporaly-unique object identifier. - This information is mainly meant for B{manual} troubleshooting. - The returned type name may be "generic" if unknown, but it cannot be None. - The returned header will be None if unset; in current versions, the header - is used to distinguish for VLM inputs. - The returned object ID will be zero if the message is not associated with - any VLC object. - @param ctx: message context (as passed to the @ref libvlc_log_cb callback). - @return: name object name storage (or None), header object header (or None), line source code file line number storage (or None). - @version: LibVLC 2.1.0 or later. - ''' - f = _Cfunctions.get('libvlc_log_get_object', None) or \ - _Cfunction('libvlc_log_get_object', ((1,), (2,), (2,), (1,),), None, - None, Log_ptr, ListPOINTER(ctypes.c_char_p), ListPOINTER(ctypes.c_char_p), - ctypes.POINTER(ctypes.c_uint)) - return f(ctx, id) - - -def libvlc_log_unset(p_instance): - '''Unsets the logging callback. - This function deregisters the logging callback for a LibVLC instance. - This is rarely needed as the callback is implicitly unset when the instance - is destroyed. - @note: This function will wait for any pending callbacks invocation to - complete (causing a deadlock if called from within the callback). - @param p_instance: libvlc instance. - @version: LibVLC 2.1.0 or later. - ''' - f = _Cfunctions.get('libvlc_log_unset', None) or \ - _Cfunction('libvlc_log_unset', ((1,),), None, - None, Instance) - return f(p_instance) - - -def libvlc_log_set(p_instance, cb, data): - '''Sets the logging callback for a LibVLC instance. - This function is thread-safe: it will wait for any pending callbacks - invocation to complete. - @param cb: callback function pointer. - @param data: opaque data pointer for the callback function @note Some log messages (especially debug) are emitted by LibVLC while is being initialized. These messages cannot be captured with this interface. @warning A deadlock may occur if this function is called from the callback. - @param p_instance: libvlc instance. - @version: LibVLC 2.1.0 or later. - ''' - f = _Cfunctions.get('libvlc_log_set', None) or \ - _Cfunction('libvlc_log_set', ((1,), (1,), (1,),), None, - None, Instance, LogCb, ctypes.c_void_p) - return f(p_instance, cb, data) - - -def libvlc_log_set_file(p_instance, stream): - '''Sets up logging to a file. - @param p_instance: libvlc instance. - @param stream: FILE pointer opened for writing (the FILE pointer must remain valid until L{libvlc_log_unset}()). - @version: LibVLC 2.1.0 or later. - ''' - f = _Cfunctions.get('libvlc_log_set_file', None) or \ - _Cfunction('libvlc_log_set_file', ((1,), (1,),), None, - None, Instance, FILE_ptr) - return f(p_instance, stream) - - -def libvlc_module_description_list_release(p_list): - '''Release a list of module descriptions. - @param p_list: the list to be released. - ''' - f = _Cfunctions.get('libvlc_module_description_list_release', None) or \ - _Cfunction('libvlc_module_description_list_release', ((1,),), None, - None, ctypes.POINTER(ModuleDescription)) - return f(p_list) - - -def libvlc_audio_filter_list_get(p_instance): - '''Returns a list of audio filters that are available. - @param p_instance: libvlc instance. - @return: a list of module descriptions. It should be freed with L{libvlc_module_description_list_release}(). In case of an error, None is returned. See L{ModuleDescription} See L{libvlc_module_description_list_release}. - ''' - f = _Cfunctions.get('libvlc_audio_filter_list_get', None) or \ - _Cfunction('libvlc_audio_filter_list_get', ((1,),), None, - ctypes.POINTER(ModuleDescription), Instance) - return f(p_instance) - - -def libvlc_video_filter_list_get(p_instance): - '''Returns a list of video filters that are available. - @param p_instance: libvlc instance. - @return: a list of module descriptions. It should be freed with L{libvlc_module_description_list_release}(). In case of an error, None is returned. See L{ModuleDescription} See L{libvlc_module_description_list_release}. - ''' - f = _Cfunctions.get('libvlc_video_filter_list_get', None) or \ - _Cfunction('libvlc_video_filter_list_get', ((1,),), None, - ctypes.POINTER(ModuleDescription), Instance) - return f(p_instance) - - -def libvlc_clock(): - '''Return the current time as defined by LibVLC. The unit is the microsecond. - Time increases monotonically (regardless of time zone changes and RTC - adjustements). - The origin is arbitrary but consistent across the whole system - (e.g. the system uptim, the time since the system was booted). - @note: On systems that support it, the POSIX monotonic clock is used. - ''' - f = _Cfunctions.get('libvlc_clock', None) or \ - _Cfunction('libvlc_clock', (), None, - ctypes.c_int64) - return f() - - -def libvlc_media_discoverer_new(p_inst, psz_name): - '''Create a media discoverer object by name. - After this object is created, you should attach to media_list events in - order to be notified of new items discovered. - You need to call L{libvlc_media_discoverer_start}() in order to start the - discovery. - See L{libvlc_media_discoverer_media_list} - See L{libvlc_media_discoverer_event_manager} - See L{libvlc_media_discoverer_start}. - @param p_inst: libvlc instance. - @param psz_name: service name; use L{libvlc_media_discoverer_list_get}() to get a list of the discoverer names available in this libVLC instance. - @return: media discover object or None in case of error. - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_media_discoverer_new', None) or \ - _Cfunction('libvlc_media_discoverer_new', ((1,), (1,),), class_result(MediaDiscoverer), - ctypes.c_void_p, Instance, ctypes.c_char_p) - return f(p_inst, psz_name) - - -def libvlc_media_discoverer_start(p_mdis): - '''Start media discovery. - To stop it, call L{libvlc_media_discoverer_stop}() or - L{libvlc_media_discoverer_list_release}() directly. - See L{libvlc_media_discoverer_stop}. - @param p_mdis: media discover object. - @return: -1 in case of error, 0 otherwise. - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_media_discoverer_start', None) or \ - _Cfunction('libvlc_media_discoverer_start', ((1,),), None, - ctypes.c_int, MediaDiscoverer) - return f(p_mdis) - - -def libvlc_media_discoverer_stop(p_mdis): - '''Stop media discovery. - See L{libvlc_media_discoverer_start}. - @param p_mdis: media discover object. - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_media_discoverer_stop', None) or \ - _Cfunction('libvlc_media_discoverer_stop', ((1,),), None, - None, MediaDiscoverer) - return f(p_mdis) - - -def libvlc_media_discoverer_release(p_mdis): - '''Release media discover object. If the reference count reaches 0, then - the object will be released. - @param p_mdis: media service discover object. - ''' - f = _Cfunctions.get('libvlc_media_discoverer_release', None) or \ - _Cfunction('libvlc_media_discoverer_release', ((1,),), None, - None, MediaDiscoverer) - return f(p_mdis) - - -def libvlc_media_discoverer_media_list(p_mdis): - '''Get media service discover media list. - @param p_mdis: media service discover object. - @return: list of media items. - ''' - f = _Cfunctions.get('libvlc_media_discoverer_media_list', None) or \ - _Cfunction('libvlc_media_discoverer_media_list', ((1,),), class_result(MediaList), - ctypes.c_void_p, MediaDiscoverer) - return f(p_mdis) - - -def libvlc_media_discoverer_is_running(p_mdis): - '''Query if media service discover object is running. - @param p_mdis: media service discover object. - @return: true if running, false if not \libvlc_return_bool. - ''' - f = _Cfunctions.get('libvlc_media_discoverer_is_running', None) or \ - _Cfunction('libvlc_media_discoverer_is_running', ((1,),), None, - ctypes.c_int, MediaDiscoverer) - return f(p_mdis) - - -def libvlc_media_discoverer_list_get(p_inst, i_cat, ppp_services): - '''Get media discoverer services by category. - @param p_inst: libvlc instance. - @param i_cat: category of services to fetch. - @param ppp_services: address to store an allocated array of media discoverer services (must be freed with L{libvlc_media_discoverer_list_release}() by the caller) [OUT]. - @return: the number of media discoverer services (0 on error). - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_media_discoverer_list_get', None) or \ - _Cfunction('libvlc_media_discoverer_list_get', ((1,), (1,), (1,),), None, - ctypes.c_size_t, Instance, MediaDiscovererCategory, - ctypes.POINTER(ctypes.POINTER(MediaDiscovererDescription))) - return f(p_inst, i_cat, ppp_services) - - -def libvlc_media_discoverer_list_release(pp_services, i_count): - '''Release an array of media discoverer services. - @param pp_services: array to release. - @param i_count: number of elements in the array. - @version: LibVLC 3.0.0 and later. See L{libvlc_media_discoverer_list_get}(). - ''' - f = _Cfunctions.get('libvlc_media_discoverer_list_release', None) or \ - _Cfunction('libvlc_media_discoverer_list_release', ((1,), (1,),), None, - None, ctypes.POINTER(MediaDiscovererDescription), ctypes.c_size_t) - return f(pp_services, i_count) - - -def libvlc_dialog_set_context(p_id, p_context): - '''Associate an opaque pointer with the dialog id. - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_dialog_set_context', None) or \ - _Cfunction('libvlc_dialog_set_context', ((1,), (1,),), None, - None, ctypes.c_void_p, ctypes.c_void_p) - return f(p_id, p_context) - - -def libvlc_dialog_get_context(p_id): - '''Return the opaque pointer associated with the dialog id. - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_dialog_get_context', None) or \ - _Cfunction('libvlc_dialog_get_context', ((1,),), None, - ctypes.c_void_p, ctypes.c_void_p) - return f(p_id) - - -def libvlc_dialog_post_login(p_id, psz_username, psz_password, b_store): - '''Post a login answer - After this call, p_id won't be valid anymore - See libvlc_dialog_cbs.pf_display_login. - @param p_id: id of the dialog. - @param psz_username: valid and non empty string. - @param psz_password: valid string (can be empty). - @param b_store: if true, store the credentials. - @return: 0 on success, or -1 on error. - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_dialog_post_login', None) or \ - _Cfunction('libvlc_dialog_post_login', ((1,), (1,), (1,), (1,),), None, - ctypes.c_int, ctypes.c_void_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_bool) - return f(p_id, psz_username, psz_password, b_store) - - -def libvlc_dialog_post_action(p_id, i_action): - '''Post a question answer - After this call, p_id won't be valid anymore - See libvlc_dialog_cbs.pf_display_question. - @param p_id: id of the dialog. - @param i_action: 1 for action1, 2 for action2. - @return: 0 on success, or -1 on error. - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_dialog_post_action', None) or \ - _Cfunction('libvlc_dialog_post_action', ((1,), (1,),), None, - ctypes.c_int, ctypes.c_void_p, ctypes.c_int) - return f(p_id, i_action) - - -def libvlc_dialog_dismiss(p_id): - '''Dismiss a dialog - After this call, p_id won't be valid anymore - See libvlc_dialog_cbs.pf_cancel. - @param p_id: id of the dialog. - @return: 0 on success, or -1 on error. - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_dialog_dismiss', None) or \ - _Cfunction('libvlc_dialog_dismiss', ((1,),), None, - ctypes.c_int, ctypes.c_void_p) - return f(p_id) - - -def libvlc_media_library_new(p_instance): - '''Create an new Media Library object. - @param p_instance: the libvlc instance. - @return: a new object or None on error. - ''' - f = _Cfunctions.get('libvlc_media_library_new', None) or \ - _Cfunction('libvlc_media_library_new', ((1,),), class_result(MediaLibrary), - ctypes.c_void_p, Instance) - return f(p_instance) - - -def libvlc_media_library_release(p_mlib): - '''Release media library object. This functions decrements the - reference count of the media library object. If it reaches 0, - then the object will be released. - @param p_mlib: media library object. - ''' - f = _Cfunctions.get('libvlc_media_library_release', None) or \ - _Cfunction('libvlc_media_library_release', ((1,),), None, - None, MediaLibrary) - return f(p_mlib) - - -def libvlc_media_library_retain(p_mlib): - '''Retain a reference to a media library object. This function will - increment the reference counting for this object. Use - L{libvlc_media_library_release}() to decrement the reference count. - @param p_mlib: media library object. - ''' - f = _Cfunctions.get('libvlc_media_library_retain', None) or \ - _Cfunction('libvlc_media_library_retain', ((1,),), None, - None, MediaLibrary) - return f(p_mlib) - - -def libvlc_media_library_load(p_mlib): - '''Load media library. - @param p_mlib: media library object. - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_media_library_load', None) or \ - _Cfunction('libvlc_media_library_load', ((1,),), None, - ctypes.c_int, MediaLibrary) - return f(p_mlib) - - -def libvlc_media_library_media_list(p_mlib): - '''Get media library subitems. - @param p_mlib: media library object. - @return: media list subitems. - ''' - f = _Cfunctions.get('libvlc_media_library_media_list', None) or \ - _Cfunction('libvlc_media_library_media_list', ((1,),), class_result(MediaList), - ctypes.c_void_p, MediaLibrary) - return f(p_mlib) - - -def libvlc_vlm_release(p_instance): - '''Release the vlm instance related to the given L{Instance}. - @param p_instance: the instance. - ''' - f = _Cfunctions.get('libvlc_vlm_release', None) or \ - _Cfunction('libvlc_vlm_release', ((1,),), None, - None, Instance) - return f(p_instance) - - -def libvlc_vlm_add_broadcast(p_instance, psz_name, psz_input, psz_output, i_options, ppsz_options, b_enabled, b_loop): - '''Add a broadcast, with one input. - @param p_instance: the instance. - @param psz_name: the name of the new broadcast. - @param psz_input: the input MRL. - @param psz_output: the output MRL (the parameter to the "sout" variable). - @param i_options: number of additional options. - @param ppsz_options: additional options. - @param b_enabled: boolean for enabling the new broadcast. - @param b_loop: Should this broadcast be played in loop ? - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_vlm_add_broadcast', None) or \ - _Cfunction('libvlc_vlm_add_broadcast', ((1,), (1,), (1,), (1,), (1,), (1,), (1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_int, - ListPOINTER(ctypes.c_char_p), ctypes.c_int, ctypes.c_int) - return f(p_instance, psz_name, psz_input, psz_output, i_options, ppsz_options, b_enabled, b_loop) - - -def libvlc_vlm_add_vod(p_instance, psz_name, psz_input, i_options, ppsz_options, b_enabled, psz_mux): - '''Add a vod, with one input. - @param p_instance: the instance. - @param psz_name: the name of the new vod media. - @param psz_input: the input MRL. - @param i_options: number of additional options. - @param ppsz_options: additional options. - @param b_enabled: boolean for enabling the new vod. - @param psz_mux: the muxer of the vod media. - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_vlm_add_vod', None) or \ - _Cfunction('libvlc_vlm_add_vod', ((1,), (1,), (1,), (1,), (1,), (1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_int, ListPOINTER(ctypes.c_char_p), - ctypes.c_int, ctypes.c_char_p) - return f(p_instance, psz_name, psz_input, i_options, ppsz_options, b_enabled, psz_mux) - - -def libvlc_vlm_del_media(p_instance, psz_name): - '''Delete a media (VOD or broadcast). - @param p_instance: the instance. - @param psz_name: the media to delete. - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_vlm_del_media', None) or \ - _Cfunction('libvlc_vlm_del_media', ((1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p) - return f(p_instance, psz_name) - - -def libvlc_vlm_set_enabled(p_instance, psz_name, b_enabled): - '''Enable or disable a media (VOD or broadcast). - @param p_instance: the instance. - @param psz_name: the media to work on. - @param b_enabled: the new status. - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_vlm_set_enabled', None) or \ - _Cfunction('libvlc_vlm_set_enabled', ((1,), (1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_int) - return f(p_instance, psz_name, b_enabled) - - -def libvlc_vlm_set_output(p_instance, psz_name, psz_output): - '''Set the output for a media. - @param p_instance: the instance. - @param psz_name: the media to work on. - @param psz_output: the output MRL (the parameter to the "sout" variable). - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_vlm_set_output', None) or \ - _Cfunction('libvlc_vlm_set_output', ((1,), (1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_char_p) - return f(p_instance, psz_name, psz_output) - - -def libvlc_vlm_set_input(p_instance, psz_name, psz_input): - '''Set a media's input MRL. This will delete all existing inputs and - add the specified one. - @param p_instance: the instance. - @param psz_name: the media to work on. - @param psz_input: the input MRL. - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_vlm_set_input', None) or \ - _Cfunction('libvlc_vlm_set_input', ((1,), (1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_char_p) - return f(p_instance, psz_name, psz_input) - - -def libvlc_vlm_add_input(p_instance, psz_name, psz_input): - '''Add a media's input MRL. This will add the specified one. - @param p_instance: the instance. - @param psz_name: the media to work on. - @param psz_input: the input MRL. - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_vlm_add_input', None) or \ - _Cfunction('libvlc_vlm_add_input', ((1,), (1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_char_p) - return f(p_instance, psz_name, psz_input) - - -def libvlc_vlm_set_loop(p_instance, psz_name, b_loop): - '''Set a media's loop status. - @param p_instance: the instance. - @param psz_name: the media to work on. - @param b_loop: the new status. - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_vlm_set_loop', None) or \ - _Cfunction('libvlc_vlm_set_loop', ((1,), (1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_int) - return f(p_instance, psz_name, b_loop) - - -def libvlc_vlm_set_mux(p_instance, psz_name, psz_mux): - '''Set a media's vod muxer. - @param p_instance: the instance. - @param psz_name: the media to work on. - @param psz_mux: the new muxer. - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_vlm_set_mux', None) or \ - _Cfunction('libvlc_vlm_set_mux', ((1,), (1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_char_p) - return f(p_instance, psz_name, psz_mux) - - -def libvlc_vlm_change_media(p_instance, psz_name, psz_input, psz_output, i_options, ppsz_options, b_enabled, b_loop): - '''Edit the parameters of a media. This will delete all existing inputs and - add the specified one. - @param p_instance: the instance. - @param psz_name: the name of the new broadcast. - @param psz_input: the input MRL. - @param psz_output: the output MRL (the parameter to the "sout" variable). - @param i_options: number of additional options. - @param ppsz_options: additional options. - @param b_enabled: boolean for enabling the new broadcast. - @param b_loop: Should this broadcast be played in loop ? - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_vlm_change_media', None) or \ - _Cfunction('libvlc_vlm_change_media', ((1,), (1,), (1,), (1,), (1,), (1,), (1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_int, - ListPOINTER(ctypes.c_char_p), ctypes.c_int, ctypes.c_int) - return f(p_instance, psz_name, psz_input, psz_output, i_options, ppsz_options, b_enabled, b_loop) - - -def libvlc_vlm_play_media(p_instance, psz_name): - '''Play the named broadcast. - @param p_instance: the instance. - @param psz_name: the name of the broadcast. - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_vlm_play_media', None) or \ - _Cfunction('libvlc_vlm_play_media', ((1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p) - return f(p_instance, psz_name) - - -def libvlc_vlm_stop_media(p_instance, psz_name): - '''Stop the named broadcast. - @param p_instance: the instance. - @param psz_name: the name of the broadcast. - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_vlm_stop_media', None) or \ - _Cfunction('libvlc_vlm_stop_media', ((1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p) - return f(p_instance, psz_name) - - -def libvlc_vlm_pause_media(p_instance, psz_name): - '''Pause the named broadcast. - @param p_instance: the instance. - @param psz_name: the name of the broadcast. - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_vlm_pause_media', None) or \ - _Cfunction('libvlc_vlm_pause_media', ((1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p) - return f(p_instance, psz_name) - - -def libvlc_vlm_seek_media(p_instance, psz_name, f_percentage): - '''Seek in the named broadcast. - @param p_instance: the instance. - @param psz_name: the name of the broadcast. - @param f_percentage: the percentage to seek to. - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_vlm_seek_media', None) or \ - _Cfunction('libvlc_vlm_seek_media', ((1,), (1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_float) - return f(p_instance, psz_name, f_percentage) - - -def libvlc_vlm_show_media(p_instance, psz_name): - '''Return information about the named media as a JSON - string representation. - This function is mainly intended for debugging use, - if you want programmatic access to the state of - a vlm_media_instance_t, please use the corresponding - libvlc_vlm_get_media_instance_xxx -functions. - Currently there are no such functions available for - vlm_media_t though. - @param p_instance: the instance. - @param psz_name: the name of the media, if the name is an empty string, all media is described. - @return: string with information about named media, or None on error. - ''' - f = _Cfunctions.get('libvlc_vlm_show_media', None) or \ - _Cfunction('libvlc_vlm_show_media', ((1,), (1,),), string_result, - ctypes.c_void_p, Instance, ctypes.c_char_p) - return f(p_instance, psz_name) - - -def libvlc_vlm_get_media_instance_position(p_instance, psz_name, i_instance): - '''Get vlm_media instance position by name or instance id. - @param p_instance: a libvlc instance. - @param psz_name: name of vlm media instance. - @param i_instance: instance id. - @return: position as float or -1. on error. - ''' - f = _Cfunctions.get('libvlc_vlm_get_media_instance_position', None) or \ - _Cfunction('libvlc_vlm_get_media_instance_position', ((1,), (1,), (1,),), None, - ctypes.c_float, Instance, ctypes.c_char_p, ctypes.c_int) - return f(p_instance, psz_name, i_instance) - - -def libvlc_vlm_get_media_instance_time(p_instance, psz_name, i_instance): - '''Get vlm_media instance time by name or instance id. - @param p_instance: a libvlc instance. - @param psz_name: name of vlm media instance. - @param i_instance: instance id. - @return: time as integer or -1 on error. - ''' - f = _Cfunctions.get('libvlc_vlm_get_media_instance_time', None) or \ - _Cfunction('libvlc_vlm_get_media_instance_time', ((1,), (1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_int) - return f(p_instance, psz_name, i_instance) - - -def libvlc_vlm_get_media_instance_length(p_instance, psz_name, i_instance): - '''Get vlm_media instance length by name or instance id. - @param p_instance: a libvlc instance. - @param psz_name: name of vlm media instance. - @param i_instance: instance id. - @return: length of media item or -1 on error. - ''' - f = _Cfunctions.get('libvlc_vlm_get_media_instance_length', None) or \ - _Cfunction('libvlc_vlm_get_media_instance_length', ((1,), (1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_int) - return f(p_instance, psz_name, i_instance) - - -def libvlc_vlm_get_media_instance_rate(p_instance, psz_name, i_instance): - '''Get vlm_media instance playback rate by name or instance id. - @param p_instance: a libvlc instance. - @param psz_name: name of vlm media instance. - @param i_instance: instance id. - @return: playback rate or -1 on error. - ''' - f = _Cfunctions.get('libvlc_vlm_get_media_instance_rate', None) or \ - _Cfunction('libvlc_vlm_get_media_instance_rate', ((1,), (1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_int) - return f(p_instance, psz_name, i_instance) - - -def libvlc_vlm_get_media_instance_title(p_instance, psz_name, i_instance): - '''Get vlm_media instance title number by name or instance id. - @param p_instance: a libvlc instance. - @param psz_name: name of vlm media instance. - @param i_instance: instance id. - @return: title as number or -1 on error. - @bug: will always return 0. - ''' - f = _Cfunctions.get('libvlc_vlm_get_media_instance_title', None) or \ - _Cfunction('libvlc_vlm_get_media_instance_title', ((1,), (1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_int) - return f(p_instance, psz_name, i_instance) - - -def libvlc_vlm_get_media_instance_chapter(p_instance, psz_name, i_instance): - '''Get vlm_media instance chapter number by name or instance id. - @param p_instance: a libvlc instance. - @param psz_name: name of vlm media instance. - @param i_instance: instance id. - @return: chapter as number or -1 on error. - @bug: will always return 0. - ''' - f = _Cfunctions.get('libvlc_vlm_get_media_instance_chapter', None) or \ - _Cfunction('libvlc_vlm_get_media_instance_chapter', ((1,), (1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_int) - return f(p_instance, psz_name, i_instance) - - -def libvlc_vlm_get_media_instance_seekable(p_instance, psz_name, i_instance): - '''Is libvlc instance seekable ? - @param p_instance: a libvlc instance. - @param psz_name: name of vlm media instance. - @param i_instance: instance id. - @return: 1 if seekable, 0 if not, -1 if media does not exist. - @bug: will always return 0. - ''' - f = _Cfunctions.get('libvlc_vlm_get_media_instance_seekable', None) or \ - _Cfunction('libvlc_vlm_get_media_instance_seekable', ((1,), (1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_int) - return f(p_instance, psz_name, i_instance) - - -def libvlc_vlm_get_event_manager(p_instance): - '''Get libvlc_event_manager from a vlm media. - The p_event_manager is immutable, so you don't have to hold the lock. - @param p_instance: a libvlc instance. - @return: libvlc_event_manager. - ''' - f = _Cfunctions.get('libvlc_vlm_get_event_manager', None) or \ - _Cfunction('libvlc_vlm_get_event_manager', ((1,),), class_result(EventManager), - ctypes.c_void_p, Instance) - return f(p_instance) - - -def libvlc_media_new_location(p_instance, psz_mrl): - '''Create a media with a certain given media resource location, - for instance a valid URL. - @note: To refer to a local file with this function, - the file://... URI syntax B{must} be used (see IETF RFC3986). - We recommend using L{libvlc_media_new_path}() instead when dealing with - local files. - See L{libvlc_media_release}. - @param p_instance: the instance. - @param psz_mrl: the media location. - @return: the newly created media or None on error. - ''' - f = _Cfunctions.get('libvlc_media_new_location', None) or \ - _Cfunction('libvlc_media_new_location', ((1,), (1,),), class_result(Media), - ctypes.c_void_p, Instance, ctypes.c_char_p) - return f(p_instance, psz_mrl) - - -def libvlc_media_new_path(p_instance, path): - '''Create a media for a certain file path. - See L{libvlc_media_release}. - @param p_instance: the instance. - @param path: local filesystem path. - @return: the newly created media or None on error. - ''' - f = _Cfunctions.get('libvlc_media_new_path', None) or \ - _Cfunction('libvlc_media_new_path', ((1,), (1,),), class_result(Media), - ctypes.c_void_p, Instance, ctypes.c_char_p) - return f(p_instance, path) - - -def libvlc_media_new_fd(p_instance, fd): - '''Create a media for an already open file descriptor. - The file descriptor shall be open for reading (or reading and writing). - Regular file descriptors, pipe read descriptors and character device - descriptors (including TTYs) are supported on all platforms. - Block device descriptors are supported where available. - Directory descriptors are supported on systems that provide fdopendir(). - Sockets are supported on all platforms where they are file descriptors, - i.e. all except Windows. - @note: This library will B{not} automatically close the file descriptor - under any circumstance. Nevertheless, a file descriptor can usually only be - rendered once in a media player. To render it a second time, the file - descriptor should probably be rewound to the beginning with lseek(). - See L{libvlc_media_release}. - @param p_instance: the instance. - @param fd: open file descriptor. - @return: the newly created media or None on error. - @version: LibVLC 1.1.5 and later. - ''' - f = _Cfunctions.get('libvlc_media_new_fd', None) or \ - _Cfunction('libvlc_media_new_fd', ((1,), (1,),), class_result(Media), - ctypes.c_void_p, Instance, ctypes.c_int) - return f(p_instance, fd) - - -def libvlc_media_new_callbacks(instance, open_cb, read_cb, seek_cb, close_cb, opaque): - '''Create a media with custom callbacks to read the data from. - @param instance: LibVLC instance. - @param open_cb: callback to open the custom bitstream input media. - @param read_cb: callback to read data (must not be None). - @param seek_cb: callback to seek, or None if seeking is not supported. - @param close_cb: callback to close the media, or None if unnecessary. - @param opaque: data pointer for the open callback. - @return: the newly created media or None on error @note If open_cb is None, the opaque pointer will be passed to read_cb, seek_cb and close_cb, and the stream size will be treated as unknown. @note The callbacks may be called asynchronously (from another thread). A single stream instance need not be reentrant. However the open_cb needs to be reentrant if the media is used by multiple player instances. @warning The callbacks may be used until all or any player instances that were supplied the media item are stopped. See L{libvlc_media_release}. - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_media_new_callbacks', None) or \ - _Cfunction('libvlc_media_new_callbacks', ((1,), (1,), (1,), (1,), (1,), (1,),), class_result(Media), - ctypes.c_void_p, Instance, MediaOpenCb, MediaReadCb, MediaSeekCb, MediaCloseCb, ctypes.c_void_p) - return f(instance, open_cb, read_cb, seek_cb, close_cb, opaque) - - -def libvlc_media_new_as_node(p_instance, psz_name): - '''Create a media as an empty node with a given name. - See L{libvlc_media_release}. - @param p_instance: the instance. - @param psz_name: the name of the node. - @return: the new empty media or None on error. - ''' - f = _Cfunctions.get('libvlc_media_new_as_node', None) or \ - _Cfunction('libvlc_media_new_as_node', ((1,), (1,),), class_result(Media), - ctypes.c_void_p, Instance, ctypes.c_char_p) - return f(p_instance, psz_name) - - -def libvlc_media_add_option(p_md, psz_options): - '''Add an option to the media. - This option will be used to determine how the media_player will - read the media. This allows to use VLC's advanced - reading/streaming options on a per-media basis. - @note: The options are listed in 'vlc --long-help' from the command line, - e.g. "-sout-all". Keep in mind that available options and their semantics - vary across LibVLC versions and builds. - @warning: Not all options affects L{Media} objects: - Specifically, due to architectural issues most audio and video options, - such as text renderer options, have no effects on an individual media. - These options must be set through L{libvlc_new}() instead. - @param p_md: the media descriptor. - @param psz_options: the options (as a string). - ''' - f = _Cfunctions.get('libvlc_media_add_option', None) or \ - _Cfunction('libvlc_media_add_option', ((1,), (1,),), None, - None, Media, ctypes.c_char_p) - return f(p_md, psz_options) - - -def libvlc_media_add_option_flag(p_md, psz_options, i_flags): - '''Add an option to the media with configurable flags. - This option will be used to determine how the media_player will - read the media. This allows to use VLC's advanced - reading/streaming options on a per-media basis. - The options are detailed in vlc --long-help, for instance - "--sout-all". Note that all options are not usable on medias: - specifically, due to architectural issues, video-related options - such as text renderer options cannot be set on a single media. They - must be set on the whole libvlc instance instead. - @param p_md: the media descriptor. - @param psz_options: the options (as a string). - @param i_flags: the flags for this option. - ''' - f = _Cfunctions.get('libvlc_media_add_option_flag', None) or \ - _Cfunction('libvlc_media_add_option_flag', ((1,), (1,), (1,),), None, - None, Media, ctypes.c_char_p, ctypes.c_uint) - return f(p_md, psz_options, i_flags) - - -def libvlc_media_retain(p_md): - '''Retain a reference to a media descriptor object (L{Media}). Use - L{libvlc_media_release}() to decrement the reference count of a - media descriptor object. - @param p_md: the media descriptor. - ''' - f = _Cfunctions.get('libvlc_media_retain', None) or \ - _Cfunction('libvlc_media_retain', ((1,),), None, - None, Media) - return f(p_md) - - -def libvlc_media_release(p_md): - '''Decrement the reference count of a media descriptor object. If the - reference count is 0, then L{libvlc_media_release}() will release the - media descriptor object. It will send out an libvlc_MediaFreed event - to all listeners. If the media descriptor object has been released it - should not be used again. - @param p_md: the media descriptor. - ''' - f = _Cfunctions.get('libvlc_media_release', None) or \ - _Cfunction('libvlc_media_release', ((1,),), None, - None, Media) - return f(p_md) - - -def libvlc_media_get_mrl(p_md): - '''Get the media resource locator (mrl) from a media descriptor object. - @param p_md: a media descriptor object. - @return: string with mrl of media descriptor object. - ''' - f = _Cfunctions.get('libvlc_media_get_mrl', None) or \ - _Cfunction('libvlc_media_get_mrl', ((1,),), string_result, - ctypes.c_void_p, Media) - return f(p_md) - - -def libvlc_media_duplicate(p_md): - '''Duplicate a media descriptor object. - @param p_md: a media descriptor object. - ''' - f = _Cfunctions.get('libvlc_media_duplicate', None) or \ - _Cfunction('libvlc_media_duplicate', ((1,),), class_result(Media), - ctypes.c_void_p, Media) - return f(p_md) - - -def libvlc_media_get_meta(p_md, e_meta): - '''Read the meta of the media. - If the media has not yet been parsed this will return None. - See L{libvlc_media_parse} - See L{libvlc_media_parse_with_options} - See libvlc_MediaMetaChanged. - @param p_md: the media descriptor. - @param e_meta: the meta to read. - @return: the media's meta. - ''' - f = _Cfunctions.get('libvlc_media_get_meta', None) or \ - _Cfunction('libvlc_media_get_meta', ((1,), (1,),), string_result, - ctypes.c_void_p, Media, Meta) - return f(p_md, e_meta) - - -def libvlc_media_set_meta(p_md, e_meta, psz_value): - '''Set the meta of the media (this function will not save the meta, call - L{libvlc_media_save_meta} in order to save the meta). - @param p_md: the media descriptor. - @param e_meta: the meta to write. - @param psz_value: the media's meta. - ''' - f = _Cfunctions.get('libvlc_media_set_meta', None) or \ - _Cfunction('libvlc_media_set_meta', ((1,), (1,), (1,),), None, - None, Media, Meta, ctypes.c_char_p) - return f(p_md, e_meta, psz_value) - - -def libvlc_media_save_meta(p_md): - '''Save the meta previously set. - @param p_md: the media desriptor. - @return: true if the write operation was successful. - ''' - f = _Cfunctions.get('libvlc_media_save_meta', None) or \ - _Cfunction('libvlc_media_save_meta', ((1,),), None, - ctypes.c_int, Media) - return f(p_md) - - -def libvlc_media_get_state(p_md): - '''Get current state of media descriptor object. Possible media states are - libvlc_NothingSpecial=0, libvlc_Opening, libvlc_Playing, libvlc_Paused, - libvlc_Stopped, libvlc_Ended, libvlc_Error. - See L{State}. - @param p_md: a media descriptor object. - @return: state of media descriptor object. - ''' - f = _Cfunctions.get('libvlc_media_get_state', None) or \ - _Cfunction('libvlc_media_get_state', ((1,),), None, - State, Media) - return f(p_md) - - -def libvlc_media_get_stats(p_md, p_stats): - '''Get the current statistics about the media. - @param p_md:: media descriptor object. - @param p_stats:: structure that contain the statistics about the media (this structure must be allocated by the caller). - @return: true if the statistics are available, false otherwise \libvlc_return_bool. - ''' - f = _Cfunctions.get('libvlc_media_get_stats', None) or \ - _Cfunction('libvlc_media_get_stats', ((1,), (1,),), None, - ctypes.c_int, Media, ctypes.POINTER(MediaStats)) - return f(p_md, p_stats) - - -def libvlc_media_subitems(p_md): - '''Get subitems of media descriptor object. This will increment - the reference count of supplied media descriptor object. Use - L{libvlc_media_list_release}() to decrement the reference counting. - @param p_md: media descriptor object. - @return: list of media descriptor subitems or None. - ''' - f = _Cfunctions.get('libvlc_media_subitems', None) or \ - _Cfunction('libvlc_media_subitems', ((1,),), class_result(MediaList), - ctypes.c_void_p, Media) - return f(p_md) - - -def libvlc_media_event_manager(p_md): - '''Get event manager from media descriptor object. - NOTE: this function doesn't increment reference counting. - @param p_md: a media descriptor object. - @return: event manager object. - ''' - f = _Cfunctions.get('libvlc_media_event_manager', None) or \ - _Cfunction('libvlc_media_event_manager', ((1,),), class_result(EventManager), - ctypes.c_void_p, Media) - return f(p_md) - - -def libvlc_media_get_duration(p_md): - '''Get duration (in ms) of media descriptor object item. - @param p_md: media descriptor object. - @return: duration of media item or -1 on error. - ''' - f = _Cfunctions.get('libvlc_media_get_duration', None) or \ - _Cfunction('libvlc_media_get_duration', ((1,),), None, - ctypes.c_longlong, Media) - return f(p_md) - - -def libvlc_media_parse_with_options(p_md, parse_flag, timeout): - '''Parse the media asynchronously with options. - This fetches (local or network) art, meta data and/or tracks information. - This method is the extended version of L{libvlc_media_parse_with_options}(). - To track when this is over you can listen to libvlc_MediaParsedChanged - event. However if this functions returns an error, you will not receive any - events. - It uses a flag to specify parse options (see L{MediaParseFlag}). All - these flags can be combined. By default, media is parsed if it's a local - file. - @note: Parsing can be aborted with L{libvlc_media_parse_stop}(). - See libvlc_MediaParsedChanged - See L{libvlc_media_get_meta} - See L{libvlc_media_tracks_get} - See L{libvlc_media_get_parsed_status} - See L{MediaParseFlag}. - @param p_md: media descriptor object. - @param parse_flag: parse options: - @param timeout: maximum time allowed to preparse the media. If -1, the default "preparse-timeout" option will be used as a timeout. If 0, it will wait indefinitely. If > 0, the timeout will be used (in milliseconds). - @return: -1 in case of error, 0 otherwise. - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_media_parse_with_options', None) or \ - _Cfunction('libvlc_media_parse_with_options', ((1,), (1,), (1,),), None, - ctypes.c_int, Media, MediaParseFlag, ctypes.c_int) - return f(p_md, parse_flag, timeout) - - -def libvlc_media_parse_stop(p_md): - '''Stop the parsing of the media - When the media parsing is stopped, the libvlc_MediaParsedChanged event will - be sent with the libvlc_media_parsed_status_timeout status. - See L{libvlc_media_parse_with_options}. - @param p_md: media descriptor object. - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_media_parse_stop', None) or \ - _Cfunction('libvlc_media_parse_stop', ((1,),), None, - None, Media) - return f(p_md) - - -def libvlc_media_get_parsed_status(p_md): - '''Get Parsed status for media descriptor object. - See libvlc_MediaParsedChanged - See L{MediaParsedStatus}. - @param p_md: media descriptor object. - @return: a value of the L{MediaParsedStatus} enum. - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_media_get_parsed_status', None) or \ - _Cfunction('libvlc_media_get_parsed_status', ((1,),), None, - MediaParsedStatus, Media) - return f(p_md) - - -def libvlc_media_set_user_data(p_md, p_new_user_data): - '''Sets media descriptor's user_data. user_data is specialized data - accessed by the host application, VLC.framework uses it as a pointer to - an native object that references a L{Media} pointer. - @param p_md: media descriptor object. - @param p_new_user_data: pointer to user data. - ''' - f = _Cfunctions.get('libvlc_media_set_user_data', None) or \ - _Cfunction('libvlc_media_set_user_data', ((1,), (1,),), None, - None, Media, ctypes.c_void_p) - return f(p_md, p_new_user_data) - - -def libvlc_media_get_user_data(p_md): - '''Get media descriptor's user_data. user_data is specialized data - accessed by the host application, VLC.framework uses it as a pointer to - an native object that references a L{Media} pointer. - @param p_md: media descriptor object. - ''' - f = _Cfunctions.get('libvlc_media_get_user_data', None) or \ - _Cfunction('libvlc_media_get_user_data', ((1,),), None, - ctypes.c_void_p, Media) - return f(p_md) - - -def libvlc_media_tracks_get(p_md, tracks): - '''Get media descriptor's elementary streams description - Note, you need to call L{libvlc_media_parse}() or play the media at least once - before calling this function. - Not doing this will result in an empty array. - @param p_md: media descriptor object. - @param tracks: address to store an allocated array of Elementary Streams descriptions (must be freed with L{libvlc_media_tracks_release}. - @return: the number of Elementary Streams (zero on error). - @version: LibVLC 2.1.0 and later. - ''' - f = _Cfunctions.get('libvlc_media_tracks_get', None) or \ - _Cfunction('libvlc_media_tracks_get', ((1,), (1,),), None, - ctypes.c_uint, Media, ctypes.POINTER(ctypes.POINTER(MediaTrack))) - return f(p_md, tracks) - - -def libvlc_media_get_codec_description(i_type, i_codec): - '''Get codec description from media elementary stream. - @param i_type: i_type from L{MediaTrack}. - @param i_codec: i_codec or i_original_fourcc from L{MediaTrack}. - @return: codec description. - @version: LibVLC 3.0.0 and later. See L{MediaTrack}. - ''' - f = _Cfunctions.get('libvlc_media_get_codec_description', None) or \ - _Cfunction('libvlc_media_get_codec_description', ((1,), (1,),), None, - ctypes.c_char_p, TrackType, ctypes.c_uint32) - return f(i_type, i_codec) - - -def libvlc_media_tracks_release(p_tracks, i_count): - '''Release media descriptor's elementary streams description array. - @param p_tracks: tracks info array to release. - @param i_count: number of elements in the array. - @version: LibVLC 2.1.0 and later. - ''' - f = _Cfunctions.get('libvlc_media_tracks_release', None) or \ - _Cfunction('libvlc_media_tracks_release', ((1,), (1,),), None, - None, ctypes.POINTER(MediaTrack), ctypes.c_uint) - return f(p_tracks, i_count) - - -def libvlc_media_get_type(p_md): - '''Get the media type of the media descriptor object. - @param p_md: media descriptor object. - @return: media type. - @version: LibVLC 3.0.0 and later. See L{MediaType}. - ''' - f = _Cfunctions.get('libvlc_media_get_type', None) or \ - _Cfunction('libvlc_media_get_type', ((1,),), None, - MediaType, Media) - return f(p_md) - - -def libvlc_media_slaves_add(p_md, i_type, i_priority, psz_uri): - '''Add a slave to the current media. - A slave is an external input source that may contains an additional subtitle - track (like a .srt) or an additional audio track (like a .ac3). - @note: This function must be called before the media is parsed (via - L{libvlc_media_parse_with_options}()) or before the media is played (via - L{libvlc_media_player_play}()). - @param p_md: media descriptor object. - @param i_type: subtitle or audio. - @param i_priority: from 0 (low priority) to 4 (high priority). - @param psz_uri: Uri of the slave (should contain a valid scheme). - @return: 0 on success, -1 on error. - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_media_slaves_add', None) or \ - _Cfunction('libvlc_media_slaves_add', ((1,), (1,), (1,), (1,),), None, - ctypes.c_int, Media, MediaSlaveType, ctypes.c_int, ctypes.c_char_p) - return f(p_md, i_type, i_priority, psz_uri) - - -def libvlc_media_slaves_clear(p_md): - '''Clear all slaves previously added by L{libvlc_media_slaves_add}() or - internally. - @param p_md: media descriptor object. - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_media_slaves_clear', None) or \ - _Cfunction('libvlc_media_slaves_clear', ((1,),), None, - None, Media) - return f(p_md) - - -def libvlc_media_slaves_get(p_md, ppp_slaves): - '''Get a media descriptor's slave list - The list will contain slaves parsed by VLC or previously added by - L{libvlc_media_slaves_add}(). The typical use case of this function is to save - a list of slave in a database for a later use. - @param p_md: media descriptor object. - @param ppp_slaves: address to store an allocated array of slaves (must be freed with L{libvlc_media_slaves_release}()) [OUT]. - @return: the number of slaves (zero on error). - @version: LibVLC 3.0.0 and later. See L{libvlc_media_slaves_add}. - ''' - f = _Cfunctions.get('libvlc_media_slaves_get', None) or \ - _Cfunction('libvlc_media_slaves_get', ((1,), (1,),), None, - ctypes.c_int, Media, ctypes.POINTER(ctypes.POINTER(MediaSlave))) - return f(p_md, ppp_slaves) - - -def libvlc_media_slaves_release(pp_slaves, i_count): - '''Release a media descriptor's slave list. - @param pp_slaves: slave array to release. - @param i_count: number of elements in the array. - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_media_slaves_release', None) or \ - _Cfunction('libvlc_media_slaves_release', ((1,), (1,),), None, - None, ctypes.POINTER(MediaSlave), ctypes.c_int) - return f(pp_slaves, i_count) - - -def libvlc_renderer_item_hold(p_item): - '''Hold a renderer item, i.e. creates a new reference - This functions need to called from the libvlc_RendererDiscovererItemAdded - callback if the libvlc user wants to use this item after. (for display or - for passing it to the mediaplayer for example). - @return: the current item. - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_renderer_item_hold', None) or \ - _Cfunction('libvlc_renderer_item_hold', ((1,),), None, - ctypes.c_void_p, ctypes.c_void_p) - return f(p_item) - - -def libvlc_renderer_item_release(p_item): - '''Releases a renderer item, i.e. decrements its reference counter. - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_renderer_item_release', None) or \ - _Cfunction('libvlc_renderer_item_release', ((1,),), None, - None, ctypes.c_void_p) - return f(p_item) - - -def libvlc_renderer_item_name(p_item): - '''Get the human readable name of a renderer item. - @return: the name of the item (can't be None, must *not* be freed). - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_renderer_item_name', None) or \ - _Cfunction('libvlc_renderer_item_name', ((1,),), None, - ctypes.c_char_p, ctypes.c_void_p) - return f(p_item) - - -def libvlc_renderer_item_type(p_item): - '''Get the type (not translated) of a renderer item. For now, the type can only - be "chromecast" ("upnp", "airplay" may come later). - @return: the type of the item (can't be None, must *not* be freed). - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_renderer_item_type', None) or \ - _Cfunction('libvlc_renderer_item_type', ((1,),), None, - ctypes.c_char_p, ctypes.c_void_p) - return f(p_item) - - -def libvlc_renderer_item_icon_uri(p_item): - '''Get the icon uri of a renderer item. - @return: the uri of the item's icon (can be None, must *not* be freed). - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_renderer_item_icon_uri', None) or \ - _Cfunction('libvlc_renderer_item_icon_uri', ((1,),), None, - ctypes.c_char_p, ctypes.c_void_p) - return f(p_item) - - -def libvlc_renderer_item_flags(p_item): - '''Get the flags of a renderer item - See LIBVLC_RENDERER_CAN_AUDIO - See LIBVLC_RENDERER_CAN_VIDEO. - @return: bitwise flag: capabilities of the renderer, see. - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_renderer_item_flags', None) or \ - _Cfunction('libvlc_renderer_item_flags', ((1,),), None, - ctypes.c_int, ctypes.c_void_p) - return f(p_item) - - -def libvlc_renderer_discoverer_new(p_inst, psz_name): - '''Create a renderer discoverer object by name - After this object is created, you should attach to events in order to be - notified of the discoverer events. - You need to call L{libvlc_renderer_discoverer_start}() in order to start the - discovery. - See L{libvlc_renderer_discoverer_event_manager}() - See L{libvlc_renderer_discoverer_start}(). - @param p_inst: libvlc instance. - @param psz_name: service name; use L{libvlc_renderer_discoverer_list_get}() to get a list of the discoverer names available in this libVLC instance. - @return: media discover object or None in case of error. - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_renderer_discoverer_new', None) or \ - _Cfunction('libvlc_renderer_discoverer_new', ((1,), (1,),), None, - ctypes.c_void_p, Instance, ctypes.c_char_p) - return f(p_inst, psz_name) - - -def libvlc_renderer_discoverer_release(p_rd): - '''Release a renderer discoverer object. - @param p_rd: renderer discoverer object. - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_renderer_discoverer_release', None) or \ - _Cfunction('libvlc_renderer_discoverer_release', ((1,),), None, - None, ctypes.c_void_p) - return f(p_rd) - - -def libvlc_renderer_discoverer_start(p_rd): - '''Start renderer discovery - To stop it, call L{libvlc_renderer_discoverer_stop}() or - L{libvlc_renderer_discoverer_release}() directly. - See L{libvlc_renderer_discoverer_stop}(). - @param p_rd: renderer discoverer object. - @return: -1 in case of error, 0 otherwise. - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_renderer_discoverer_start', None) or \ - _Cfunction('libvlc_renderer_discoverer_start', ((1,),), None, - ctypes.c_int, ctypes.c_void_p) - return f(p_rd) - - -def libvlc_renderer_discoverer_stop(p_rd): - '''Stop renderer discovery. - See L{libvlc_renderer_discoverer_start}(). - @param p_rd: renderer discoverer object. - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_renderer_discoverer_stop', None) or \ - _Cfunction('libvlc_renderer_discoverer_stop', ((1,),), None, - None, ctypes.c_void_p) - return f(p_rd) - - -def libvlc_renderer_discoverer_event_manager(p_rd): - '''Get the event manager of the renderer discoverer - The possible events to attach are @ref libvlc_RendererDiscovererItemAdded - and @ref libvlc_RendererDiscovererItemDeleted. - The @ref libvlc_renderer_item_t struct passed to event callbacks is owned by - VLC, users should take care of holding/releasing this struct for their - internal usage. - See libvlc_event_t.u.renderer_discoverer_item_added.item - See libvlc_event_t.u.renderer_discoverer_item_removed.item. - @return: a valid event manager (can't fail). - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_renderer_discoverer_event_manager', None) or \ - _Cfunction('libvlc_renderer_discoverer_event_manager', ((1,),), class_result(EventManager), - ctypes.c_void_p, ctypes.c_void_p) - return f(p_rd) - - -def libvlc_renderer_discoverer_list_get(p_inst, ppp_services): - '''Get media discoverer services - See libvlc_renderer_list_release(). - @param p_inst: libvlc instance. - @param ppp_services: address to store an allocated array of renderer discoverer services (must be freed with libvlc_renderer_list_release() by the caller) [OUT]. - @return: the number of media discoverer services (0 on error). - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_renderer_discoverer_list_get', None) or \ - _Cfunction('libvlc_renderer_discoverer_list_get', ((1,), (1,),), None, - ctypes.c_size_t, Instance, ctypes.POINTER(ctypes.POINTER(RDDescription))) - return f(p_inst, ppp_services) - - -def libvlc_renderer_discoverer_list_release(pp_services, i_count): - '''Release an array of media discoverer services - See L{libvlc_renderer_discoverer_list_get}(). - @param pp_services: array to release. - @param i_count: number of elements in the array. - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_renderer_discoverer_list_release', None) or \ - _Cfunction('libvlc_renderer_discoverer_list_release', ((1,), (1,),), None, - None, ctypes.POINTER(RDDescription), ctypes.c_size_t) - return f(pp_services, i_count) - - -def libvlc_media_list_new(p_instance): - '''Create an empty media list. - @param p_instance: libvlc instance. - @return: empty media list, or None on error. - ''' - f = _Cfunctions.get('libvlc_media_list_new', None) or \ - _Cfunction('libvlc_media_list_new', ((1,),), class_result(MediaList), - ctypes.c_void_p, Instance) - return f(p_instance) - - -def libvlc_media_list_release(p_ml): - '''Release media list created with L{libvlc_media_list_new}(). - @param p_ml: a media list created with L{libvlc_media_list_new}(). - ''' - f = _Cfunctions.get('libvlc_media_list_release', None) or \ - _Cfunction('libvlc_media_list_release', ((1,),), None, - None, MediaList) - return f(p_ml) - - -def libvlc_media_list_retain(p_ml): - '''Retain reference to a media list. - @param p_ml: a media list created with L{libvlc_media_list_new}(). - ''' - f = _Cfunctions.get('libvlc_media_list_retain', None) or \ - _Cfunction('libvlc_media_list_retain', ((1,),), None, - None, MediaList) - return f(p_ml) - - -def libvlc_media_list_set_media(p_ml, p_md): - '''Associate media instance with this media list instance. - If another media instance was present it will be released. - The L{libvlc_media_list_lock} should NOT be held upon entering this function. - @param p_ml: a media list instance. - @param p_md: media instance to add. - ''' - f = _Cfunctions.get('libvlc_media_list_set_media', None) or \ - _Cfunction('libvlc_media_list_set_media', ((1,), (1,),), None, - None, MediaList, Media) - return f(p_ml, p_md) - - -def libvlc_media_list_media(p_ml): - '''Get media instance from this media list instance. This action will increase - the refcount on the media instance. - The L{libvlc_media_list_lock} should NOT be held upon entering this function. - @param p_ml: a media list instance. - @return: media instance. - ''' - f = _Cfunctions.get('libvlc_media_list_media', None) or \ - _Cfunction('libvlc_media_list_media', ((1,),), class_result(Media), - ctypes.c_void_p, MediaList) - return f(p_ml) - - -def libvlc_media_list_add_media(p_ml, p_md): - '''Add media instance to media list - The L{libvlc_media_list_lock} should be held upon entering this function. - @param p_ml: a media list instance. - @param p_md: a media instance. - @return: 0 on success, -1 if the media list is read-only. - ''' - f = _Cfunctions.get('libvlc_media_list_add_media', None) or \ - _Cfunction('libvlc_media_list_add_media', ((1,), (1,),), None, - ctypes.c_int, MediaList, Media) - return f(p_ml, p_md) - - -def libvlc_media_list_insert_media(p_ml, p_md, i_pos): - '''Insert media instance in media list on a position - The L{libvlc_media_list_lock} should be held upon entering this function. - @param p_ml: a media list instance. - @param p_md: a media instance. - @param i_pos: position in array where to insert. - @return: 0 on success, -1 if the media list is read-only. - ''' - f = _Cfunctions.get('libvlc_media_list_insert_media', None) or \ - _Cfunction('libvlc_media_list_insert_media', ((1,), (1,), (1,),), None, - ctypes.c_int, MediaList, Media, ctypes.c_int) - return f(p_ml, p_md, i_pos) - - -def libvlc_media_list_remove_index(p_ml, i_pos): - '''Remove media instance from media list on a position - The L{libvlc_media_list_lock} should be held upon entering this function. - @param p_ml: a media list instance. - @param i_pos: position in array where to insert. - @return: 0 on success, -1 if the list is read-only or the item was not found. - ''' - f = _Cfunctions.get('libvlc_media_list_remove_index', None) or \ - _Cfunction('libvlc_media_list_remove_index', ((1,), (1,),), None, - ctypes.c_int, MediaList, ctypes.c_int) - return f(p_ml, i_pos) - - -def libvlc_media_list_count(p_ml): - '''Get count on media list items - The L{libvlc_media_list_lock} should be held upon entering this function. - @param p_ml: a media list instance. - @return: number of items in media list. - ''' - f = _Cfunctions.get('libvlc_media_list_count', None) or \ - _Cfunction('libvlc_media_list_count', ((1,),), None, - ctypes.c_int, MediaList) - return f(p_ml) - - -def libvlc_media_list_item_at_index(p_ml, i_pos): - '''List media instance in media list at a position - The L{libvlc_media_list_lock} should be held upon entering this function. - @param p_ml: a media list instance. - @param i_pos: position in array where to insert. - @return: media instance at position i_pos, or None if not found. In case of success, L{libvlc_media_retain}() is called to increase the refcount on the media. - ''' - f = _Cfunctions.get('libvlc_media_list_item_at_index', None) or \ - _Cfunction('libvlc_media_list_item_at_index', ((1,), (1,),), class_result(Media), - ctypes.c_void_p, MediaList, ctypes.c_int) - return f(p_ml, i_pos) - - -def libvlc_media_list_index_of_item(p_ml, p_md): - '''Find index position of List media instance in media list. - Warning: the function will return the first matched position. - The L{libvlc_media_list_lock} should be held upon entering this function. - @param p_ml: a media list instance. - @param p_md: media instance. - @return: position of media instance or -1 if media not found. - ''' - f = _Cfunctions.get('libvlc_media_list_index_of_item', None) or \ - _Cfunction('libvlc_media_list_index_of_item', ((1,), (1,),), None, - ctypes.c_int, MediaList, Media) - return f(p_ml, p_md) - - -def libvlc_media_list_is_readonly(p_ml): - '''This indicates if this media list is read-only from a user point of view. - @param p_ml: media list instance. - @return: 1 on readonly, 0 on readwrite \libvlc_return_bool. - ''' - f = _Cfunctions.get('libvlc_media_list_is_readonly', None) or \ - _Cfunction('libvlc_media_list_is_readonly', ((1,),), None, - ctypes.c_int, MediaList) - return f(p_ml) - - -def libvlc_media_list_lock(p_ml): - '''Get lock on media list items. - @param p_ml: a media list instance. - ''' - f = _Cfunctions.get('libvlc_media_list_lock', None) or \ - _Cfunction('libvlc_media_list_lock', ((1,),), None, - None, MediaList) - return f(p_ml) - - -def libvlc_media_list_unlock(p_ml): - '''Release lock on media list items - The L{libvlc_media_list_lock} should be held upon entering this function. - @param p_ml: a media list instance. - ''' - f = _Cfunctions.get('libvlc_media_list_unlock', None) or \ - _Cfunction('libvlc_media_list_unlock', ((1,),), None, - None, MediaList) - return f(p_ml) - - -def libvlc_media_list_event_manager(p_ml): - '''Get libvlc_event_manager from this media list instance. - The p_event_manager is immutable, so you don't have to hold the lock. - @param p_ml: a media list instance. - @return: libvlc_event_manager. - ''' - f = _Cfunctions.get('libvlc_media_list_event_manager', None) or \ - _Cfunction('libvlc_media_list_event_manager', ((1,),), class_result(EventManager), - ctypes.c_void_p, MediaList) - return f(p_ml) - - -def libvlc_media_player_get_fps(p_mi): - '''Get movie fps rate - This function is provided for backward compatibility. It cannot deal with - multiple video tracks. In LibVLC versions prior to 3.0, it would also fail - if the file format did not convey the frame rate explicitly. - \deprecated Consider using L{libvlc_media_tracks_get}() instead. - @param p_mi: the Media Player. - @return: frames per second (fps) for this playing movie, or 0 if unspecified. - ''' - f = _Cfunctions.get('libvlc_media_player_get_fps', None) or \ - _Cfunction('libvlc_media_player_get_fps', ((1,),), None, - ctypes.c_float, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_set_agl(p_mi, drawable): - '''\deprecated Use L{libvlc_media_player_set_nsobject}() instead. - ''' - f = _Cfunctions.get('libvlc_media_player_set_agl', None) or \ - _Cfunction('libvlc_media_player_set_agl', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_uint32) - return f(p_mi, drawable) - - -def libvlc_media_player_get_agl(p_mi): - '''\deprecated Use L{libvlc_media_player_get_nsobject}() instead. - ''' - f = _Cfunctions.get('libvlc_media_player_get_agl', None) or \ - _Cfunction('libvlc_media_player_get_agl', ((1,),), None, - ctypes.c_uint32, MediaPlayer) - return f(p_mi) - - -def libvlc_track_description_release(p_track_description): - '''\deprecated Use L{libvlc_track_description_list_release}() instead. - ''' - f = _Cfunctions.get('libvlc_track_description_release', None) or \ - _Cfunction('libvlc_track_description_release', ((1,),), None, - None, ctypes.POINTER(TrackDescription)) - return f(p_track_description) - - -def libvlc_video_get_height(p_mi): - '''Get current video height. - \deprecated Use L{libvlc_video_get_size}() instead. - @param p_mi: the media player. - @return: the video pixel height or 0 if not applicable. - ''' - f = _Cfunctions.get('libvlc_video_get_height', None) or \ - _Cfunction('libvlc_video_get_height', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_video_get_width(p_mi): - '''Get current video width. - \deprecated Use L{libvlc_video_get_size}() instead. - @param p_mi: the media player. - @return: the video pixel width or 0 if not applicable. - ''' - f = _Cfunctions.get('libvlc_video_get_width', None) or \ - _Cfunction('libvlc_video_get_width', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_video_get_title_description(p_mi): - '''Get the description of available titles. - @param p_mi: the media player. - @return: list containing description of available titles. It must be freed with L{libvlc_track_description_list_release}(). - ''' - f = _Cfunctions.get('libvlc_video_get_title_description', None) or \ - _Cfunction('libvlc_video_get_title_description', ((1,),), None, - ctypes.POINTER(TrackDescription), MediaPlayer) - return f(p_mi) - - -def libvlc_video_get_chapter_description(p_mi, i_title): - '''Get the description of available chapters for specific title. - @param p_mi: the media player. - @param i_title: selected title. - @return: list containing description of available chapter for title i_title. It must be freed with L{libvlc_track_description_list_release}(). - ''' - f = _Cfunctions.get('libvlc_video_get_chapter_description', None) or \ - _Cfunction('libvlc_video_get_chapter_description', ((1,), (1,),), None, - ctypes.POINTER(TrackDescription), MediaPlayer, ctypes.c_int) - return f(p_mi, i_title) - - -def libvlc_video_set_subtitle_file(p_mi, psz_subtitle): - '''Set new video subtitle file. - \deprecated Use L{libvlc_media_player_add_slave}() instead. - @param p_mi: the media player. - @param psz_subtitle: new video subtitle file. - @return: the success status (boolean). - ''' - f = _Cfunctions.get('libvlc_video_set_subtitle_file', None) or \ - _Cfunction('libvlc_video_set_subtitle_file', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_char_p) - return f(p_mi, psz_subtitle) - - -def libvlc_toggle_teletext(p_mi): - '''Toggle teletext transparent status on video output. - \deprecated use L{libvlc_video_set_teletext}() instead. - @param p_mi: the media player. - ''' - f = _Cfunctions.get('libvlc_toggle_teletext', None) or \ - _Cfunction('libvlc_toggle_teletext', ((1,),), None, - None, MediaPlayer) - return f(p_mi) - - -def libvlc_audio_output_device_count(p_instance, psz_audio_output): - '''Backward compatibility stub. Do not use in new code. - \deprecated Use L{libvlc_audio_output_device_list_get}() instead. - @return: always 0. - ''' - f = _Cfunctions.get('libvlc_audio_output_device_count', None) or \ - _Cfunction('libvlc_audio_output_device_count', ((1,), (1,),), None, - ctypes.c_int, Instance, ctypes.c_char_p) - return f(p_instance, psz_audio_output) - - -def libvlc_audio_output_device_longname(p_instance, psz_output, i_device): - '''Backward compatibility stub. Do not use in new code. - \deprecated Use L{libvlc_audio_output_device_list_get}() instead. - @return: always None. - ''' - f = _Cfunctions.get('libvlc_audio_output_device_longname', None) or \ - _Cfunction('libvlc_audio_output_device_longname', ((1,), (1,), (1,),), string_result, - ctypes.c_void_p, Instance, ctypes.c_char_p, ctypes.c_int) - return f(p_instance, psz_output, i_device) - - -def libvlc_audio_output_device_id(p_instance, psz_audio_output, i_device): - '''Backward compatibility stub. Do not use in new code. - \deprecated Use L{libvlc_audio_output_device_list_get}() instead. - @return: always None. - ''' - f = _Cfunctions.get('libvlc_audio_output_device_id', None) or \ - _Cfunction('libvlc_audio_output_device_id', ((1,), (1,), (1,),), string_result, - ctypes.c_void_p, Instance, ctypes.c_char_p, ctypes.c_int) - return f(p_instance, psz_audio_output, i_device) - - -def libvlc_media_parse(p_md): - '''Parse a media. - This fetches (local) art, meta data and tracks information. - The method is synchronous. - \deprecated This function could block indefinitely. - Use L{libvlc_media_parse_with_options}() instead - See L{libvlc_media_parse_with_options} - See L{libvlc_media_get_meta} - See L{libvlc_media_get_tracks_info}. - @param p_md: media descriptor object. - ''' - f = _Cfunctions.get('libvlc_media_parse', None) or \ - _Cfunction('libvlc_media_parse', ((1,),), None, - None, Media) - return f(p_md) - - -def libvlc_media_parse_async(p_md): - '''Parse a media. - This fetches (local) art, meta data and tracks information. - The method is the asynchronous of L{libvlc_media_parse}(). - To track when this is over you can listen to libvlc_MediaParsedChanged - event. However if the media was already parsed you will not receive this - event. - \deprecated You can't be sure to receive the libvlc_MediaParsedChanged - event (you can wait indefinitely for this event). - Use L{libvlc_media_parse_with_options}() instead - See L{libvlc_media_parse} - See libvlc_MediaParsedChanged - See L{libvlc_media_get_meta} - See L{libvlc_media_get_tracks_info}. - @param p_md: media descriptor object. - ''' - f = _Cfunctions.get('libvlc_media_parse_async', None) or \ - _Cfunction('libvlc_media_parse_async', ((1,),), None, - None, Media) - return f(p_md) - - -def libvlc_media_is_parsed(p_md): - '''Return true is the media descriptor object is parsed - \deprecated This can return true in case of failure. - Use L{libvlc_media_get_parsed_status}() instead - See libvlc_MediaParsedChanged. - @param p_md: media descriptor object. - @return: true if media object has been parsed otherwise it returns false \libvlc_return_bool. - ''' - f = _Cfunctions.get('libvlc_media_is_parsed', None) or \ - _Cfunction('libvlc_media_is_parsed', ((1,),), None, - ctypes.c_int, Media) - return f(p_md) - - -def libvlc_media_get_tracks_info(p_md): - '''Get media descriptor's elementary streams description - Note, you need to call L{libvlc_media_parse}() or play the media at least once - before calling this function. - Not doing this will result in an empty array. - \deprecated Use L{libvlc_media_tracks_get}() instead. - @param p_md: media descriptor object. - @param tracks: address to store an allocated array of Elementary Streams descriptions (must be freed by the caller) [OUT]. - @return: the number of Elementary Streams. - ''' - f = _Cfunctions.get('libvlc_media_get_tracks_info', None) or \ - _Cfunction('libvlc_media_get_tracks_info', ((1,), (2,),), None, - ctypes.c_int, Media, ctypes.POINTER(ctypes.c_void_p)) - return f(p_md) - - -def libvlc_media_discoverer_new_from_name(p_inst, psz_name): - '''\deprecated Use L{libvlc_media_discoverer_new}() and L{libvlc_media_discoverer_start}(). - ''' - f = _Cfunctions.get('libvlc_media_discoverer_new_from_name', None) or \ - _Cfunction('libvlc_media_discoverer_new_from_name', ((1,), (1,),), class_result(MediaDiscoverer), - ctypes.c_void_p, Instance, ctypes.c_char_p) - return f(p_inst, psz_name) - - -def libvlc_media_discoverer_localized_name(p_mdis): - '''Get media service discover object its localized name. - \deprecated Useless, use L{libvlc_media_discoverer_list_get}() to get the - longname of the service discovery. - @param p_mdis: media discover object. - @return: localized name or None if the media_discoverer is not started. - ''' - f = _Cfunctions.get('libvlc_media_discoverer_localized_name', None) or \ - _Cfunction('libvlc_media_discoverer_localized_name', ((1,),), string_result, - ctypes.c_void_p, MediaDiscoverer) - return f(p_mdis) - - -def libvlc_media_discoverer_event_manager(p_mdis): - '''Get event manager from media service discover object. - \deprecated Useless, media_discoverer events are only triggered when calling - L{libvlc_media_discoverer_start}() and L{libvlc_media_discoverer_stop}(). - @param p_mdis: media service discover object. - @return: event manager object. - ''' - f = _Cfunctions.get('libvlc_media_discoverer_event_manager', None) or \ - _Cfunction('libvlc_media_discoverer_event_manager', ((1,),), class_result(EventManager), - ctypes.c_void_p, MediaDiscoverer) - return f(p_mdis) - - -def libvlc_wait(p_instance): - '''Waits until an interface causes the instance to exit. - You should start at least one interface first, using L{libvlc_add_intf}(). - @param p_instance: the instance @warning This function wastes one thread doing basically nothing. libvlc_set_exit_handler() should be used instead. - ''' - f = _Cfunctions.get('libvlc_wait', None) or \ - _Cfunction('libvlc_wait', ((1,),), None, - None, Instance) - return f(p_instance) - - -def libvlc_get_log_verbosity(p_instance): - '''Always returns minus one. - This function is only provided for backward compatibility. - @param p_instance: ignored. - @return: always -1. - ''' - f = _Cfunctions.get('libvlc_get_log_verbosity', None) or \ - _Cfunction('libvlc_get_log_verbosity', ((1,),), None, - ctypes.c_uint, Instance) - return f(p_instance) - - -def libvlc_set_log_verbosity(p_instance, level): - '''This function does nothing. - It is only provided for backward compatibility. - @param p_instance: ignored. - @param level: ignored. - ''' - f = _Cfunctions.get('libvlc_set_log_verbosity', None) or \ - _Cfunction('libvlc_set_log_verbosity', ((1,), (1,),), None, - None, Instance, ctypes.c_uint) - return f(p_instance, level) - - -def libvlc_log_open(p_instance): - '''This function does nothing useful. - It is only provided for backward compatibility. - @param p_instance: libvlc instance. - @return: an unique pointer or None on error. - ''' - f = _Cfunctions.get('libvlc_log_open', None) or \ - _Cfunction('libvlc_log_open', ((1,),), None, - Log_ptr, Instance) - return f(p_instance) - - -def libvlc_log_close(p_log): - '''Frees memory allocated by L{libvlc_log_open}(). - @param p_log: libvlc log instance or None. - ''' - f = _Cfunctions.get('libvlc_log_close', None) or \ - _Cfunction('libvlc_log_close', ((1,),), None, - None, Log_ptr) - return f(p_log) - - -def libvlc_log_count(p_log): - '''Always returns zero. - This function is only provided for backward compatibility. - @param p_log: ignored. - @return: always zero. - ''' - f = _Cfunctions.get('libvlc_log_count', None) or \ - _Cfunction('libvlc_log_count', ((1,),), None, - ctypes.c_uint, Log_ptr) - return f(p_log) - - -def libvlc_log_clear(p_log): - '''This function does nothing. - It is only provided for backward compatibility. - @param p_log: ignored. - ''' - f = _Cfunctions.get('libvlc_log_clear', None) or \ - _Cfunction('libvlc_log_clear', ((1,),), None, - None, Log_ptr) - return f(p_log) - - -def libvlc_log_get_iterator(p_log): - '''This function does nothing useful. - It is only provided for backward compatibility. - @param p_log: ignored. - @return: an unique pointer or None on error or if the parameter was None. - ''' - f = _Cfunctions.get('libvlc_log_get_iterator', None) or \ - _Cfunction('libvlc_log_get_iterator', ((1,),), class_result(LogIterator), - ctypes.c_void_p, Log_ptr) - return f(p_log) - - -def libvlc_log_iterator_free(p_iter): - '''Frees memory allocated by L{libvlc_log_get_iterator}(). - @param p_iter: libvlc log iterator or None. - ''' - f = _Cfunctions.get('libvlc_log_iterator_free', None) or \ - _Cfunction('libvlc_log_iterator_free', ((1,),), None, - None, LogIterator) - return f(p_iter) - - -def libvlc_log_iterator_has_next(p_iter): - '''Always returns zero. - This function is only provided for backward compatibility. - @param p_iter: ignored. - @return: always zero. - ''' - f = _Cfunctions.get('libvlc_log_iterator_has_next', None) or \ - _Cfunction('libvlc_log_iterator_has_next', ((1,),), None, - ctypes.c_int, LogIterator) - return f(p_iter) - - -def libvlc_log_iterator_next(p_iter, p_buf): - '''Always returns None. - This function is only provided for backward compatibility. - @param p_iter: libvlc log iterator or None. - @param p_buf: ignored. - @return: always None. - ''' - f = _Cfunctions.get('libvlc_log_iterator_next', None) or \ - _Cfunction('libvlc_log_iterator_next', ((1,), (1,),), None, - ctypes.POINTER(LogMessage), LogIterator, ctypes.POINTER(LogMessage)) - return f(p_iter, p_buf) - - -def libvlc_playlist_play(p_instance, i_id, i_options, ppsz_options): - '''Start playing (if there is any item in the playlist). - Additionnal playlist item options can be specified for addition to the - item before it is played. - @param p_instance: the playlist instance. - @param i_id: the item to play. If this is a negative number, the next item will be selected. Otherwise, the item with the given ID will be played. - @param i_options: the number of options to add to the item. - @param ppsz_options: the options to add to the item. - ''' - f = _Cfunctions.get('libvlc_playlist_play', None) or \ - _Cfunction('libvlc_playlist_play', ((1,), (1,), (1,), (1,),), None, - None, Instance, ctypes.c_int, ctypes.c_int, ListPOINTER(ctypes.c_char_p)) - return f(p_instance, i_id, i_options, ppsz_options) - - -def libvlc_media_player_new(p_libvlc_instance): - '''Create an empty Media Player object. - @param p_libvlc_instance: the libvlc instance in which the Media Player should be created. - @return: a new media player object, or None on error. - ''' - f = _Cfunctions.get('libvlc_media_player_new', None) or \ - _Cfunction('libvlc_media_player_new', ((1,),), class_result(MediaPlayer), - ctypes.c_void_p, Instance) - return f(p_libvlc_instance) - - -def libvlc_media_player_new_from_media(p_md): - '''Create a Media Player object from a Media. - @param p_md: the media. Afterwards the p_md can be safely destroyed. - @return: a new media player object, or None on error. - ''' - f = _Cfunctions.get('libvlc_media_player_new_from_media', None) or \ - _Cfunction('libvlc_media_player_new_from_media', ((1,),), class_result(MediaPlayer), - ctypes.c_void_p, Media) - return f(p_md) - - -def libvlc_media_player_release(p_mi): - '''Release a media_player after use - Decrement the reference count of a media player object. If the - reference count is 0, then L{libvlc_media_player_release}() will - release the media player object. If the media player object - has been released, then it should not be used again. - @param p_mi: the Media Player to free. - ''' - f = _Cfunctions.get('libvlc_media_player_release', None) or \ - _Cfunction('libvlc_media_player_release', ((1,),), None, - None, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_retain(p_mi): - '''Retain a reference to a media player object. Use - L{libvlc_media_player_release}() to decrement reference count. - @param p_mi: media player object. - ''' - f = _Cfunctions.get('libvlc_media_player_retain', None) or \ - _Cfunction('libvlc_media_player_retain', ((1,),), None, - None, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_set_media(p_mi, p_md): - '''Set the media that will be used by the media_player. If any, - previous md will be released. - @param p_mi: the Media Player. - @param p_md: the Media. Afterwards the p_md can be safely destroyed. - ''' - f = _Cfunctions.get('libvlc_media_player_set_media', None) or \ - _Cfunction('libvlc_media_player_set_media', ((1,), (1,),), None, - None, MediaPlayer, Media) - return f(p_mi, p_md) - - -def libvlc_media_player_get_media(p_mi): - '''Get the media used by the media_player. - @param p_mi: the Media Player. - @return: the media associated with p_mi, or None if no media is associated. - ''' - f = _Cfunctions.get('libvlc_media_player_get_media', None) or \ - _Cfunction('libvlc_media_player_get_media', ((1,),), class_result(Media), - ctypes.c_void_p, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_event_manager(p_mi): - '''Get the Event Manager from which the media player send event. - @param p_mi: the Media Player. - @return: the event manager associated with p_mi. - ''' - f = _Cfunctions.get('libvlc_media_player_event_manager', None) or \ - _Cfunction('libvlc_media_player_event_manager', ((1,),), class_result(EventManager), - ctypes.c_void_p, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_is_playing(p_mi): - '''is_playing. - @param p_mi: the Media Player. - @return: 1 if the media player is playing, 0 otherwise \libvlc_return_bool. - ''' - f = _Cfunctions.get('libvlc_media_player_is_playing', None) or \ - _Cfunction('libvlc_media_player_is_playing', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_play(p_mi): - '''Play. - @param p_mi: the Media Player. - @return: 0 if playback started (and was already started), or -1 on error. - ''' - f = _Cfunctions.get('libvlc_media_player_play', None) or \ - _Cfunction('libvlc_media_player_play', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_set_pause(mp, do_pause): - '''Pause or resume (no effect if there is no media). - @param mp: the Media Player. - @param do_pause: play/resume if zero, pause if non-zero. - @version: LibVLC 1.1.1 or later. - ''' - f = _Cfunctions.get('libvlc_media_player_set_pause', None) or \ - _Cfunction('libvlc_media_player_set_pause', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_int) - return f(mp, do_pause) - - -def libvlc_media_player_pause(p_mi): - '''Toggle pause (no effect if there is no media). - @param p_mi: the Media Player. - ''' - f = _Cfunctions.get('libvlc_media_player_pause', None) or \ - _Cfunction('libvlc_media_player_pause', ((1,),), None, - None, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_stop(p_mi): - '''Stop (no effect if there is no media). - @param p_mi: the Media Player. - ''' - f = _Cfunctions.get('libvlc_media_player_stop', None) or \ - _Cfunction('libvlc_media_player_stop', ((1,),), None, - None, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_set_renderer(p_mi, p_item): - '''Set a renderer to the media player - @note: must be called before the first call of L{libvlc_media_player_play}() to - take effect. - See L{libvlc_renderer_discoverer_new}. - @param p_mi: the Media Player. - @param p_item: an item discovered by L{libvlc_renderer_discoverer_start}(). - @return: 0 on success, -1 on error. - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_media_player_set_renderer', None) or \ - _Cfunction('libvlc_media_player_set_renderer', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_void_p) - return f(p_mi, p_item) - - -def libvlc_video_set_callbacks(mp, lock, unlock, display, opaque): - '''Set callbacks and private data to render decoded video to a custom area - in memory. - Use L{libvlc_video_set_format}() or L{libvlc_video_set_format_callbacks}() - to configure the decoded format. - @warning: Rendering video into custom memory buffers is considerably less - efficient than rendering in a custom window as normal. - For optimal perfomances, VLC media player renders into a custom window, and - does not use this function and associated callbacks. It is B{highly - recommended} that other LibVLC-based application do likewise. - To embed video in a window, use libvlc_media_player_set_xid() or equivalent - depending on the operating system. - If window embedding does not fit the application use case, then a custom - LibVLC video output display plugin is required to maintain optimal video - rendering performances. - The following limitations affect performance: - - Hardware video decoding acceleration will either be disabled completely, - or require (relatively slow) copy from video/DSP memory to main memory. - - Sub-pictures (subtitles, on-screen display, etc.) must be blent into the - main picture by the CPU instead of the GPU. - - Depending on the video format, pixel format conversion, picture scaling, - cropping and/or picture re-orientation, must be performed by the CPU - instead of the GPU. - - Memory copying is required between LibVLC reference picture buffers and - application buffers (between lock and unlock callbacks). - @param mp: the media player. - @param lock: callback to lock video memory (must not be None). - @param unlock: callback to unlock video memory (or None if not needed). - @param display: callback to display video (or None if not needed). - @param opaque: private pointer for the three callbacks (as first parameter). - @version: LibVLC 1.1.1 or later. - ''' - f = _Cfunctions.get('libvlc_video_set_callbacks', None) or \ - _Cfunction('libvlc_video_set_callbacks', ((1,), (1,), (1,), (1,), (1,),), None, - None, MediaPlayer, VideoLockCb, VideoUnlockCb, VideoDisplayCb, ctypes.c_void_p) - return f(mp, lock, unlock, display, opaque) - - -def libvlc_video_set_format(mp, chroma, width, height, pitch): - '''Set decoded video chroma and dimensions. - This only works in combination with L{libvlc_video_set_callbacks}(), - and is mutually exclusive with L{libvlc_video_set_format_callbacks}(). - @param mp: the media player. - @param chroma: a four-characters string identifying the chroma (e.g. "RV32" or "YUYV"). - @param width: pixel width. - @param height: pixel height. - @param pitch: line pitch (in bytes). - @version: LibVLC 1.1.1 or later. - @bug: All pixel planes are expected to have the same pitch. To use the YCbCr color space with chrominance subsampling, consider using L{libvlc_video_set_format_callbacks}() instead. - ''' - f = _Cfunctions.get('libvlc_video_set_format', None) or \ - _Cfunction('libvlc_video_set_format', ((1,), (1,), (1,), (1,), (1,),), None, - None, MediaPlayer, ctypes.c_char_p, ctypes.c_uint, ctypes.c_uint, ctypes.c_uint) - return f(mp, chroma, width, height, pitch) - - -def libvlc_video_set_format_callbacks(mp, setup, cleanup): - '''Set decoded video chroma and dimensions. This only works in combination with - L{libvlc_video_set_callbacks}(). - @param mp: the media player. - @param setup: callback to select the video format (cannot be None). - @param cleanup: callback to release any allocated resources (or None). - @version: LibVLC 2.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_video_set_format_callbacks', None) or \ - _Cfunction('libvlc_video_set_format_callbacks', ((1,), (1,), (1,),), None, - None, MediaPlayer, VideoFormatCb, VideoCleanupCb) - return f(mp, setup, cleanup) - - -def libvlc_media_player_set_nsobject(p_mi, drawable): - '''Set the NSView handler where the media player should render its video output. - Use the vout called "macosx". - The drawable is an NSObject that follow the VLCOpenGLVideoViewEmbedding - protocol: - @code.m - \@protocol VLCOpenGLVideoViewEmbedding - - (void)addVoutSubview:(NSView *)view; - - (void)removeVoutSubview:(NSView *)view; - \@end - @endcode - Or it can be an NSView object. - If you want to use it along with Qt see the QMacCocoaViewContainer. Then - the following code should work: - @code.mm - - NSView *video = [[NSView alloc] init]; - QMacCocoaViewContainer *container = new QMacCocoaViewContainer(video, parent); - L{libvlc_media_player_set_nsobject}(mp, video); - [video release]; - - @endcode - You can find a live example in VLCVideoView in VLCKit.framework. - @param p_mi: the Media Player. - @param drawable: the drawable that is either an NSView or an object following the VLCOpenGLVideoViewEmbedding protocol. - ''' - f = _Cfunctions.get('libvlc_media_player_set_nsobject', None) or \ - _Cfunction('libvlc_media_player_set_nsobject', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_void_p) - return f(p_mi, drawable) - - -def libvlc_media_player_get_nsobject(p_mi): - '''Get the NSView handler previously set with L{libvlc_media_player_set_nsobject}(). - @param p_mi: the Media Player. - @return: the NSView handler or 0 if none where set. - ''' - f = _Cfunctions.get('libvlc_media_player_get_nsobject', None) or \ - _Cfunction('libvlc_media_player_get_nsobject', ((1,),), None, - ctypes.c_void_p, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_set_xwindow(p_mi, drawable): - '''Set an X Window System drawable where the media player should render its - video output. The call takes effect when the playback starts. If it is - already started, it might need to be stopped before changes apply. - If LibVLC was built without X11 output support, then this function has no - effects. - By default, LibVLC will capture input events on the video rendering area. - Use L{libvlc_video_set_mouse_input}() and L{libvlc_video_set_key_input}() to - disable that and deliver events to the parent window / to the application - instead. By design, the X11 protocol delivers input events to only one - recipient. - @warning - The application must call the XInitThreads() function from Xlib before - L{libvlc_new}(), and before any call to XOpenDisplay() directly or via any - other library. Failure to call XInitThreads() will seriously impede LibVLC - performance. Calling XOpenDisplay() before XInitThreads() will eventually - crash the process. That is a limitation of Xlib. - @param p_mi: media player. - @param drawable: X11 window ID @note The specified identifier must correspond to an existing Input/Output class X11 window. Pixmaps are B{not} currently supported. The default X11 server is assumed, i.e. that specified in the DISPLAY environment variable. @warning LibVLC can deal with invalid X11 handle errors, however some display drivers (EGL, GLX, VA and/or VDPAU) can unfortunately not. Thus the window handle must remain valid until playback is stopped, otherwise the process may abort or crash. - @bug No more than one window handle per media player instance can be specified. If the media has multiple simultaneously active video tracks, extra tracks will be rendered into external windows beyond the control of the application. - ''' - f = _Cfunctions.get('libvlc_media_player_set_xwindow', None) or \ - _Cfunction('libvlc_media_player_set_xwindow', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_uint32) - return f(p_mi, drawable) - - -def libvlc_media_player_get_xwindow(p_mi): - '''Get the X Window System window identifier previously set with - L{libvlc_media_player_set_xwindow}(). Note that this will return the identifier - even if VLC is not currently using it (for instance if it is playing an - audio-only input). - @param p_mi: the Media Player. - @return: an X window ID, or 0 if none where set. - ''' - f = _Cfunctions.get('libvlc_media_player_get_xwindow', None) or \ - _Cfunction('libvlc_media_player_get_xwindow', ((1,),), None, - ctypes.c_uint32, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_set_hwnd(p_mi, drawable): - '''Set a Win32/Win64 API window handle (HWND) where the media player should - render its video output. If LibVLC was built without Win32/Win64 API output - support, then this has no effects. - @param p_mi: the Media Player. - @param drawable: windows handle of the drawable. - ''' - f = _Cfunctions.get('libvlc_media_player_set_hwnd', None) or \ - _Cfunction('libvlc_media_player_set_hwnd', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_void_p) - return f(p_mi, drawable) - - -def libvlc_media_player_get_hwnd(p_mi): - '''Get the Windows API window handle (HWND) previously set with - L{libvlc_media_player_set_hwnd}(). The handle will be returned even if LibVLC - is not currently outputting any video to it. - @param p_mi: the Media Player. - @return: a window handle or None if there are none. - ''' - f = _Cfunctions.get('libvlc_media_player_get_hwnd', None) or \ - _Cfunction('libvlc_media_player_get_hwnd', ((1,),), None, - ctypes.c_void_p, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_set_android_context(p_mi, p_awindow_handler): - '''Set the android context. - @param p_mi: the media player. - @param p_awindow_handler: org.videolan.libvlc.AWindow jobject owned by the org.videolan.libvlc.MediaPlayer class from the libvlc-android project. - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_media_player_set_android_context', None) or \ - _Cfunction('libvlc_media_player_set_android_context', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_void_p) - return f(p_mi, p_awindow_handler) - - -def libvlc_media_player_set_evas_object(p_mi, p_evas_object): - '''Set the EFL Evas Object. - @param p_mi: the media player. - @param p_evas_object: a valid EFL Evas Object (Evas_Object). - @return: -1 if an error was detected, 0 otherwise. - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_media_player_set_evas_object', None) or \ - _Cfunction('libvlc_media_player_set_evas_object', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_void_p) - return f(p_mi, p_evas_object) - - -def libvlc_audio_set_callbacks(mp, play, pause, resume, flush, drain, opaque): - '''Sets callbacks and private data for decoded audio. - Use L{libvlc_audio_set_format}() or L{libvlc_audio_set_format_callbacks}() - to configure the decoded audio format. - @note: The audio callbacks override any other audio output mechanism. - If the callbacks are set, LibVLC will B{not} output audio in any way. - @param mp: the media player. - @param play: callback to play audio samples (must not be None). - @param pause: callback to pause playback (or None to ignore). - @param resume: callback to resume playback (or None to ignore). - @param flush: callback to flush audio buffers (or None to ignore). - @param drain: callback to drain audio buffers (or None to ignore). - @param opaque: private pointer for the audio callbacks (as first parameter). - @version: LibVLC 2.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_set_callbacks', None) or \ - _Cfunction('libvlc_audio_set_callbacks', ((1,), (1,), (1,), (1,), (1,), (1,), (1,),), None, - None, MediaPlayer, AudioPlayCb, AudioPauseCb, AudioResumeCb, AudioFlushCb, AudioDrainCb, - ctypes.c_void_p) - return f(mp, play, pause, resume, flush, drain, opaque) - - -def libvlc_audio_set_volume_callback(mp, set_volume): - '''Set callbacks and private data for decoded audio. This only works in - combination with L{libvlc_audio_set_callbacks}(). - Use L{libvlc_audio_set_format}() or L{libvlc_audio_set_format_callbacks}() - to configure the decoded audio format. - @param mp: the media player. - @param set_volume: callback to apply audio volume, or None to apply volume in software. - @version: LibVLC 2.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_set_volume_callback', None) or \ - _Cfunction('libvlc_audio_set_volume_callback', ((1,), (1,),), None, - None, MediaPlayer, AudioSetVolumeCb) - return f(mp, set_volume) - - -def libvlc_audio_set_format_callbacks(mp, setup, cleanup): - '''Sets decoded audio format via callbacks. - This only works in combination with L{libvlc_audio_set_callbacks}(). - @param mp: the media player. - @param setup: callback to select the audio format (cannot be None). - @param cleanup: callback to release any allocated resources (or None). - @version: LibVLC 2.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_set_format_callbacks', None) or \ - _Cfunction('libvlc_audio_set_format_callbacks', ((1,), (1,), (1,),), None, - None, MediaPlayer, AudioSetupCb, AudioCleanupCb) - return f(mp, setup, cleanup) - - -def libvlc_audio_set_format(mp, format, rate, channels): - '''Sets a fixed decoded audio format. - This only works in combination with L{libvlc_audio_set_callbacks}(), - and is mutually exclusive with L{libvlc_audio_set_format_callbacks}(). - @param mp: the media player. - @param format: a four-characters string identifying the sample format (e.g. "S16N" or "FL32"). - @param rate: sample rate (expressed in Hz). - @param channels: channels count. - @version: LibVLC 2.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_set_format', None) or \ - _Cfunction('libvlc_audio_set_format', ((1,), (1,), (1,), (1,),), None, - None, MediaPlayer, ctypes.c_char_p, ctypes.c_uint, ctypes.c_uint) - return f(mp, format, rate, channels) - - -def libvlc_media_player_get_length(p_mi): - '''Get the current movie length (in ms). - @param p_mi: the Media Player. - @return: the movie length (in ms), or -1 if there is no media. - ''' - f = _Cfunctions.get('libvlc_media_player_get_length', None) or \ - _Cfunction('libvlc_media_player_get_length', ((1,),), None, - ctypes.c_longlong, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_get_time(p_mi): - '''Get the current movie time (in ms). - @param p_mi: the Media Player. - @return: the movie time (in ms), or -1 if there is no media. - ''' - f = _Cfunctions.get('libvlc_media_player_get_time', None) or \ - _Cfunction('libvlc_media_player_get_time', ((1,),), None, - ctypes.c_longlong, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_set_time(p_mi, i_time): - '''Set the movie time (in ms). This has no effect if no media is being played. - Not all formats and protocols support this. - @param p_mi: the Media Player. - @param i_time: the movie time (in ms). - ''' - f = _Cfunctions.get('libvlc_media_player_set_time', None) or \ - _Cfunction('libvlc_media_player_set_time', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_longlong) - return f(p_mi, i_time) - - -def libvlc_media_player_get_position(p_mi): - '''Get movie position as percentage between 0.0 and 1.0. - @param p_mi: the Media Player. - @return: movie position, or -1. in case of error. - ''' - f = _Cfunctions.get('libvlc_media_player_get_position', None) or \ - _Cfunction('libvlc_media_player_get_position', ((1,),), None, - ctypes.c_float, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_set_position(p_mi, f_pos): - '''Set movie position as percentage between 0.0 and 1.0. - This has no effect if playback is not enabled. - This might not work depending on the underlying input format and protocol. - @param p_mi: the Media Player. - @param f_pos: the position. - ''' - f = _Cfunctions.get('libvlc_media_player_set_position', None) or \ - _Cfunction('libvlc_media_player_set_position', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_float) - return f(p_mi, f_pos) - - -def libvlc_media_player_set_chapter(p_mi, i_chapter): - '''Set movie chapter (if applicable). - @param p_mi: the Media Player. - @param i_chapter: chapter number to play. - ''' - f = _Cfunctions.get('libvlc_media_player_set_chapter', None) or \ - _Cfunction('libvlc_media_player_set_chapter', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_int) - return f(p_mi, i_chapter) - - -def libvlc_media_player_get_chapter(p_mi): - '''Get movie chapter. - @param p_mi: the Media Player. - @return: chapter number currently playing, or -1 if there is no media. - ''' - f = _Cfunctions.get('libvlc_media_player_get_chapter', None) or \ - _Cfunction('libvlc_media_player_get_chapter', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_get_chapter_count(p_mi): - '''Get movie chapter count. - @param p_mi: the Media Player. - @return: number of chapters in movie, or -1. - ''' - f = _Cfunctions.get('libvlc_media_player_get_chapter_count', None) or \ - _Cfunction('libvlc_media_player_get_chapter_count', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_will_play(p_mi): - '''Is the player able to play. - @param p_mi: the Media Player. - @return: boolean \libvlc_return_bool. - ''' - f = _Cfunctions.get('libvlc_media_player_will_play', None) or \ - _Cfunction('libvlc_media_player_will_play', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_get_chapter_count_for_title(p_mi, i_title): - '''Get title chapter count. - @param p_mi: the Media Player. - @param i_title: title. - @return: number of chapters in title, or -1. - ''' - f = _Cfunctions.get('libvlc_media_player_get_chapter_count_for_title', None) or \ - _Cfunction('libvlc_media_player_get_chapter_count_for_title', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_int) - return f(p_mi, i_title) - - -def libvlc_media_player_set_title(p_mi, i_title): - '''Set movie title. - @param p_mi: the Media Player. - @param i_title: title number to play. - ''' - f = _Cfunctions.get('libvlc_media_player_set_title', None) or \ - _Cfunction('libvlc_media_player_set_title', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_int) - return f(p_mi, i_title) - - -def libvlc_media_player_get_title(p_mi): - '''Get movie title. - @param p_mi: the Media Player. - @return: title number currently playing, or -1. - ''' - f = _Cfunctions.get('libvlc_media_player_get_title', None) or \ - _Cfunction('libvlc_media_player_get_title', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_get_title_count(p_mi): - '''Get movie title count. - @param p_mi: the Media Player. - @return: title number count, or -1. - ''' - f = _Cfunctions.get('libvlc_media_player_get_title_count', None) or \ - _Cfunction('libvlc_media_player_get_title_count', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_previous_chapter(p_mi): - '''Set previous chapter (if applicable). - @param p_mi: the Media Player. - ''' - f = _Cfunctions.get('libvlc_media_player_previous_chapter', None) or \ - _Cfunction('libvlc_media_player_previous_chapter', ((1,),), None, - None, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_next_chapter(p_mi): - '''Set next chapter (if applicable). - @param p_mi: the Media Player. - ''' - f = _Cfunctions.get('libvlc_media_player_next_chapter', None) or \ - _Cfunction('libvlc_media_player_next_chapter', ((1,),), None, - None, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_get_rate(p_mi): - '''Get the requested movie play rate. - @warning: Depending on the underlying media, the requested rate may be - different from the real playback rate. - @param p_mi: the Media Player. - @return: movie play rate. - ''' - f = _Cfunctions.get('libvlc_media_player_get_rate', None) or \ - _Cfunction('libvlc_media_player_get_rate', ((1,),), None, - ctypes.c_float, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_set_rate(p_mi, rate): - '''Set movie play rate. - @param p_mi: the Media Player. - @param rate: movie play rate to set. - @return: -1 if an error was detected, 0 otherwise (but even then, it might not actually work depending on the underlying media protocol). - ''' - f = _Cfunctions.get('libvlc_media_player_set_rate', None) or \ - _Cfunction('libvlc_media_player_set_rate', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_float) - return f(p_mi, rate) - - -def libvlc_media_player_get_state(p_mi): - '''Get current movie state. - @param p_mi: the Media Player. - @return: the current state of the media player (playing, paused, ...) See L{State}. - ''' - f = _Cfunctions.get('libvlc_media_player_get_state', None) or \ - _Cfunction('libvlc_media_player_get_state', ((1,),), None, - State, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_has_vout(p_mi): - '''How many video outputs does this media player have? - @param p_mi: the media player. - @return: the number of video outputs. - ''' - f = _Cfunctions.get('libvlc_media_player_has_vout', None) or \ - _Cfunction('libvlc_media_player_has_vout', ((1,),), None, - ctypes.c_uint, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_is_seekable(p_mi): - '''Is this media player seekable? - @param p_mi: the media player. - @return: true if the media player can seek \libvlc_return_bool. - ''' - f = _Cfunctions.get('libvlc_media_player_is_seekable', None) or \ - _Cfunction('libvlc_media_player_is_seekable', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_can_pause(p_mi): - '''Can this media player be paused? - @param p_mi: the media player. - @return: true if the media player can pause \libvlc_return_bool. - ''' - f = _Cfunctions.get('libvlc_media_player_can_pause', None) or \ - _Cfunction('libvlc_media_player_can_pause', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_program_scrambled(p_mi): - '''Check if the current program is scrambled. - @param p_mi: the media player. - @return: true if the current program is scrambled \libvlc_return_bool. - @version: LibVLC 2.2.0 or later. - ''' - f = _Cfunctions.get('libvlc_media_player_program_scrambled', None) or \ - _Cfunction('libvlc_media_player_program_scrambled', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_next_frame(p_mi): - '''Display the next frame (if supported). - @param p_mi: the media player. - ''' - f = _Cfunctions.get('libvlc_media_player_next_frame', None) or \ - _Cfunction('libvlc_media_player_next_frame', ((1,),), None, - None, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_navigate(p_mi, navigate): - '''Navigate through DVD Menu. - @param p_mi: the Media Player. - @param navigate: the Navigation mode. - @version: libVLC 2.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_media_player_navigate', None) or \ - _Cfunction('libvlc_media_player_navigate', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_uint) - return f(p_mi, navigate) - - -def libvlc_media_player_set_video_title_display(p_mi, position, timeout): - '''Set if, and how, the video title will be shown when media is played. - @param p_mi: the media player. - @param position: position at which to display the title, or libvlc_position_disable to prevent the title from being displayed. - @param timeout: title display timeout in milliseconds (ignored if libvlc_position_disable). - @version: libVLC 2.1.0 or later. - ''' - f = _Cfunctions.get('libvlc_media_player_set_video_title_display', None) or \ - _Cfunction('libvlc_media_player_set_video_title_display', ((1,), (1,), (1,),), None, - None, MediaPlayer, Position, ctypes.c_int) - return f(p_mi, position, timeout) - - -def libvlc_media_player_add_slave(p_mi, i_type, psz_uri, b_select): - '''Add a slave to the current media player. - @note: If the player is playing, the slave will be added directly. This call - will also update the slave list of the attached L{Media}. - @param p_mi: the media player. - @param i_type: subtitle or audio. - @param psz_uri: Uri of the slave (should contain a valid scheme). - @param b_select: True if this slave should be selected when it's loaded. - @return: 0 on success, -1 on error. - @version: LibVLC 3.0.0 and later. See L{libvlc_media_slaves_add}. - ''' - f = _Cfunctions.get('libvlc_media_player_add_slave', None) or \ - _Cfunction('libvlc_media_player_add_slave', ((1,), (1,), (1,), (1,),), None, - ctypes.c_int, MediaPlayer, MediaSlaveType, ctypes.c_char_p, ctypes.c_bool) - return f(p_mi, i_type, psz_uri, b_select) - - -def libvlc_track_description_list_release(p_track_description): - '''Release (free) L{TrackDescription}. - @param p_track_description: the structure to release. - ''' - f = _Cfunctions.get('libvlc_track_description_list_release', None) or \ - _Cfunction('libvlc_track_description_list_release', ((1,),), None, - None, ctypes.POINTER(TrackDescription)) - return f(p_track_description) - - -def libvlc_toggle_fullscreen(p_mi): - '''Toggle fullscreen status on non-embedded video outputs. - @warning: The same limitations applies to this function - as to L{libvlc_set_fullscreen}(). - @param p_mi: the media player. - ''' - f = _Cfunctions.get('libvlc_toggle_fullscreen', None) or \ - _Cfunction('libvlc_toggle_fullscreen', ((1,),), None, - None, MediaPlayer) - return f(p_mi) - - -def libvlc_set_fullscreen(p_mi, b_fullscreen): - '''Enable or disable fullscreen. - @warning: With most window managers, only a top-level windows can be in - full-screen mode. Hence, this function will not operate properly if - L{libvlc_media_player_set_xwindow}() was used to embed the video in a - non-top-level window. In that case, the embedding window must be reparented - to the root window B{before} fullscreen mode is enabled. You will want - to reparent it back to its normal parent when disabling fullscreen. - @param p_mi: the media player. - @param b_fullscreen: boolean for fullscreen status. - ''' - f = _Cfunctions.get('libvlc_set_fullscreen', None) or \ - _Cfunction('libvlc_set_fullscreen', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_int) - return f(p_mi, b_fullscreen) - - -def libvlc_get_fullscreen(p_mi): - '''Get current fullscreen status. - @param p_mi: the media player. - @return: the fullscreen status (boolean) \libvlc_return_bool. - ''' - f = _Cfunctions.get('libvlc_get_fullscreen', None) or \ - _Cfunction('libvlc_get_fullscreen', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_video_set_key_input(p_mi, on): - '''Enable or disable key press events handling, according to the LibVLC hotkeys - configuration. By default and for historical reasons, keyboard events are - handled by the LibVLC video widget. - @note: On X11, there can be only one subscriber for key press and mouse - click events per window. If your application has subscribed to those events - for the X window ID of the video widget, then LibVLC will not be able to - handle key presses and mouse clicks in any case. - @warning: This function is only implemented for X11 and Win32 at the moment. - @param p_mi: the media player. - @param on: true to handle key press events, false to ignore them. - ''' - f = _Cfunctions.get('libvlc_video_set_key_input', None) or \ - _Cfunction('libvlc_video_set_key_input', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_uint) - return f(p_mi, on) - - -def libvlc_video_set_mouse_input(p_mi, on): - '''Enable or disable mouse click events handling. By default, those events are - handled. This is needed for DVD menus to work, as well as a few video - filters such as "puzzle". - See L{libvlc_video_set_key_input}(). - @warning: This function is only implemented for X11 and Win32 at the moment. - @param p_mi: the media player. - @param on: true to handle mouse click events, false to ignore them. - ''' - f = _Cfunctions.get('libvlc_video_set_mouse_input', None) or \ - _Cfunction('libvlc_video_set_mouse_input', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_uint) - return f(p_mi, on) - - -def libvlc_video_get_size(p_mi, num): - '''Get the pixel dimensions of a video. - @param p_mi: media player. - @param num: number of the video (starting from, and most commonly 0). - @return: px pixel width, py pixel height. - ''' - f = _Cfunctions.get('libvlc_video_get_size', None) or \ - _Cfunction('libvlc_video_get_size', ((1,), (1,), (2,), (2,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_uint, ctypes.POINTER(ctypes.c_uint), - ctypes.POINTER(ctypes.c_uint)) - return f(p_mi, num) - - -def libvlc_video_get_cursor(p_mi, num): - '''Get the mouse pointer coordinates over a video. - Coordinates are expressed in terms of the decoded video resolution, - B{not} in terms of pixels on the screen/viewport (to get the latter, - you can query your windowing system directly). - Either of the coordinates may be negative or larger than the corresponding - dimension of the video, if the cursor is outside the rendering area. - @warning: The coordinates may be out-of-date if the pointer is not located - on the video rendering area. LibVLC does not track the pointer if it is - outside of the video widget. - @note: LibVLC does not support multiple pointers (it does of course support - multiple input devices sharing the same pointer) at the moment. - @param p_mi: media player. - @param num: number of the video (starting from, and most commonly 0). - @return: px abscissa, py ordinate. - ''' - f = _Cfunctions.get('libvlc_video_get_cursor', None) or \ - _Cfunction('libvlc_video_get_cursor', ((1,), (1,), (2,), (2,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_uint, ctypes.POINTER(ctypes.c_int), ctypes.POINTER(ctypes.c_int)) - return f(p_mi, num) - - -def libvlc_video_get_scale(p_mi): - '''Get the current video scaling factor. - See also L{libvlc_video_set_scale}(). - @param p_mi: the media player. - @return: the currently configured zoom factor, or 0. if the video is set to fit to the output window/drawable automatically. - ''' - f = _Cfunctions.get('libvlc_video_get_scale', None) or \ - _Cfunction('libvlc_video_get_scale', ((1,),), None, - ctypes.c_float, MediaPlayer) - return f(p_mi) - - -def libvlc_video_set_scale(p_mi, f_factor): - '''Set the video scaling factor. That is the ratio of the number of pixels on - screen to the number of pixels in the original decoded video in each - dimension. Zero is a special value; it will adjust the video to the output - window/drawable (in windowed mode) or the entire screen. - Note that not all video outputs support scaling. - @param p_mi: the media player. - @param f_factor: the scaling factor, or zero. - ''' - f = _Cfunctions.get('libvlc_video_set_scale', None) or \ - _Cfunction('libvlc_video_set_scale', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_float) - return f(p_mi, f_factor) - - -def libvlc_video_get_aspect_ratio(p_mi): - '''Get current video aspect ratio. - @param p_mi: the media player. - @return: the video aspect ratio or None if unspecified (the result must be released with free() or L{libvlc_free}()). - ''' - f = _Cfunctions.get('libvlc_video_get_aspect_ratio', None) or \ - _Cfunction('libvlc_video_get_aspect_ratio', ((1,),), string_result, - ctypes.c_void_p, MediaPlayer) - return f(p_mi) - - -def libvlc_video_set_aspect_ratio(p_mi, psz_aspect): - '''Set new video aspect ratio. - @param p_mi: the media player. - @param psz_aspect: new video aspect-ratio or None to reset to default @note Invalid aspect ratios are ignored. - ''' - f = _Cfunctions.get('libvlc_video_set_aspect_ratio', None) or \ - _Cfunction('libvlc_video_set_aspect_ratio', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_char_p) - return f(p_mi, psz_aspect) - - -def libvlc_video_new_viewpoint(): - '''Create a video viewpoint structure. - @return: video viewpoint or None (the result must be released with free() or L{libvlc_free}()). - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_video_new_viewpoint', None) or \ - _Cfunction('libvlc_video_new_viewpoint', (), None, - ctypes.POINTER(VideoViewpoint)) - return f() - - -def libvlc_video_update_viewpoint(p_mi, p_viewpoint, b_absolute): - '''Update the video viewpoint information. - @note: It is safe to call this function before the media player is started. - @param p_mi: the media player. - @param p_viewpoint: video viewpoint allocated via L{libvlc_video_new_viewpoint}(). - @param b_absolute: if true replace the old viewpoint with the new one. If false, increase/decrease it. - @return: -1 in case of error, 0 otherwise @note the values are set asynchronously, it will be used by the next frame displayed. - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_video_update_viewpoint', None) or \ - _Cfunction('libvlc_video_update_viewpoint', ((1,), (1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.POINTER(VideoViewpoint), ctypes.c_bool) - return f(p_mi, p_viewpoint, b_absolute) - - -def libvlc_video_get_spu(p_mi): - '''Get current video subtitle. - @param p_mi: the media player. - @return: the video subtitle selected, or -1 if none. - ''' - f = _Cfunctions.get('libvlc_video_get_spu', None) or \ - _Cfunction('libvlc_video_get_spu', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_video_get_spu_count(p_mi): - '''Get the number of available video subtitles. - @param p_mi: the media player. - @return: the number of available video subtitles. - ''' - f = _Cfunctions.get('libvlc_video_get_spu_count', None) or \ - _Cfunction('libvlc_video_get_spu_count', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_video_get_spu_description(p_mi): - '''Get the description of available video subtitles. - @param p_mi: the media player. - @return: list containing description of available video subtitles. It must be freed with L{libvlc_track_description_list_release}(). - ''' - f = _Cfunctions.get('libvlc_video_get_spu_description', None) or \ - _Cfunction('libvlc_video_get_spu_description', ((1,),), None, - ctypes.POINTER(TrackDescription), MediaPlayer) - return f(p_mi) - - -def libvlc_video_set_spu(p_mi, i_spu): - '''Set new video subtitle. - @param p_mi: the media player. - @param i_spu: video subtitle track to select (i_id from track description). - @return: 0 on success, -1 if out of range. - ''' - f = _Cfunctions.get('libvlc_video_set_spu', None) or \ - _Cfunction('libvlc_video_set_spu', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_int) - return f(p_mi, i_spu) - - -def libvlc_video_get_spu_delay(p_mi): - '''Get the current subtitle delay. Positive values means subtitles are being - displayed later, negative values earlier. - @param p_mi: media player. - @return: time (in microseconds) the display of subtitles is being delayed. - @version: LibVLC 2.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_video_get_spu_delay', None) or \ - _Cfunction('libvlc_video_get_spu_delay', ((1,),), None, - ctypes.c_int64, MediaPlayer) - return f(p_mi) - - -def libvlc_video_set_spu_delay(p_mi, i_delay): - '''Set the subtitle delay. This affects the timing of when the subtitle will - be displayed. Positive values result in subtitles being displayed later, - while negative values will result in subtitles being displayed earlier. - The subtitle delay will be reset to zero each time the media changes. - @param p_mi: media player. - @param i_delay: time (in microseconds) the display of subtitles should be delayed. - @return: 0 on success, -1 on error. - @version: LibVLC 2.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_video_set_spu_delay', None) or \ - _Cfunction('libvlc_video_set_spu_delay', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_int64) - return f(p_mi, i_delay) - - -def libvlc_media_player_get_full_title_descriptions(p_mi, titles): - '''Get the full description of available titles. - @param p_mi: the media player. - @param titles: address to store an allocated array of title descriptions descriptions (must be freed with L{libvlc_title_descriptions_release}() by the caller) [OUT]. - @return: the number of titles (-1 on error). - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_media_player_get_full_title_descriptions', None) or \ - _Cfunction('libvlc_media_player_get_full_title_descriptions', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.POINTER(ctypes.POINTER(TitleDescription))) - return f(p_mi, titles) - - -def libvlc_title_descriptions_release(p_titles, i_count): - '''Release a title description. - @param p_titles: title description array to release. - @param i_count: number of title descriptions to release. - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_title_descriptions_release', None) or \ - _Cfunction('libvlc_title_descriptions_release', ((1,), (1,),), None, - None, ctypes.POINTER(TitleDescription), ctypes.c_uint) - return f(p_titles, i_count) - - -def libvlc_media_player_get_full_chapter_descriptions(p_mi, i_chapters_of_title, pp_chapters): - '''Get the full description of available chapters. - @param p_mi: the media player. - @param i_chapters_of_title: index of the title to query for chapters (uses current title if set to -1). - @param pp_chapters: address to store an allocated array of chapter descriptions descriptions (must be freed with L{libvlc_chapter_descriptions_release}() by the caller) [OUT]. - @return: the number of chapters (-1 on error). - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_media_player_get_full_chapter_descriptions', None) or \ - _Cfunction('libvlc_media_player_get_full_chapter_descriptions', ((1,), (1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_int, ctypes.POINTER(ctypes.POINTER(ChapterDescription))) - return f(p_mi, i_chapters_of_title, pp_chapters) - - -def libvlc_chapter_descriptions_release(p_chapters, i_count): - '''Release a chapter description. - @param p_chapters: chapter description array to release. - @param i_count: number of chapter descriptions to release. - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_chapter_descriptions_release', None) or \ - _Cfunction('libvlc_chapter_descriptions_release', ((1,), (1,),), None, - None, ctypes.POINTER(ChapterDescription), ctypes.c_uint) - return f(p_chapters, i_count) - - -def libvlc_video_get_crop_geometry(p_mi): - '''Get current crop filter geometry. - @param p_mi: the media player. - @return: the crop filter geometry or None if unset. - ''' - f = _Cfunctions.get('libvlc_video_get_crop_geometry', None) or \ - _Cfunction('libvlc_video_get_crop_geometry', ((1,),), string_result, - ctypes.c_void_p, MediaPlayer) - return f(p_mi) - - -def libvlc_video_set_crop_geometry(p_mi, psz_geometry): - '''Set new crop filter geometry. - @param p_mi: the media player. - @param psz_geometry: new crop filter geometry (None to unset). - ''' - f = _Cfunctions.get('libvlc_video_set_crop_geometry', None) or \ - _Cfunction('libvlc_video_set_crop_geometry', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_char_p) - return f(p_mi, psz_geometry) - - -def libvlc_video_get_teletext(p_mi): - '''Get current teletext page requested or 0 if it's disabled. - Teletext is disabled by default, call L{libvlc_video_set_teletext}() to enable - it. - @param p_mi: the media player. - @return: the current teletext page requested. - ''' - f = _Cfunctions.get('libvlc_video_get_teletext', None) or \ - _Cfunction('libvlc_video_get_teletext', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_video_set_teletext(p_mi, i_page): - '''Set new teletext page to retrieve. - This function can also be used to send a teletext key. - @param p_mi: the media player. - @param i_page: teletex page number requested. This value can be 0 to disable teletext, a number in the range ]0;1000[ to show the requested page, or a \ref L{TeletextKey}. 100 is the default teletext page. - ''' - f = _Cfunctions.get('libvlc_video_set_teletext', None) or \ - _Cfunction('libvlc_video_set_teletext', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_int) - return f(p_mi, i_page) - - -def libvlc_video_get_track_count(p_mi): - '''Get number of available video tracks. - @param p_mi: media player. - @return: the number of available video tracks (int). - ''' - f = _Cfunctions.get('libvlc_video_get_track_count', None) or \ - _Cfunction('libvlc_video_get_track_count', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_video_get_track_description(p_mi): - '''Get the description of available video tracks. - @param p_mi: media player. - @return: list with description of available video tracks, or None on error. It must be freed with L{libvlc_track_description_list_release}(). - ''' - f = _Cfunctions.get('libvlc_video_get_track_description', None) or \ - _Cfunction('libvlc_video_get_track_description', ((1,),), None, - ctypes.POINTER(TrackDescription), MediaPlayer) - return f(p_mi) - - -def libvlc_video_get_track(p_mi): - '''Get current video track. - @param p_mi: media player. - @return: the video track ID (int) or -1 if no active input. - ''' - f = _Cfunctions.get('libvlc_video_get_track', None) or \ - _Cfunction('libvlc_video_get_track', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_video_set_track(p_mi, i_track): - '''Set video track. - @param p_mi: media player. - @param i_track: the track ID (i_id field from track description). - @return: 0 on success, -1 if out of range. - ''' - f = _Cfunctions.get('libvlc_video_set_track', None) or \ - _Cfunction('libvlc_video_set_track', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_int) - return f(p_mi, i_track) - - -def libvlc_video_take_snapshot(p_mi, num, psz_filepath, i_width, i_height): - '''Take a snapshot of the current video window. - If i_width AND i_height is 0, original size is used. - If i_width XOR i_height is 0, original aspect-ratio is preserved. - @param p_mi: media player instance. - @param num: number of video output (typically 0 for the first/only one). - @param psz_filepath: the path of a file or a folder to save the screenshot into. - @param i_width: the snapshot's width. - @param i_height: the snapshot's height. - @return: 0 on success, -1 if the video was not found. - ''' - f = _Cfunctions.get('libvlc_video_take_snapshot', None) or \ - _Cfunction('libvlc_video_take_snapshot', ((1,), (1,), (1,), (1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_uint, ctypes.c_char_p, ctypes.c_int, ctypes.c_int) - return f(p_mi, num, psz_filepath, i_width, i_height) - - -def libvlc_video_set_deinterlace(p_mi, psz_mode): - '''Enable or disable deinterlace filter. - @param p_mi: libvlc media player. - @param psz_mode: type of deinterlace filter, None to disable. - ''' - f = _Cfunctions.get('libvlc_video_set_deinterlace', None) or \ - _Cfunction('libvlc_video_set_deinterlace', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_char_p) - return f(p_mi, psz_mode) - - -def libvlc_video_get_marquee_int(p_mi, option): - '''Get an integer marquee option value. - @param p_mi: libvlc media player. - @param option: marq option to get See libvlc_video_marquee_int_option_t. - ''' - f = _Cfunctions.get('libvlc_video_get_marquee_int', None) or \ - _Cfunction('libvlc_video_get_marquee_int', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_uint) - return f(p_mi, option) - - -def libvlc_video_get_marquee_string(p_mi, option): - '''Get a string marquee option value. - @param p_mi: libvlc media player. - @param option: marq option to get See libvlc_video_marquee_string_option_t. - ''' - f = _Cfunctions.get('libvlc_video_get_marquee_string', None) or \ - _Cfunction('libvlc_video_get_marquee_string', ((1,), (1,),), string_result, - ctypes.c_void_p, MediaPlayer, ctypes.c_uint) - return f(p_mi, option) - - -def libvlc_video_set_marquee_int(p_mi, option, i_val): - '''Enable, disable or set an integer marquee option - Setting libvlc_marquee_Enable has the side effect of enabling (arg !0) - or disabling (arg 0) the marq filter. - @param p_mi: libvlc media player. - @param option: marq option to set See libvlc_video_marquee_int_option_t. - @param i_val: marq option value. - ''' - f = _Cfunctions.get('libvlc_video_set_marquee_int', None) or \ - _Cfunction('libvlc_video_set_marquee_int', ((1,), (1,), (1,),), None, - None, MediaPlayer, ctypes.c_uint, ctypes.c_int) - return f(p_mi, option, i_val) - - -def libvlc_video_set_marquee_string(p_mi, option, psz_text): - '''Set a marquee string option. - @param p_mi: libvlc media player. - @param option: marq option to set See libvlc_video_marquee_string_option_t. - @param psz_text: marq option value. - ''' - f = _Cfunctions.get('libvlc_video_set_marquee_string', None) or \ - _Cfunction('libvlc_video_set_marquee_string', ((1,), (1,), (1,),), None, - None, MediaPlayer, ctypes.c_uint, ctypes.c_char_p) - return f(p_mi, option, psz_text) - - -def libvlc_video_get_logo_int(p_mi, option): - '''Get integer logo option. - @param p_mi: libvlc media player instance. - @param option: logo option to get, values of L{VideoLogoOption}. - ''' - f = _Cfunctions.get('libvlc_video_get_logo_int', None) or \ - _Cfunction('libvlc_video_get_logo_int', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_uint) - return f(p_mi, option) - - -def libvlc_video_set_logo_int(p_mi, option, value): - '''Set logo option as integer. Options that take a different type value - are ignored. - Passing libvlc_logo_enable as option value has the side effect of - starting (arg !0) or stopping (arg 0) the logo filter. - @param p_mi: libvlc media player instance. - @param option: logo option to set, values of L{VideoLogoOption}. - @param value: logo option value. - ''' - f = _Cfunctions.get('libvlc_video_set_logo_int', None) or \ - _Cfunction('libvlc_video_set_logo_int', ((1,), (1,), (1,),), None, - None, MediaPlayer, ctypes.c_uint, ctypes.c_int) - return f(p_mi, option, value) - - -def libvlc_video_set_logo_string(p_mi, option, psz_value): - '''Set logo option as string. Options that take a different type value - are ignored. - @param p_mi: libvlc media player instance. - @param option: logo option to set, values of L{VideoLogoOption}. - @param psz_value: logo option value. - ''' - f = _Cfunctions.get('libvlc_video_set_logo_string', None) or \ - _Cfunction('libvlc_video_set_logo_string', ((1,), (1,), (1,),), None, - None, MediaPlayer, ctypes.c_uint, ctypes.c_char_p) - return f(p_mi, option, psz_value) - - -def libvlc_video_get_adjust_int(p_mi, option): - '''Get integer adjust option. - @param p_mi: libvlc media player instance. - @param option: adjust option to get, values of L{VideoAdjustOption}. - @version: LibVLC 1.1.1 and later. - ''' - f = _Cfunctions.get('libvlc_video_get_adjust_int', None) or \ - _Cfunction('libvlc_video_get_adjust_int', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_uint) - return f(p_mi, option) - - -def libvlc_video_set_adjust_int(p_mi, option, value): - '''Set adjust option as integer. Options that take a different type value - are ignored. - Passing libvlc_adjust_enable as option value has the side effect of - starting (arg !0) or stopping (arg 0) the adjust filter. - @param p_mi: libvlc media player instance. - @param option: adust option to set, values of L{VideoAdjustOption}. - @param value: adjust option value. - @version: LibVLC 1.1.1 and later. - ''' - f = _Cfunctions.get('libvlc_video_set_adjust_int', None) or \ - _Cfunction('libvlc_video_set_adjust_int', ((1,), (1,), (1,),), None, - None, MediaPlayer, ctypes.c_uint, ctypes.c_int) - return f(p_mi, option, value) - - -def libvlc_video_get_adjust_float(p_mi, option): - '''Get float adjust option. - @param p_mi: libvlc media player instance. - @param option: adjust option to get, values of L{VideoAdjustOption}. - @version: LibVLC 1.1.1 and later. - ''' - f = _Cfunctions.get('libvlc_video_get_adjust_float', None) or \ - _Cfunction('libvlc_video_get_adjust_float', ((1,), (1,),), None, - ctypes.c_float, MediaPlayer, ctypes.c_uint) - return f(p_mi, option) - - -def libvlc_video_set_adjust_float(p_mi, option, value): - '''Set adjust option as float. Options that take a different type value - are ignored. - @param p_mi: libvlc media player instance. - @param option: adust option to set, values of L{VideoAdjustOption}. - @param value: adjust option value. - @version: LibVLC 1.1.1 and later. - ''' - f = _Cfunctions.get('libvlc_video_set_adjust_float', None) or \ - _Cfunction('libvlc_video_set_adjust_float', ((1,), (1,), (1,),), None, - None, MediaPlayer, ctypes.c_uint, ctypes.c_float) - return f(p_mi, option, value) - - -def libvlc_audio_output_list_get(p_instance): - '''Gets the list of available audio output modules. - @param p_instance: libvlc instance. - @return: list of available audio outputs. It must be freed with In case of error, None is returned. - ''' - f = _Cfunctions.get('libvlc_audio_output_list_get', None) or \ - _Cfunction('libvlc_audio_output_list_get', ((1,),), None, - ctypes.POINTER(AudioOutput), Instance) - return f(p_instance) - - -def libvlc_audio_output_list_release(p_list): - '''Frees the list of available audio output modules. - @param p_list: list with audio outputs for release. - ''' - f = _Cfunctions.get('libvlc_audio_output_list_release', None) or \ - _Cfunction('libvlc_audio_output_list_release', ((1,),), None, - None, ctypes.POINTER(AudioOutput)) - return f(p_list) - - -def libvlc_audio_output_set(p_mi, psz_name): - '''Selects an audio output module. - @note: Any change will take be effect only after playback is stopped and - restarted. Audio output cannot be changed while playing. - @param p_mi: media player. - @param psz_name: name of audio output, use psz_name of See L{AudioOutput}. - @return: 0 if function succeeded, -1 on error. - ''' - f = _Cfunctions.get('libvlc_audio_output_set', None) or \ - _Cfunction('libvlc_audio_output_set', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_char_p) - return f(p_mi, psz_name) - - -def libvlc_audio_output_device_enum(mp): - '''Gets a list of potential audio output devices, - See L{libvlc_audio_output_device_set}(). - @note: Not all audio outputs support enumerating devices. - The audio output may be functional even if the list is empty (None). - @note: The list may not be exhaustive. - @warning: Some audio output devices in the list might not actually work in - some circumstances. By default, it is recommended to not specify any - explicit audio device. - @param mp: media player. - @return: A None-terminated linked list of potential audio output devices. It must be freed with L{libvlc_audio_output_device_list_release}(). - @version: LibVLC 2.2.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_output_device_enum', None) or \ - _Cfunction('libvlc_audio_output_device_enum', ((1,),), None, - ctypes.POINTER(AudioOutputDevice), MediaPlayer) - return f(mp) - - -def libvlc_audio_output_device_list_get(p_instance, aout): - '''Gets a list of audio output devices for a given audio output module, - See L{libvlc_audio_output_device_set}(). - @note: Not all audio outputs support this. In particular, an empty (None) - list of devices does B{not} imply that the specified audio output does - not work. - @note: The list might not be exhaustive. - @warning: Some audio output devices in the list might not actually work in - some circumstances. By default, it is recommended to not specify any - explicit audio device. - @param p_instance: libvlc instance. - @param aout: audio output name (as returned by L{libvlc_audio_output_list_get}()). - @return: A None-terminated linked list of potential audio output devices. It must be freed with L{libvlc_audio_output_device_list_release}(). - @version: LibVLC 2.1.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_output_device_list_get', None) or \ - _Cfunction('libvlc_audio_output_device_list_get', ((1,), (1,),), None, - ctypes.POINTER(AudioOutputDevice), Instance, ctypes.c_char_p) - return f(p_instance, aout) - - -def libvlc_audio_output_device_list_release(p_list): - '''Frees a list of available audio output devices. - @param p_list: list with audio outputs for release. - @version: LibVLC 2.1.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_output_device_list_release', None) or \ - _Cfunction('libvlc_audio_output_device_list_release', ((1,),), None, - None, ctypes.POINTER(AudioOutputDevice)) - return f(p_list) - - -def libvlc_audio_output_device_set(mp, module, device_id): - '''Configures an explicit audio output device. - If the module paramater is None, audio output will be moved to the device - specified by the device identifier string immediately. This is the - recommended usage. - A list of adequate potential device strings can be obtained with - L{libvlc_audio_output_device_enum}(). - However passing None is supported in LibVLC version 2.2.0 and later only; - in earlier versions, this function would have no effects when the module - parameter was None. - If the module parameter is not None, the device parameter of the - corresponding audio output, if it exists, will be set to the specified - string. Note that some audio output modules do not have such a parameter - (notably MMDevice and PulseAudio). - A list of adequate potential device strings can be obtained with - L{libvlc_audio_output_device_list_get}(). - @note: This function does not select the specified audio output plugin. - L{libvlc_audio_output_set}() is used for that purpose. - @warning: The syntax for the device parameter depends on the audio output. - Some audio output modules require further parameters (e.g. a channels map - in the case of ALSA). - @param mp: media player. - @param module: If None, current audio output module. if non-None, name of audio output module. - @param device_id: device identifier string. - @return: Nothing. Errors are ignored (this is a design bug). - ''' - f = _Cfunctions.get('libvlc_audio_output_device_set', None) or \ - _Cfunction('libvlc_audio_output_device_set', ((1,), (1,), (1,),), None, - None, MediaPlayer, ctypes.c_char_p, ctypes.c_char_p) - return f(mp, module, device_id) - - -def libvlc_audio_output_device_get(mp): - '''Get the current audio output device identifier. - This complements L{libvlc_audio_output_device_set}(). - @warning: The initial value for the current audio output device identifier - may not be set or may be some unknown value. A LibVLC application should - compare this value against the known device identifiers (e.g. those that - were previously retrieved by a call to L{libvlc_audio_output_device_enum} or - L{libvlc_audio_output_device_list_get}) to find the current audio output device. - It is possible that the selected audio output device changes (an external - change) without a call to L{libvlc_audio_output_device_set}. That may make this - method unsuitable to use if a LibVLC application is attempting to track - dynamic audio device changes as they happen. - @param mp: media player. - @return: the current audio output device identifier None if no device is selected or in case of error (the result must be released with free() or L{libvlc_free}()). - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_output_device_get', None) or \ - _Cfunction('libvlc_audio_output_device_get', ((1,),), string_result, - ctypes.c_void_p, MediaPlayer) - return f(mp) - - -def libvlc_audio_toggle_mute(p_mi): - '''Toggle mute status. - @param p_mi: media player @warning Toggling mute atomically is not always possible: On some platforms, other processes can mute the VLC audio playback stream asynchronously. Thus, there is a small race condition where toggling will not work. See also the limitations of L{libvlc_audio_set_mute}(). - ''' - f = _Cfunctions.get('libvlc_audio_toggle_mute', None) or \ - _Cfunction('libvlc_audio_toggle_mute', ((1,),), None, - None, MediaPlayer) - return f(p_mi) - - -def libvlc_audio_get_mute(p_mi): - '''Get current mute status. - @param p_mi: media player. - @return: the mute status (boolean) if defined, -1 if undefined/unapplicable. - ''' - f = _Cfunctions.get('libvlc_audio_get_mute', None) or \ - _Cfunction('libvlc_audio_get_mute', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_audio_set_mute(p_mi, status): - '''Set mute status. - @param p_mi: media player. - @param status: If status is true then mute, otherwise unmute @warning This function does not always work. If there are no active audio playback stream, the mute status might not be available. If digital pass-through (S/PDIF, HDMI...) is in use, muting may be unapplicable. Also some audio output plugins do not support muting at all. @note To force silent playback, disable all audio tracks. This is more efficient and reliable than mute. - ''' - f = _Cfunctions.get('libvlc_audio_set_mute', None) or \ - _Cfunction('libvlc_audio_set_mute', ((1,), (1,),), None, - None, MediaPlayer, ctypes.c_int) - return f(p_mi, status) - - -def libvlc_audio_get_volume(p_mi): - '''Get current software audio volume. - @param p_mi: media player. - @return: the software volume in percents (0 = mute, 100 = nominal / 0dB). - ''' - f = _Cfunctions.get('libvlc_audio_get_volume', None) or \ - _Cfunction('libvlc_audio_get_volume', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_audio_set_volume(p_mi, i_volume): - '''Set current software audio volume. - @param p_mi: media player. - @param i_volume: the volume in percents (0 = mute, 100 = 0dB). - @return: 0 if the volume was set, -1 if it was out of range. - ''' - f = _Cfunctions.get('libvlc_audio_set_volume', None) or \ - _Cfunction('libvlc_audio_set_volume', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_int) - return f(p_mi, i_volume) - - -def libvlc_audio_get_track_count(p_mi): - '''Get number of available audio tracks. - @param p_mi: media player. - @return: the number of available audio tracks (int), or -1 if unavailable. - ''' - f = _Cfunctions.get('libvlc_audio_get_track_count', None) or \ - _Cfunction('libvlc_audio_get_track_count', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_audio_get_track_description(p_mi): - '''Get the description of available audio tracks. - @param p_mi: media player. - @return: list with description of available audio tracks, or None. It must be freed with L{libvlc_track_description_list_release}(). - ''' - f = _Cfunctions.get('libvlc_audio_get_track_description', None) or \ - _Cfunction('libvlc_audio_get_track_description', ((1,),), None, - ctypes.POINTER(TrackDescription), MediaPlayer) - return f(p_mi) - - -def libvlc_audio_get_track(p_mi): - '''Get current audio track. - @param p_mi: media player. - @return: the audio track ID or -1 if no active input. - ''' - f = _Cfunctions.get('libvlc_audio_get_track', None) or \ - _Cfunction('libvlc_audio_get_track', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_audio_set_track(p_mi, i_track): - '''Set current audio track. - @param p_mi: media player. - @param i_track: the track ID (i_id field from track description). - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_audio_set_track', None) or \ - _Cfunction('libvlc_audio_set_track', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_int) - return f(p_mi, i_track) - - -def libvlc_audio_get_channel(p_mi): - '''Get current audio channel. - @param p_mi: media player. - @return: the audio channel See L{AudioOutputChannel}. - ''' - f = _Cfunctions.get('libvlc_audio_get_channel', None) or \ - _Cfunction('libvlc_audio_get_channel', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_audio_set_channel(p_mi, channel): - '''Set current audio channel. - @param p_mi: media player. - @param channel: the audio channel, See L{AudioOutputChannel}. - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_audio_set_channel', None) or \ - _Cfunction('libvlc_audio_set_channel', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_int) - return f(p_mi, channel) - - -def libvlc_audio_get_delay(p_mi): - '''Get current audio delay. - @param p_mi: media player. - @return: the audio delay (microseconds). - @version: LibVLC 1.1.1 or later. - ''' - f = _Cfunctions.get('libvlc_audio_get_delay', None) or \ - _Cfunction('libvlc_audio_get_delay', ((1,),), None, - ctypes.c_int64, MediaPlayer) - return f(p_mi) - - -def libvlc_audio_set_delay(p_mi, i_delay): - '''Set current audio delay. The audio delay will be reset to zero each time the media changes. - @param p_mi: media player. - @param i_delay: the audio delay (microseconds). - @return: 0 on success, -1 on error. - @version: LibVLC 1.1.1 or later. - ''' - f = _Cfunctions.get('libvlc_audio_set_delay', None) or \ - _Cfunction('libvlc_audio_set_delay', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_int64) - return f(p_mi, i_delay) - - -def libvlc_audio_equalizer_get_preset_count(): - '''Get the number of equalizer presets. - @return: number of presets. - @version: LibVLC 2.2.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_equalizer_get_preset_count', None) or \ - _Cfunction('libvlc_audio_equalizer_get_preset_count', (), None, - ctypes.c_uint) - return f() - - -def libvlc_audio_equalizer_get_preset_name(u_index): - '''Get the name of a particular equalizer preset. - This name can be used, for example, to prepare a preset label or menu in a user - interface. - @param u_index: index of the preset, counting from zero. - @return: preset name, or None if there is no such preset. - @version: LibVLC 2.2.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_equalizer_get_preset_name', None) or \ - _Cfunction('libvlc_audio_equalizer_get_preset_name', ((1,),), None, - ctypes.c_char_p, ctypes.c_uint) - return f(u_index) - - -def libvlc_audio_equalizer_get_band_count(): - '''Get the number of distinct frequency bands for an equalizer. - @return: number of frequency bands. - @version: LibVLC 2.2.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_equalizer_get_band_count', None) or \ - _Cfunction('libvlc_audio_equalizer_get_band_count', (), None, - ctypes.c_uint) - return f() - - -def libvlc_audio_equalizer_get_band_frequency(u_index): - '''Get a particular equalizer band frequency. - This value can be used, for example, to create a label for an equalizer band control - in a user interface. - @param u_index: index of the band, counting from zero. - @return: equalizer band frequency (Hz), or -1 if there is no such band. - @version: LibVLC 2.2.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_equalizer_get_band_frequency', None) or \ - _Cfunction('libvlc_audio_equalizer_get_band_frequency', ((1,),), None, - ctypes.c_float, ctypes.c_uint) - return f(u_index) - - -def libvlc_audio_equalizer_new(): - '''Create a new default equalizer, with all frequency values zeroed. - The new equalizer can subsequently be applied to a media player by invoking - L{libvlc_media_player_set_equalizer}(). - The returned handle should be freed via L{libvlc_audio_equalizer_release}() when - it is no longer needed. - @return: opaque equalizer handle, or None on error. - @version: LibVLC 2.2.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_equalizer_new', None) or \ - _Cfunction('libvlc_audio_equalizer_new', (), None, - ctypes.c_void_p) - return f() - - -def libvlc_audio_equalizer_new_from_preset(u_index): - '''Create a new equalizer, with initial frequency values copied from an existing - preset. - The new equalizer can subsequently be applied to a media player by invoking - L{libvlc_media_player_set_equalizer}(). - The returned handle should be freed via L{libvlc_audio_equalizer_release}() when - it is no longer needed. - @param u_index: index of the preset, counting from zero. - @return: opaque equalizer handle, or None on error. - @version: LibVLC 2.2.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_equalizer_new_from_preset', None) or \ - _Cfunction('libvlc_audio_equalizer_new_from_preset', ((1,),), None, - ctypes.c_void_p, ctypes.c_uint) - return f(u_index) - - -def libvlc_audio_equalizer_release(p_equalizer): - '''Release a previously created equalizer instance. - The equalizer was previously created by using L{libvlc_audio_equalizer_new}() or - L{libvlc_audio_equalizer_new_from_preset}(). - It is safe to invoke this method with a None p_equalizer parameter for no effect. - @param p_equalizer: opaque equalizer handle, or None. - @version: LibVLC 2.2.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_equalizer_release', None) or \ - _Cfunction('libvlc_audio_equalizer_release', ((1,),), None, - None, ctypes.c_void_p) - return f(p_equalizer) - - -def libvlc_audio_equalizer_set_preamp(p_equalizer, f_preamp): - '''Set a new pre-amplification value for an equalizer. - The new equalizer settings are subsequently applied to a media player by invoking - L{libvlc_media_player_set_equalizer}(). - The supplied amplification value will be clamped to the -20.0 to +20.0 range. - @param p_equalizer: valid equalizer handle, must not be None. - @param f_preamp: preamp value (-20.0 to 20.0 Hz). - @return: zero on success, -1 on error. - @version: LibVLC 2.2.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_equalizer_set_preamp', None) or \ - _Cfunction('libvlc_audio_equalizer_set_preamp', ((1,), (1,),), None, - ctypes.c_int, ctypes.c_void_p, ctypes.c_float) - return f(p_equalizer, f_preamp) - - -def libvlc_audio_equalizer_get_preamp(p_equalizer): - '''Get the current pre-amplification value from an equalizer. - @param p_equalizer: valid equalizer handle, must not be None. - @return: preamp value (Hz). - @version: LibVLC 2.2.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_equalizer_get_preamp', None) or \ - _Cfunction('libvlc_audio_equalizer_get_preamp', ((1,),), None, - ctypes.c_float, ctypes.c_void_p) - return f(p_equalizer) - - -def libvlc_audio_equalizer_set_amp_at_index(p_equalizer, f_amp, u_band): - '''Set a new amplification value for a particular equalizer frequency band. - The new equalizer settings are subsequently applied to a media player by invoking - L{libvlc_media_player_set_equalizer}(). - The supplied amplification value will be clamped to the -20.0 to +20.0 range. - @param p_equalizer: valid equalizer handle, must not be None. - @param f_amp: amplification value (-20.0 to 20.0 Hz). - @param u_band: index, counting from zero, of the frequency band to set. - @return: zero on success, -1 on error. - @version: LibVLC 2.2.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_equalizer_set_amp_at_index', None) or \ - _Cfunction('libvlc_audio_equalizer_set_amp_at_index', ((1,), (1,), (1,),), None, - ctypes.c_int, ctypes.c_void_p, ctypes.c_float, ctypes.c_uint) - return f(p_equalizer, f_amp, u_band) - - -def libvlc_audio_equalizer_get_amp_at_index(p_equalizer, u_band): - '''Get the amplification value for a particular equalizer frequency band. - @param p_equalizer: valid equalizer handle, must not be None. - @param u_band: index, counting from zero, of the frequency band to get. - @return: amplification value (Hz); NaN if there is no such frequency band. - @version: LibVLC 2.2.0 or later. - ''' - f = _Cfunctions.get('libvlc_audio_equalizer_get_amp_at_index', None) or \ - _Cfunction('libvlc_audio_equalizer_get_amp_at_index', ((1,), (1,),), None, - ctypes.c_float, ctypes.c_void_p, ctypes.c_uint) - return f(p_equalizer, u_band) - - -def libvlc_media_player_set_equalizer(p_mi, p_equalizer): - '''Apply new equalizer settings to a media player. - The equalizer is first created by invoking L{libvlc_audio_equalizer_new}() or - L{libvlc_audio_equalizer_new_from_preset}(). - It is possible to apply new equalizer settings to a media player whether the media - player is currently playing media or not. - Invoking this method will immediately apply the new equalizer settings to the audio - output of the currently playing media if there is any. - If there is no currently playing media, the new equalizer settings will be applied - later if and when new media is played. - Equalizer settings will automatically be applied to subsequently played media. - To disable the equalizer for a media player invoke this method passing None for the - p_equalizer parameter. - The media player does not keep a reference to the supplied equalizer so it is safe - for an application to release the equalizer reference any time after this method - returns. - @param p_mi: opaque media player handle. - @param p_equalizer: opaque equalizer handle, or None to disable the equalizer for this media player. - @return: zero on success, -1 on error. - @version: LibVLC 2.2.0 or later. - ''' - f = _Cfunctions.get('libvlc_media_player_set_equalizer', None) or \ - _Cfunction('libvlc_media_player_set_equalizer', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_void_p) - return f(p_mi, p_equalizer) - - -def libvlc_media_player_get_role(p_mi): - '''Gets the media role. - @param p_mi: media player. - @return: the media player role (\ref libvlc_media_player_role_t). - @version: LibVLC 3.0.0 and later. - ''' - f = _Cfunctions.get('libvlc_media_player_get_role', None) or \ - _Cfunction('libvlc_media_player_get_role', ((1,),), None, - ctypes.c_int, MediaPlayer) - return f(p_mi) - - -def libvlc_media_player_set_role(p_mi, role): - '''Sets the media role. - @param p_mi: media player. - @param role: the media player role (\ref libvlc_media_player_role_t). - @return: 0 on success, -1 on error. - ''' - f = _Cfunctions.get('libvlc_media_player_set_role', None) or \ - _Cfunction('libvlc_media_player_set_role', ((1,), (1,),), None, - ctypes.c_int, MediaPlayer, ctypes.c_uint) - return f(p_mi, role) - - -def libvlc_media_list_player_new(p_instance): - '''Create new media_list_player. - @param p_instance: libvlc instance. - @return: media list player instance or None on error. - ''' - f = _Cfunctions.get('libvlc_media_list_player_new', None) or \ - _Cfunction('libvlc_media_list_player_new', ((1,),), class_result(MediaListPlayer), - ctypes.c_void_p, Instance) - return f(p_instance) - - -def libvlc_media_list_player_release(p_mlp): - '''Release a media_list_player after use - Decrement the reference count of a media player object. If the - reference count is 0, then L{libvlc_media_list_player_release}() will - release the media player object. If the media player object - has been released, then it should not be used again. - @param p_mlp: media list player instance. - ''' - f = _Cfunctions.get('libvlc_media_list_player_release', None) or \ - _Cfunction('libvlc_media_list_player_release', ((1,),), None, - None, MediaListPlayer) - return f(p_mlp) - - -def libvlc_media_list_player_retain(p_mlp): - '''Retain a reference to a media player list object. Use - L{libvlc_media_list_player_release}() to decrement reference count. - @param p_mlp: media player list object. - ''' - f = _Cfunctions.get('libvlc_media_list_player_retain', None) or \ - _Cfunction('libvlc_media_list_player_retain', ((1,),), None, - None, MediaListPlayer) - return f(p_mlp) - - -def libvlc_media_list_player_event_manager(p_mlp): - '''Return the event manager of this media_list_player. - @param p_mlp: media list player instance. - @return: the event manager. - ''' - f = _Cfunctions.get('libvlc_media_list_player_event_manager', None) or \ - _Cfunction('libvlc_media_list_player_event_manager', ((1,),), class_result(EventManager), - ctypes.c_void_p, MediaListPlayer) - return f(p_mlp) - - -def libvlc_media_list_player_set_media_player(p_mlp, p_mi): - '''Replace media player in media_list_player with this instance. - @param p_mlp: media list player instance. - @param p_mi: media player instance. - ''' - f = _Cfunctions.get('libvlc_media_list_player_set_media_player', None) or \ - _Cfunction('libvlc_media_list_player_set_media_player', ((1,), (1,),), None, - None, MediaListPlayer, MediaPlayer) - return f(p_mlp, p_mi) - - -def libvlc_media_list_player_get_media_player(p_mlp): - '''Get media player of the media_list_player instance. - @param p_mlp: media list player instance. - @return: media player instance @note the caller is responsible for releasing the returned instance. - ''' - f = _Cfunctions.get('libvlc_media_list_player_get_media_player', None) or \ - _Cfunction('libvlc_media_list_player_get_media_player', ((1,),), class_result(MediaPlayer), - ctypes.c_void_p, MediaListPlayer) - return f(p_mlp) - - -def libvlc_media_list_player_set_media_list(p_mlp, p_mlist): - '''Set the media list associated with the player. - @param p_mlp: media list player instance. - @param p_mlist: list of media. - ''' - f = _Cfunctions.get('libvlc_media_list_player_set_media_list', None) or \ - _Cfunction('libvlc_media_list_player_set_media_list', ((1,), (1,),), None, - None, MediaListPlayer, MediaList) - return f(p_mlp, p_mlist) - - -def libvlc_media_list_player_play(p_mlp): - '''Play media list. - @param p_mlp: media list player instance. - ''' - f = _Cfunctions.get('libvlc_media_list_player_play', None) or \ - _Cfunction('libvlc_media_list_player_play', ((1,),), None, - None, MediaListPlayer) - return f(p_mlp) - - -def libvlc_media_list_player_pause(p_mlp): - '''Toggle pause (or resume) media list. - @param p_mlp: media list player instance. - ''' - f = _Cfunctions.get('libvlc_media_list_player_pause', None) or \ - _Cfunction('libvlc_media_list_player_pause', ((1,),), None, - None, MediaListPlayer) - return f(p_mlp) - - -def libvlc_media_list_player_set_pause(p_mlp, do_pause): - '''Pause or resume media list. - @param p_mlp: media list player instance. - @param do_pause: play/resume if zero, pause if non-zero. - @version: LibVLC 3.0.0 or later. - ''' - f = _Cfunctions.get('libvlc_media_list_player_set_pause', None) or \ - _Cfunction('libvlc_media_list_player_set_pause', ((1,), (1,),), None, - None, MediaListPlayer, ctypes.c_int) - return f(p_mlp, do_pause) - - -def libvlc_media_list_player_is_playing(p_mlp): - '''Is media list playing? - @param p_mlp: media list player instance. - @return: true for playing and false for not playing \libvlc_return_bool. - ''' - f = _Cfunctions.get('libvlc_media_list_player_is_playing', None) or \ - _Cfunction('libvlc_media_list_player_is_playing', ((1,),), None, - ctypes.c_int, MediaListPlayer) - return f(p_mlp) - - -def libvlc_media_list_player_get_state(p_mlp): - '''Get current libvlc_state of media list player. - @param p_mlp: media list player instance. - @return: L{State} for media list player. - ''' - f = _Cfunctions.get('libvlc_media_list_player_get_state', None) or \ - _Cfunction('libvlc_media_list_player_get_state', ((1,),), None, - State, MediaListPlayer) - return f(p_mlp) - - -def libvlc_media_list_player_play_item_at_index(p_mlp, i_index): - '''Play media list item at position index. - @param p_mlp: media list player instance. - @param i_index: index in media list to play. - @return: 0 upon success -1 if the item wasn't found. - ''' - f = _Cfunctions.get('libvlc_media_list_player_play_item_at_index', None) or \ - _Cfunction('libvlc_media_list_player_play_item_at_index', ((1,), (1,),), None, - ctypes.c_int, MediaListPlayer, ctypes.c_int) - return f(p_mlp, i_index) - - -def libvlc_media_list_player_play_item(p_mlp, p_md): - '''Play the given media item. - @param p_mlp: media list player instance. - @param p_md: the media instance. - @return: 0 upon success, -1 if the media is not part of the media list. - ''' - f = _Cfunctions.get('libvlc_media_list_player_play_item', None) or \ - _Cfunction('libvlc_media_list_player_play_item', ((1,), (1,),), None, - ctypes.c_int, MediaListPlayer, Media) - return f(p_mlp, p_md) - - -def libvlc_media_list_player_stop(p_mlp): - '''Stop playing media list. - @param p_mlp: media list player instance. - ''' - f = _Cfunctions.get('libvlc_media_list_player_stop', None) or \ - _Cfunction('libvlc_media_list_player_stop', ((1,),), None, - None, MediaListPlayer) - return f(p_mlp) - - -def libvlc_media_list_player_next(p_mlp): - '''Play next item from media list. - @param p_mlp: media list player instance. - @return: 0 upon success -1 if there is no next item. - ''' - f = _Cfunctions.get('libvlc_media_list_player_next', None) or \ - _Cfunction('libvlc_media_list_player_next', ((1,),), None, - ctypes.c_int, MediaListPlayer) - return f(p_mlp) - - -def libvlc_media_list_player_previous(p_mlp): - '''Play previous item from media list. - @param p_mlp: media list player instance. - @return: 0 upon success -1 if there is no previous item. - ''' - f = _Cfunctions.get('libvlc_media_list_player_previous', None) or \ - _Cfunction('libvlc_media_list_player_previous', ((1,),), None, - ctypes.c_int, MediaListPlayer) - return f(p_mlp) - - -def libvlc_media_list_player_set_playback_mode(p_mlp, e_mode): - '''Sets the playback mode for the playlist. - @param p_mlp: media list player instance. - @param e_mode: playback mode specification. - ''' - f = _Cfunctions.get('libvlc_media_list_player_set_playback_mode', None) or \ - _Cfunction('libvlc_media_list_player_set_playback_mode', ((1,), (1,),), None, - None, MediaListPlayer, PlaybackMode) - return f(p_mlp, e_mode) - - -# 5 function(s) blacklisted: -# libvlc_audio_output_get_device_type -# libvlc_audio_output_set_device_type -# libvlc_dialog_set_callbacks -# libvlc_printerr -# libvlc_set_exit_handler - -# 54 function(s) not wrapped as methods: -# libvlc_audio_equalizer_get_amp_at_index -# libvlc_audio_equalizer_get_band_count -# libvlc_audio_equalizer_get_band_frequency -# libvlc_audio_equalizer_get_preamp -# libvlc_audio_equalizer_get_preset_count -# libvlc_audio_equalizer_get_preset_name -# libvlc_audio_equalizer_new -# libvlc_audio_equalizer_new_from_preset -# libvlc_audio_equalizer_release -# libvlc_audio_equalizer_set_amp_at_index -# libvlc_audio_equalizer_set_preamp -# libvlc_audio_output_device_list_release -# libvlc_audio_output_list_release -# libvlc_chapter_descriptions_release -# libvlc_clearerr -# libvlc_clock -# libvlc_dialog_dismiss -# libvlc_dialog_get_context -# libvlc_dialog_post_action -# libvlc_dialog_post_login -# libvlc_dialog_set_context -# libvlc_event_type_name -# libvlc_free -# libvlc_get_changeset -# libvlc_get_compiler -# libvlc_get_version -# libvlc_log_clear -# libvlc_log_close -# libvlc_log_count -# libvlc_log_get_context -# libvlc_log_get_iterator -# libvlc_log_get_object -# libvlc_media_discoverer_list_release -# libvlc_media_get_codec_description -# libvlc_media_slaves_release -# libvlc_media_tracks_release -# libvlc_module_description_list_release -# libvlc_new -# libvlc_renderer_discoverer_event_manager -# libvlc_renderer_discoverer_list_release -# libvlc_renderer_discoverer_release -# libvlc_renderer_discoverer_start -# libvlc_renderer_discoverer_stop -# libvlc_renderer_item_flags -# libvlc_renderer_item_hold -# libvlc_renderer_item_icon_uri -# libvlc_renderer_item_name -# libvlc_renderer_item_release -# libvlc_renderer_item_type -# libvlc_title_descriptions_release -# libvlc_track_description_list_release -# libvlc_track_description_release -# libvlc_video_new_viewpoint -# libvlc_vprinterr - -# Start of footer.py # - -# Backward compatibility -def callbackmethod(callback): - """Now obsolete @callbackmethod decorator.""" - return callback - - -# libvlc_free is not present in some versions of libvlc. If it is not -# in the library, then emulate it by calling libc.free -if not hasattr(dll, 'libvlc_free'): - # need to find the free function in the C runtime. This is - # platform specific. - # For Linux and MacOSX - libc_path = find_library('c') - if libc_path: - libc = ctypes.CDLL(libc_path) - libvlc_free = libc.free - else: - # On win32, it is impossible to guess the proper lib to call - # (msvcrt, mingw...). Just ignore the call: it will memleak, - # but not prevent to run the application. - def libvlc_free(p): - pass - - # ensure argtypes is right, because default type of int won't - # work on 64-bit systems - libvlc_free.argtypes = [ctypes.c_void_p] - - -# Version functions -def _dot2int(v): - '''(INTERNAL) Convert 'i.i.i[.i]' str to int. - ''' - t = [int(i) for i in v.split('.')] - if len(t) == 3: - if t[2] < 100: - t.append(0) - else: # 100 is arbitrary - t[2:4] = divmod(t[2], 100) - elif len(t) != 4: - raise ValueError('"i.i.i[.i]": %r' % (v,)) - if min(t) < 0 or max(t) > 255: - raise ValueError('[0..255]: %r' % (v,)) - i = t.pop(0) - while t: - i = (i << 8) + t.pop(0) - return i - - -def hex_version(): - """Return the version of these bindings in hex or 0 if unavailable. - """ - try: - return _dot2int(__version__) - except (NameError, ValueError): - return 0 - - -def libvlc_hex_version(): - """Return the libvlc version in hex or 0 if unavailable. - """ - try: - return _dot2int(bytes_to_str(libvlc_get_version()).split()[0]) - except ValueError: - return 0 - - -def debug_callback(event, *args, **kwds): - '''Example callback, useful for debugging. - ''' - l = ['event %s' % (event.type,)] - if args: - l.extend(map(str, args)) - if kwds: - l.extend(sorted('%s=%s' % t for t in kwds.items())) - print('Debug callback (%s)' % ', '.join(l)) - - -if __name__ == '__main__': - logging.basicConfig(level=logging.DEBUG) - try: - from msvcrt import getch - except ImportError: - import termios - import tty - - - def getch(): # getchar(), getc(stdin) #PYCHOK flake - fd = sys.stdin.fileno() - old = termios.tcgetattr(fd) - try: - tty.setraw(fd) - ch = sys.stdin.read(1) - finally: - termios.tcsetattr(fd, termios.TCSADRAIN, old) - return ch - - - def end_callback(event): - print('End of media stream (event %s)' % event.type) - sys.exit(0) - - - echo_position = False - - - def pos_callback(event, player): - if echo_position: - sys.stdout.write('\r%s to %.2f%% (%.2f%%)' % (event.type, - event.u.new_position * 100, - player.get_position() * 100)) - sys.stdout.flush() - - - def print_version(): - """Print version of this vlc.py and of the libvlc""" - try: - print('Build date: %s (%#x)' % (build_date, hex_version())) - print('LibVLC version: %s (%#x)' % (bytes_to_str(libvlc_get_version()), libvlc_hex_version())) - print('LibVLC compiler: %s' % bytes_to_str(libvlc_get_compiler())) - if plugin_path: - print('Plugin path: %s' % plugin_path) - except: - print('Error: %s' % sys.exc_info()[1]) - - - if sys.argv[1:] and '-h' not in sys.argv[1:] and '--help' not in sys.argv[1:]: - - movie = os.path.expanduser(sys.argv.pop()) - if not os.access(movie, os.R_OK): - print('Error: %s file not readable' % movie) - sys.exit(1) - - # Need --sub-source=marq in order to use marquee below - instance = Instance(["--sub-source=marq"] + sys.argv[1:]) - try: - media = instance.media_new(movie) - except (AttributeError, NameError) as e: - print('%s: %s (%s %s vs LibVLC %s)' % (e.__class__.__name__, e, - sys.argv[0], __version__, - libvlc_get_version())) - sys.exit(1) - player = instance.media_player_new() - player.set_media(media) - player.play() - - # Some marquee examples. Marquee requires '--sub-source marq' in the - # Instance() call above, see - player.video_set_marquee_int(VideoMarqueeOption.Enable, 1) - player.video_set_marquee_int(VideoMarqueeOption.Size, 24) # pixels - player.video_set_marquee_int(VideoMarqueeOption.Position, Position.Bottom) - if False: # only one marquee can be specified - player.video_set_marquee_int(VideoMarqueeOption.Timeout, 5000) # millisec, 0==forever - t = media.get_mrl() # movie - else: # update marquee text periodically - player.video_set_marquee_int(VideoMarqueeOption.Timeout, 0) # millisec, 0==forever - player.video_set_marquee_int(VideoMarqueeOption.Refresh, 1000) # millisec (or sec?) - ##t = '$L / $D or $P at $T' - t = '%Y-%m-%d %H:%M:%S' - player.video_set_marquee_string(VideoMarqueeOption.Text, str_to_bytes(t)) - - # Some event manager examples. Note, the callback can be any Python - # callable and does not need to be decorated. Optionally, specify - # any number of positional and/or keyword arguments to be passed - # to the callback (in addition to the first one, an Event instance). - event_manager = player.event_manager() - event_manager.event_attach(EventType.MediaPlayerEndReached, end_callback) - event_manager.event_attach(EventType.MediaPlayerPositionChanged, pos_callback, player) - - - def mspf(): - """Milliseconds per frame""" - return int(1000 // (player.get_fps() or 25)) - - - def print_info(): - """Print information about the media""" - try: - print_version() - media = player.get_media() - print('State: %s' % player.get_state()) - print('Media: %s' % bytes_to_str(media.get_mrl())) - print('Track: %s/%s' % (player.video_get_track(), player.video_get_track_count())) - print('Current time: %s/%s' % (player.get_time(), media.get_duration())) - print('Position: %s' % player.get_position()) - print('FPS: %s (%d ms)' % (player.get_fps(), mspf())) - print('Rate: %s' % player.get_rate()) - print('Video size: %s' % str(player.video_get_size(0))) # num=0 - print('Scale: %s' % player.video_get_scale()) - print('Aspect ratio: %s' % player.video_get_aspect_ratio()) - # print('Window:' % player.get_hwnd() - except Exception: - print('Error: %s' % sys.exc_info()[1]) - - - def sec_forward(): - """Go forward one sec""" - player.set_time(player.get_time() + 1000) - - - def sec_backward(): - """Go backward one sec""" - player.set_time(player.get_time() - 1000) - - - def frame_forward(): - """Go forward one frame""" - player.set_time(player.get_time() + mspf()) - - - def frame_backward(): - """Go backward one frame""" - player.set_time(player.get_time() - mspf()) - - - def print_help(): - """Print help""" - print('Single-character commands:') - for k, m in sorted(keybindings.items()): - m = (m.__doc__ or m.__name__).splitlines()[0] - print(' %s: %s.' % (k, m.rstrip('.'))) - print('0-9: go to that fraction of the movie') - - - def quit_app(): - """Stop and exit""" - sys.exit(0) - - - def toggle_echo_position(): - """Toggle echoing of media position""" - global echo_position - echo_position = not echo_position - - - keybindings = { - ' ': player.pause, - '+': sec_forward, - '-': sec_backward, - '.': frame_forward, - ',': frame_backward, - 'f': player.toggle_fullscreen, - 'i': print_info, - 'p': toggle_echo_position, - 'q': quit_app, - '?': print_help, - } - - print('Press q to quit, ? to get help.%s' % os.linesep) - while True: - k = getch() - print('> %s' % k) - if k in keybindings: - keybindings[k]() - elif k.isdigit(): - # jump to fraction of the movie. - player.set_position(float('0.' + k)) - - else: - print('Usage: %s [options] ' % sys.argv[0]) - print('Once launched, type ? for help.') - print('') - print_version() diff --git a/openlp/core/ui/media/vlcplayer.py b/openlp/core/ui/media/vlcplayer.py index bd82ef14f..d4c5230f4 100644 --- a/openlp/core/ui/media/vlcplayer.py +++ b/openlp/core/ui/media/vlcplayer.py @@ -28,6 +28,7 @@ import os import sys import threading from datetime import datetime +import vlc from distutils.version import LooseVersion from PyQt5 import QtWidgets @@ -65,59 +66,61 @@ def get_vlc(): :return: The "vlc" module, or None """ - if 'openlp.core.ui.media.vendor.vlc' in sys.modules: + if 'vlc' in sys.modules: # If VLC has already been imported, no need to do all the stuff below again is_vlc_available = False try: - is_vlc_available = bool(sys.modules['openlp.core.ui.media.vendor.vlc'].get_default_instance()) + is_vlc_available = bool(sys.modules['vlc'].get_default_instance()) except Exception: pass if is_vlc_available: - return sys.modules['openlp.core.ui.media.vendor.vlc'] + return sys.modules['vlc'] else: return None - is_vlc_available = False - try: - if is_macosx(): - # Newer versions of VLC on OS X need this. See https://forum.videolan.org/viewtopic.php?t=124521 - os.environ['VLC_PLUGIN_PATH'] = '/Applications/VLC.app/Contents/MacOS/plugins' - # On Windows when frozen in PyInstaller, we need to blank SetDllDirectoryW to allow loading of the VLC dll. - # This is due to limitations (by design) in PyInstaller. SetDllDirectoryW original value is restored once - # VLC has been imported. - if is_win(): - buffer_size = 1024 - dll_directory = ctypes.create_unicode_buffer(buffer_size) - new_buffer_size = ctypes.windll.kernel32.GetDllDirectoryW(buffer_size, dll_directory) - dll_directory = ''.join(dll_directory[:new_buffer_size]).replace('\0', '') - log.debug('Original DllDirectory: %s' % dll_directory) - ctypes.windll.kernel32.SetDllDirectoryW(None) - from openlp.core.ui.media.vendor import vlc - if is_win(): - ctypes.windll.kernel32.SetDllDirectoryW(dll_directory) - is_vlc_available = bool(vlc.get_default_instance()) - except (ImportError, NameError, NotImplementedError): - pass - except OSError as e: - # this will get raised the first time - if is_win(): - if not isinstance(e, WindowsError) and e.winerror != 126: - raise - else: - pass - if is_vlc_available: - try: - VERSION = vlc.libvlc_get_version().decode('UTF-8') - except Exception: - VERSION = '0.0.0' - # LooseVersion does not work when a string contains letter and digits (e. g. 2.0.5 Twoflower). - # http://bugs.python.org/issue14894 - if LooseVersion(VERSION.split()[0]) < LooseVersion('1.1.0'): - is_vlc_available = False - log.debug('VLC could not be loaded, because the vlc version is too old: %s' % VERSION) - if is_vlc_available: - return vlc else: - return None + return vlc + #is_vlc_available = False + # try: + # if is_macosx(): + # # Newer versions of VLC on OS X need this. See https://forum.videolan.org/viewtopic.php?t=124521 + # os.environ['VLC_PLUGIN_PATH'] = '/Applications/VLC.app/Contents/MacOS/plugins' + # # On Windows when frozen in PyInstaller, we need to blank SetDllDirectoryW to allow loading of the VLC dll. + # # This is due to limitations (by design) in PyInstaller. SetDllDirectoryW original value is restored once + # # VLC has been imported. + # if is_win(): + # buffer_size = 1024 + # dll_directory = ctypes.create_unicode_buffer(buffer_size) + # new_buffer_size = ctypes.windll.kernel32.GetDllDirectoryW(buffer_size, dll_directory) + # dll_directory = ''.join(dll_directory[:new_buffer_size]).replace('\0', '') + # log.debug('Original DllDirectory: %s' % dll_directory) + # ctypes.windll.kernel32.SetDllDirectoryW(None) + # from openlp.core.ui.media.vendor import vlc + # if is_win(): + # ctypes.windll.kernel32.SetDllDirectoryW(dll_directory) + # is_vlc_available = bool(vlc.get_default_instance()) + # except (ImportError, NameError, NotImplementedError): + # pass + # except OSError as e: + # # this will get raised the first time + # if is_win(): + # if not isinstance(e, WindowsError) and e.winerror != 126: + # raise + # else: + # pass + # if is_vlc_available: + # try: + # VERSION = vlc.libvlc_get_version().decode('UTF-8') + # except Exception: + # VERSION = '0.0.0' + # # LooseVersion does not work when a string contains letter and digits (e. g. 2.0.5 Twoflower). + # # http://bugs.python.org/issue14894 + # if LooseVersion(VERSION.split()[0]) < LooseVersion('1.1.0'): + # is_vlc_available = False + # log.debug('VLC could not be loaded, because the vlc version is too old: %s' % VERSION) + #if is_vlc_available: + # return vlc + #else: + # return None # On linux we need to initialise X threads, but not when running tests. diff --git a/scripts/check_dependencies.py b/scripts/check_dependencies.py index ab176022f..2fbddd69f 100755 --- a/scripts/check_dependencies.py +++ b/scripts/check_dependencies.py @@ -89,7 +89,8 @@ MODULES = [ 'webob', 'requests', 'qtawesome', - 'pymediainfo' + 'pymediainfo', + 'vlc' ] From 9e22ed86e3036a2e1e62b07cb114d6feb3f3960f Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Wed, 8 May 2019 14:58:06 +0100 Subject: [PATCH 19/22] remove unneeded test --- openlp/core/ui/media/vlcplayer.py | 1 - .../openlp_core/ui/media/test_vlcplayer.py | 15 --------------- 2 files changed, 16 deletions(-) diff --git a/openlp/core/ui/media/vlcplayer.py b/openlp/core/ui/media/vlcplayer.py index d4c5230f4..2a34b8b57 100644 --- a/openlp/core/ui/media/vlcplayer.py +++ b/openlp/core/ui/media/vlcplayer.py @@ -29,7 +29,6 @@ import sys import threading from datetime import datetime import vlc -from distutils.version import LooseVersion from PyQt5 import QtWidgets diff --git a/tests/functional/openlp_core/ui/media/test_vlcplayer.py b/tests/functional/openlp_core/ui/media/test_vlcplayer.py index 08e17377b..d3de03758 100644 --- a/tests/functional/openlp_core/ui/media/test_vlcplayer.py +++ b/tests/functional/openlp_core/ui/media/test_vlcplayer.py @@ -65,21 +65,6 @@ class TestVLCPlayer(TestCase, TestMixin): # THEN: The extra environment variable should be there assert 'openlp.core.ui.media.vendor.vlc' not in sys.modules - @patch('openlp.core.ui.media.vlcplayer.is_macosx') - def test_fix_vlc_22_plugin_path(self, mocked_is_macosx): - """ - Test that on OS X we set the VLC plugin path to fix a bug in the VLC module - """ - # GIVEN: We're on OS X and we don't have the VLC plugin path set - mocked_is_macosx.return_value = True - - # WHEN: An checking if the player is available - get_vlc() - - # THEN: The extra environment variable should be there - assert 'VLC_PLUGIN_PATH' in os.environ, 'The plugin path should be in the environment variables' - assert '/Applications/VLC.app/Contents/MacOS/plugins' == os.environ['VLC_PLUGIN_PATH'] - @patch.dict(os.environ) @patch('openlp.core.ui.media.vlcplayer.is_macosx') def test_not_osx_fix_vlc_22_plugin_path(self, mocked_is_macosx): From e2acc386b756a11629a144b9fa96d14c4957c3e3 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Wed, 8 May 2019 15:09:54 +0100 Subject: [PATCH 20/22] remove commented out code --- openlp/core/ui/media/vlcplayer.py | 42 ------------------------------- 1 file changed, 42 deletions(-) diff --git a/openlp/core/ui/media/vlcplayer.py b/openlp/core/ui/media/vlcplayer.py index 2a34b8b57..6ba27998b 100644 --- a/openlp/core/ui/media/vlcplayer.py +++ b/openlp/core/ui/media/vlcplayer.py @@ -78,48 +78,6 @@ def get_vlc(): return None else: return vlc - #is_vlc_available = False - # try: - # if is_macosx(): - # # Newer versions of VLC on OS X need this. See https://forum.videolan.org/viewtopic.php?t=124521 - # os.environ['VLC_PLUGIN_PATH'] = '/Applications/VLC.app/Contents/MacOS/plugins' - # # On Windows when frozen in PyInstaller, we need to blank SetDllDirectoryW to allow loading of the VLC dll. - # # This is due to limitations (by design) in PyInstaller. SetDllDirectoryW original value is restored once - # # VLC has been imported. - # if is_win(): - # buffer_size = 1024 - # dll_directory = ctypes.create_unicode_buffer(buffer_size) - # new_buffer_size = ctypes.windll.kernel32.GetDllDirectoryW(buffer_size, dll_directory) - # dll_directory = ''.join(dll_directory[:new_buffer_size]).replace('\0', '') - # log.debug('Original DllDirectory: %s' % dll_directory) - # ctypes.windll.kernel32.SetDllDirectoryW(None) - # from openlp.core.ui.media.vendor import vlc - # if is_win(): - # ctypes.windll.kernel32.SetDllDirectoryW(dll_directory) - # is_vlc_available = bool(vlc.get_default_instance()) - # except (ImportError, NameError, NotImplementedError): - # pass - # except OSError as e: - # # this will get raised the first time - # if is_win(): - # if not isinstance(e, WindowsError) and e.winerror != 126: - # raise - # else: - # pass - # if is_vlc_available: - # try: - # VERSION = vlc.libvlc_get_version().decode('UTF-8') - # except Exception: - # VERSION = '0.0.0' - # # LooseVersion does not work when a string contains letter and digits (e. g. 2.0.5 Twoflower). - # # http://bugs.python.org/issue14894 - # if LooseVersion(VERSION.split()[0]) < LooseVersion('1.1.0'): - # is_vlc_available = False - # log.debug('VLC could not be loaded, because the vlc version is too old: %s' % VERSION) - #if is_vlc_available: - # return vlc - #else: - # return None # On linux we need to initialise X threads, but not when running tests. From 0c14ddf31fb56a2a634316db4d1b16985ef647c2 Mon Sep 17 00:00:00 2001 From: Ken Roberts Date: Sat, 11 May 2019 02:07:40 -0700 Subject: [PATCH 21/22] PJLink2 Update v07 --- openlp/core/projectors/constants.py | 1 + openlp/core/projectors/pjlink.py | 1 + openlp/core/projectors/pjlinkcommands.py | 44 +- .../projectors/test_projector_commands_01.py | 2 +- .../projectors/test_projector_commands_02.py | 2 +- .../projectors/test_projector_commands_03.py | 475 +++++++----------- .../test_projector_pjlink_base_01.py | 2 +- .../test_projector_pjlink_base_02.py | 2 +- .../test_projector_pjlink_base_03.py | 130 +++++ 9 files changed, 345 insertions(+), 314 deletions(-) create mode 100644 tests/openlp_core/projectors/test_projector_pjlink_base_03.py diff --git a/openlp/core/projectors/constants.py b/openlp/core/projectors/constants.py index c60fc6473..5765c43f9 100644 --- a/openlp/core/projectors/constants.py +++ b/openlp/core/projectors/constants.py @@ -39,6 +39,7 @@ PJLINK_PREFIX = '%' PJLINK_PORT = 4352 PJLINK_SUFFIX = CR PJLINK_TIMEOUT = 30.0 +PJLINK_TOKEN_SIZE = 8 # PJLINK 1 : where is 8 characters # Error and status codes S_OK = E_OK = 0 # E_OK included since I sometimes forget diff --git a/openlp/core/projectors/pjlink.py b/openlp/core/projectors/pjlink.py index 9859b2825..5ca3d9ba3 100644 --- a/openlp/core/projectors/pjlink.py +++ b/openlp/core/projectors/pjlink.py @@ -281,6 +281,7 @@ class PJLink(QtNetwork.QTcpSocket): self.pjlink_class = copy(PJLINK_CLASS) self.pjlink_name = None # NAME self.power = S_OFF # POWR + self.projector_errors = {} # Full ERST errors self.serial_no = None # SNUM self.serial_no_received = None self.sw_version = None # SVER diff --git a/openlp/core/projectors/pjlinkcommands.py b/openlp/core/projectors/pjlinkcommands.py index 1a3b416d7..2f10c07ad 100644 --- a/openlp/core/projectors/pjlinkcommands.py +++ b/openlp/core/projectors/pjlinkcommands.py @@ -29,13 +29,13 @@ NOTE: PJLink Class (version) checks are handled in the respective PJLink/PJLinkU import logging import re +import string -from openlp.core.common.i18n import translate from openlp.core.common.settings import Settings from openlp.core.projectors.constants import E_AUTHENTICATION, PJLINK_DEFAULT_CODES, PJLINK_ERRORS, \ - PJLINK_ERST_DATA, PJLINK_ERST_STATUS, PJLINK_POWR_STATUS, S_AUTHENTICATE, S_CONNECT, S_DATA_OK, S_OFF, S_OK, S_ON, \ - S_STANDBY, STATUS_MSG + PJLINK_ERST_DATA, PJLINK_ERST_LIST, PJLINK_ERST_STATUS, PJLINK_POWR_STATUS, PJLINK_TOKEN_SIZE, \ + E_NO_AUTHENTICATION, S_AUTHENTICATE, S_CONNECT, S_DATA_OK, S_OFF, S_OK, S_ON, S_STANDBY, STATUS_MSG log = logging.getLogger(__name__) log.debug('Loading pjlinkcommands') @@ -195,8 +195,7 @@ def process_erst(projector, data): # Bad data - ignore log.warning('({ip}) Invalid error status response "{data}"'.format(ip=projector.entry.name, data=data)) return - datacheck = int(data) - if datacheck == 0: + if int(data) == 0: projector.projector_errors = None # No errors return @@ -209,23 +208,17 @@ def process_erst(projector, data): data[PJLINK_ERST_DATA['FILTER']], data[PJLINK_ERST_DATA['OTHER']]) if fan != PJLINK_ERST_STATUS[S_OK]: - projector.projector_errors[translate('OpenLP.ProjectorPJLink', 'Fan')] = \ - PJLINK_ERST_STATUS[fan] + projector.projector_errors[PJLINK_ERST_LIST['FAN']] = PJLINK_ERST_STATUS[fan] if lamp != PJLINK_ERST_STATUS[S_OK]: - projector.projector_errors[translate('OpenLP.ProjectorPJLink', 'Lamp')] = \ - PJLINK_ERST_STATUS[lamp] + projector.projector_errors[PJLINK_ERST_LIST['LAMP']] = PJLINK_ERST_STATUS[lamp] if temp != PJLINK_ERST_STATUS[S_OK]: - projector.projector_errors[translate('OpenLP.ProjectorPJLink', 'Temperature')] = \ - PJLINK_ERST_STATUS[temp] + projector.projector_errors[PJLINK_ERST_LIST['TEMP']] = PJLINK_ERST_STATUS[temp] if cover != PJLINK_ERST_STATUS[S_OK]: - projector.projector_errors[translate('OpenLP.ProjectorPJLink', 'Cover')] = \ - PJLINK_ERST_STATUS[cover] + projector.projector_errors[PJLINK_ERST_LIST['COVER']] = PJLINK_ERST_STATUS[cover] if filt != PJLINK_ERST_STATUS[S_OK]: - projector.projector_errors[translate('OpenLP.ProjectorPJLink', 'Filter')] = \ - PJLINK_ERST_STATUS[filt] + projector.projector_errors[PJLINK_ERST_LIST['FILTER']] = PJLINK_ERST_STATUS[filt] if other != PJLINK_ERST_STATUS[S_OK]: - projector.projector_errors[translate('OpenLP.ProjectorPJLink', 'Other')] = \ - PJLINK_ERST_STATUS[other] + projector.projector_errors[PJLINK_ERST_LIST['OTHER']] = PJLINK_ERST_STATUS[other] return @@ -389,20 +382,29 @@ def process_pjlink(projector, data): if len(chk) > 1: # Invalid data - there should be nothing after a normal authentication scheme log.error('({ip}) Normal connection with extra information - aborting'.format(ip=projector.entry.name)) - return E_AUTHENTICATION + return E_NO_AUTHENTICATION elif projector.pin: log.error('({ip}) Normal connection but PIN set - aborting'.format(ip=projector.entry.name)) - return E_AUTHENTICATION + return E_NO_AUTHENTICATION log.debug('({ip}) PJLINK: Returning S_CONNECT'.format(ip=projector.entry.name)) return S_CONNECT elif chk[0] == '1': if len(chk) < 2: # Not enough information for authenticated connection log.error('({ip}) Authenticated connection but not enough info - aborting'.format(ip=projector.entry.name)) - return E_AUTHENTICATION + return E_NO_AUTHENTICATION + elif len(chk[-1]) != PJLINK_TOKEN_SIZE: + # Bad token - incorrect size + log.error('({ip}) Authentication token invalid (size) - aborting'.format(ip=projector.entry.name)) + return E_NO_AUTHENTICATION + elif not all(c in string.hexdigits for c in chk[-1]): + # Bad token - not hexadecimal + log.error('({ip}) Authentication token invalid (not a hexadecimal number) ' + '- aborting'.format(ip=projector.entry.name)) + return E_NO_AUTHENTICATION elif not projector.pin: log.error('({ip}) Authenticate connection but no PIN - aborting'.format(ip=projector.entry.name)) - return E_AUTHENTICATION + return E_NO_AUTHENTICATION log.debug('({ip}) PJLINK: Returning S_AUTHENTICATE'.format(ip=projector.entry.name)) return S_AUTHENTICATE diff --git a/tests/openlp_core/projectors/test_projector_commands_01.py b/tests/openlp_core/projectors/test_projector_commands_01.py index 07e283031..207ab92f9 100644 --- a/tests/openlp_core/projectors/test_projector_commands_01.py +++ b/tests/openlp_core/projectors/test_projector_commands_01.py @@ -35,7 +35,7 @@ from tests.resources.projector.data import TEST1_DATA class TestPJLinkCommands(TestCase): """ - Tests PJLink get status commands part 1 + Tests PJLink commands part 1 """ def setUp(self): """ diff --git a/tests/openlp_core/projectors/test_projector_commands_02.py b/tests/openlp_core/projectors/test_projector_commands_02.py index e112c27c9..54306c0fe 100644 --- a/tests/openlp_core/projectors/test_projector_commands_02.py +++ b/tests/openlp_core/projectors/test_projector_commands_02.py @@ -35,7 +35,7 @@ from tests.resources.projector.data import TEST1_DATA class TestPJLinkCommands(TestCase): """ - Tests PJLink get status commands part 2 + Tests PJLink commands part 2 """ def setUp(self): """ diff --git a/tests/openlp_core/projectors/test_projector_commands_03.py b/tests/openlp_core/projectors/test_projector_commands_03.py index 0c63ffb2c..b782d205e 100644 --- a/tests/openlp_core/projectors/test_projector_commands_03.py +++ b/tests/openlp_core/projectors/test_projector_commands_03.py @@ -22,335 +22,232 @@ """ Package to test the openlp.core.projectors.pjlink commands package. """ -from unittest import TestCase, skip +from unittest import TestCase from unittest.mock import call, patch import openlp.core.projectors.pjlink -from openlp.core.projectors.constants import PJLINK_PORT, S_CONNECTED, S_OFF, S_ON +from openlp.core.projectors.constants import E_NO_AUTHENTICATION, STATUS_CODE, S_AUTHENTICATE, S_CONNECT from openlp.core.projectors.db import Projector -from openlp.core.projectors.pjlink import PJLink, PJLinkUDP -from tests.resources.projector.data import TEST1_DATA, TEST2_DATA, TEST_HASH, TEST_PIN, TEST_SALT +from openlp.core.projectors.pjlink import PJLink +from openlp.core.projectors.pjlinkcommands import process_command +from tests.resources.projector.data import TEST1_DATA, TEST_PIN, TEST_SALT class TestPJLinkCommands(TestCase): """ - Tests for the PJLinkCommands class part 2 + Tests PJLink commands part 3 """ - @skip('Needs update to new setup') - def test_projector_reset_information(self): + def setUp(self): """ - Test reset_information() resets all information and stops timers + Initialize test state(s) """ - # GIVEN: Test object - with patch.object(openlp.core.projectors.pjlink, 'log') as mock_log: - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - log_debug_calls = [call('({ip}): Calling poll_timer.stop()'.format(ip=pjlink.name)), - call('({ip}): Calling socket_timer.stop()'.format(ip=pjlink.name))] - # timer and socket_timer not available until instantiation, so mock here - with patch.object(pjlink, 'socket_timer') as mock_socket_timer, \ - patch.object(pjlink, 'poll_timer') as mock_timer: + # Default PJLink instance for tests + self.pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.power = S_ON - pjlink.pjlink_name = 'OPENLPTEST' - pjlink.manufacturer = 'PJLINK' - pjlink.model = '1' - pjlink.shutter = True - pjlink.mute = True - pjlink.lamp = True - pjlink.fan = True - pjlink.source_available = True - pjlink.other_info = 'ANOTHER TEST' - pjlink.send_queue = True - pjlink.send_busy = True - - # WHEN: reset_information() is called - pjlink.reset_information() - - # THEN: All information should be reset and timers stopped - assert pjlink.power == S_OFF, 'Projector power should be OFF' - assert pjlink.pjlink_name is None, 'Projector pjlink_name should be None' - assert pjlink.manufacturer is None, 'Projector manufacturer should be None' - assert pjlink.model is None, 'Projector model should be None' - assert pjlink.shutter is None, 'Projector shutter should be None' - assert pjlink.mute is None, 'Projector shuttter should be None' - assert pjlink.lamp is None, 'Projector lamp should be None' - assert pjlink.fan is None, 'Projector fan should be None' - assert pjlink.source_available is None, 'Projector source_available should be None' - assert pjlink.source is None, 'Projector source should be None' - assert pjlink.other_info is None, 'Projector other_info should be None' - assert pjlink.send_queue == [], 'Projector send_queue should be an empty list' - assert pjlink.send_busy is False, 'Projector send_busy should be False' - assert mock_timer.stop.called is True, 'Projector timer.stop() should have been called' - assert mock_socket_timer.stop.called is True, 'Projector socket_timer.stop() should have been called' - mock_log.debug.assert_has_calls(log_debug_calls) - - @skip('Needs update to new setup') - def test_process_pjlink_normal(self): + def tearDown(self): """ - Test initial connection prompt with no authentication + Cleanup test state(s) """ - # GIVEN: Initial mocks and data - mock_log = patch.object(openlp.core.projectors.pjlink, "log").start() - mock_disconnect_from_host = patch('openlp.core.projectors.pjlink.PJLink.disconnect_from_host').start() - mock_send_command = patch('openlp.core.projectors.pjlink.PJLink.send_command').start() - mock_readyRead = patch('openlp.core.projectors.pjlink.PJLink.readyRead').start() - mock_change_status = patch('openlp.core.projectors.pjlink.PJLink.change_status').start() + del(self.pjlink) - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.pin = None - log_check = [call('({ip}) process_pjlink(): Sending "CLSS" initial command'.format(ip=pjlink.name)), ] - - # WHEN: process_pjlink called with no authentication required - pjlink.process_pjlink(data="0") - - # THEN: proper processing should have occured - mock_log.debug.has_calls(log_check) - mock_disconnect_from_host.assert_not_called() - assert 1 == mock_readyRead.connect.call_count, 'Should have only been called once' - mock_change_status.assert_called_once_with(S_CONNECTED) - mock_send_command.assert_called_with(cmd='CLSS', priority=True, salt=None) - - @skip('Needs update to new setup') - def test_process_pjlink_authenticate(self): + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_process_pjlink_authenticate(self, mock_log): """ Test initial connection prompt with authentication """ # GIVEN: Initial mocks and data - mock_log = patch.object(openlp.core.projectors.pjlink, "log").start() - mock_disconnect_from_host = patch('openlp.core.projectors.pjlink.PJLink.disconnect_from_host').start() - mock_send_command = patch('openlp.core.projectors.pjlink.PJLink.send_command').start() - mock_readyRead = patch('openlp.core.projectors.pjlink.PJLink.readyRead').start() - mock_change_status = patch('openlp.core.projectors.pjlink.PJLink.change_status').start() + log_error_calls = [] + log_warning_calls = [] + log_debug_calls = [call('({ip}) Processing command "PJLINK" with data "1 {data}"'.format(ip=self.pjlink.name, + data=TEST_SALT)), + call('({ip}) Calling function for PJLINK'.format(ip=self.pjlink.name)), + call('({ip}) Processing PJLINK command'.format(ip=self.pjlink.name)), + call('({ip}) PJLINK: Returning {data}'.format(ip=self.pjlink.name, + data=STATUS_CODE[S_AUTHENTICATE]))] - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.pin = TEST_PIN - log_check = [call('({ip}) process_pjlink(): Sending "CLSS" initial command'.format(ip=pjlink.name)), ] + self.pjlink.pin = TEST_PIN # WHEN: process_pjlink called with no authentication required - pjlink.process_pjlink(data='1 {salt}'.format(salt=TEST_SALT)) + chk = process_command(projector=self.pjlink, cmd='PJLINK', data='1 {salt}'.format(salt=TEST_SALT)) # THEN: proper processing should have occured - mock_log.debug.has_calls(log_check) - mock_disconnect_from_host.assert_not_called() - assert 1 == mock_readyRead.connect.call_count, 'Should have only been called once' - mock_change_status.assert_called_once_with(S_CONNECTED) - mock_send_command.assert_called_with(cmd='CLSS', priority=True, salt=TEST_HASH) + mock_log.error.assert_has_calls(log_error_calls) + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + assert (chk == S_AUTHENTICATE), 'Should have returned {data}'.format(data=STATUS_CODE[S_AUTHENTICATE]) - @skip('Needs update to new setup') - def test_process_pjlink_normal_pin_set_error(self): + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_process_pjlink_authenticate_pin_not_set_error(self, mock_log): + """ + Test initial connection prompt with authentication and no pin set + """ + # GIVEN: Initial mocks and data + log_error_calls = [call('({ip}) Authenticate connection but no PIN - aborting'.format(ip=self.pjlink.name))] + log_warning_calls = [] + log_debug_calls = [call('({ip}) Processing command "PJLINK" with data "1 {data}"'.format(ip=self.pjlink.name, + data=TEST_SALT)), + call('({ip}) Calling function for PJLINK'.format(ip=self.pjlink.name)), + call('({ip}) Processing PJLINK command'.format(ip=self.pjlink.name))] + + self.pjlink.pin = None + + # WHEN: process_pjlink called with no authentication required + chk = process_command(projector=self.pjlink, cmd='PJLINK', data='1 {salt}'.format(salt=TEST_SALT)) + + # THEN: proper processing should have occured + mock_log.error.assert_has_calls(log_error_calls) + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + assert (chk == E_NO_AUTHENTICATION), \ + 'Should have returned {data}'.format(data=STATUS_CODE[E_NO_AUTHENTICATION]) + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_process_pjlink_authenticate_token_invalid(self, mock_log): + """ + Test initial connection prompt with authentication and bad token + """ + # GIVEN: Initial mocks and data + bad_token = 'abcdefgh' + log_error_calls = [call('({ip}) Authentication token invalid (not a hexadecimal number) - ' + 'aborting'.format(ip=self.pjlink.name))] + log_warning_calls = [] + log_debug_calls = [call('({ip}) Processing command "PJLINK" with data ' + '"1 {data}"'.format(ip=self.pjlink.name, data=bad_token)), + call('({ip}) Calling function for PJLINK'.format(ip=self.pjlink.name)), + call('({ip}) Processing PJLINK command'.format(ip=self.pjlink.name))] + self.pjlink.pin = TEST_SALT + + # WHEN: process_pjlink called with bad token + chk = process_command(projector=self.pjlink, cmd='PJLINK', data='1 {data}'.format(data=bad_token)) + + # THEN: proper processing should have occured + mock_log.error.assert_has_calls(log_error_calls) + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + assert (chk == E_NO_AUTHENTICATION), \ + 'Should have returned {data}'.format(data=STATUS_CODE[E_NO_AUTHENTICATION]) + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_process_pjlink_authenticate_token_length(self, mock_log): + """ + Test initial connection prompt with authentication and bad token + """ + # GIVEN: Initial mocks and data + bad_token = '1234abcde' # Length should be 8, this is 9 + log_error_calls = [call('({ip}) Authentication token invalid (size) - ' + 'aborting'.format(ip=self.pjlink.name))] + log_warning_calls = [] + log_debug_calls = [call('({ip}) Processing command "PJLINK" with data ' + '"1 {data}"'.format(ip=self.pjlink.name, data=bad_token)), + call('({ip}) Calling function for PJLINK'.format(ip=self.pjlink.name)), + call('({ip}) Processing PJLINK command'.format(ip=self.pjlink.name))] + self.pjlink.pin = TEST_SALT + + # WHEN: process_pjlink called with bad token + chk = process_command(projector=self.pjlink, cmd='PJLINK', data='1 {data}'.format(data=bad_token)) + + # THEN: proper processing should have occured + mock_log.error.assert_has_calls(log_error_calls) + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + assert (chk == E_NO_AUTHENTICATION), \ + 'Should have returned {data}'.format(data=STATUS_CODE[E_NO_AUTHENTICATION]) + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_process_pjlink_authenticate_token_missing(self, mock_log): + """ + Test initial connection prompt with authentication and missing token + """ + # GIVEN: Initial mocks and data + log_error_calls = [call('({ip}) Authenticated connection but not enough info - ' + 'aborting'.format(ip=self.pjlink.name))] + log_warning_calls = [] + log_debug_calls = [call('({ip}) Processing command "PJLINK" with data "1"'.format(ip=self.pjlink.name)), + call('({ip}) Calling function for PJLINK'.format(ip=self.pjlink.name)), + call('({ip}) Processing PJLINK command'.format(ip=self.pjlink.name))] + + self.pjlink.pin = TEST_SALT + + # WHEN: process_pjlink called with bad token + chk = process_command(projector=self.pjlink, cmd='PJLINK', data='1') + + # THEN: proper processing should have occured + mock_log.error.assert_has_calls(log_error_calls) + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + assert (chk == E_NO_AUTHENTICATION), \ + 'Should have returned {data}'.format(data=STATUS_CODE[E_NO_AUTHENTICATION]) + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_process_pjlink_normal(self, mock_log): + """ + Test processing PJLINK initial prompt + """ + # GIVEN: Mocks and data + log_error_calls = [] + log_warning_calls = [] + log_debug_calls = [call('({ip}) Processing command "PJLINK" with data "0"'.format(ip=self.pjlink.name)), + call('({ip}) Calling function for PJLINK'.format(ip=self.pjlink.name)), + call('({ip}) Processing PJLINK command'.format(ip=self.pjlink.name)), + call('({ip}) PJLINK: Returning {data}'.format(ip=self.pjlink.name, + data=STATUS_CODE[S_CONNECT]))] + + self.pjlink.pin = None + + # WHEN: process_pjlink called with no authentication required + chk = process_command(projector=self.pjlink, cmd='PJLINK', data="0") + + # THEN: proper processing should have occured + mock_log.error.assert_has_calls(log_error_calls) + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + assert (chk == S_CONNECT), 'Should have returned {data}'.format(data=STATUS_CODE[S_CONNECT]) + + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_process_pjlink_normal_pin_set_error(self, mock_log): """ Test process_pjlinnk called with no authentication but pin is set """ # GIVEN: Initial mocks and data - mock_log = patch.object(openlp.core.projectors.pjlink, 'log').start() - mock_disconnect_from_host = patch('openlp.core.projectors.pjlink.PJLink.disconnect_from_host').start() - mock_send_command = patch('openlp.core.projectors.pjlink.PJLink.send_command').start() - - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.pin = TEST_PIN - log_check = [call('({ip}) Normal connection but PIN set - aborting'.format(ip=pjlink.name)), ] + log_error_calls = [call('({ip}) Normal connection but PIN set - ' + 'aborting'.format(ip=self.pjlink.name))] + log_warning_calls = [] + log_debug_calls = [call('({ip}) Processing command "PJLINK" with data "0"'.format(ip=self.pjlink.name)), + call('({ip}) Calling function for PJLINK'.format(ip=self.pjlink.name)), + call('({ip}) Processing PJLINK command'.format(ip=self.pjlink.name))] + self.pjlink.pin = TEST_PIN # WHEN: process_pjlink called with invalid authentication scheme - pjlink.process_pjlink(data='0') + chk = process_command(projector=self.pjlink, cmd='PJLINK', data='0') # THEN: Proper calls should be made - mock_log.error.assert_has_calls(log_check) - assert 1 == mock_disconnect_from_host.call_count, 'Should have only been called once' - mock_send_command.assert_not_called() + mock_log.error.assert_has_calls(log_error_calls) + mock_log.warning.assert_has_calls(log_warning_calls) + mock_log.debug.assert_has_calls(log_debug_calls) + assert (chk == E_NO_AUTHENTICATION), \ + 'Should have returned {data}'.format(data=STATUS_CODE[E_NO_AUTHENTICATION]) - @skip('Needs update to new setup') - def test_process_pjlink_normal_with_salt_error(self): + @patch.object(openlp.core.projectors.pjlinkcommands, 'log') + def test_process_pjlink_normal_with_token(self, mock_log): """ Test process_pjlinnk called with no authentication but pin is set """ # GIVEN: Initial mocks and data - mock_log = patch.object(openlp.core.projectors.pjlink, 'log').start() - mock_disconnect_from_host = patch('openlp.core.projectors.pjlink.PJLink.disconnect_from_host').start() - mock_send_command = patch('openlp.core.projectors.pjlink.PJLink.send_command').start() - - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.pin = TEST_PIN - log_check = [call('({ip}) Normal connection with extra information - aborting'.format(ip=pjlink.name)), ] + log_error_calls = [call('({ip}) Normal connection with extra information - ' + 'aborting'.format(ip=self.pjlink.name))] + log_warning_calls = [] + log_debug_calls = [call('({ip}) Processing command "PJLINK" with data ' + '"0 {data}"'.format(ip=self.pjlink.name, data=TEST_SALT)), + call('({ip}) Calling function for PJLINK'.format(ip=self.pjlink.name)), + call('({ip}) Processing PJLINK command'.format(ip=self.pjlink.name))] + self.pjlink.pin = TEST_PIN # WHEN: process_pjlink called with invalid authentication scheme - pjlink.process_pjlink(data='0 {salt}'.format(salt=TEST_SALT)) + chk = process_command(projector=self.pjlink, cmd='PJLINK', data='0 {data}'.format(data=TEST_SALT)) # THEN: Proper calls should be made - mock_log.error.assert_has_calls(log_check) - assert 1 == mock_disconnect_from_host.call_count, 'Should have only been called once' - mock_send_command.assert_not_called() - - @skip('Needs update to new setup') - def test_process_pjlink_invalid_authentication_scheme_length_error(self): - """ - Test initial connection prompt with authentication scheme longer than 1 character - """ - # GIVEN: Initial mocks and data - mock_log = patch.object(openlp.core.projectors.pjlink, 'log').start() - mock_disconnect_from_host = patch('openlp.core.projectors.pjlink.PJLink.disconnect_from_host').start() - mock_send_command = patch('openlp.core.projectors.pjlink.PJLink.send_command').start() - - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - log_check = [call('({ip}) Invalid initial authentication scheme - aborting'.format(ip=pjlink.name)), ] - - # WHEN: process_pjlink called with invalid authentication scheme - pjlink.process_pjlink(data='01') - - # THEN: socket should be closed and invalid data logged - mock_log.error.assert_has_calls(log_check) - assert 1 == mock_disconnect_from_host.call_count, 'Should have only been called once' - mock_send_command.assert_not_called() - - @skip('Needs update to new setup') - def test_process_pjlink_invalid_authentication_data_length_error(self): - """ - Test initial connection prompt with authentication no salt - """ - # GIVEN: Initial mocks and data - mock_log = patch.object(openlp.core.projectors.pjlink, 'log').start() - mock_disconnect_from_host = patch('openlp.core.projectors.pjlink.PJLink.disconnect_from_host').start() - mock_send_command = patch('openlp.core.projectors.pjlink.PJLink.send_command').start() - - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - log_check = [call('({ip}) Authenticated connection but not enough info - aborting'.format(ip=pjlink.name)), ] - - # WHEN: process_pjlink called with no salt - pjlink.process_pjlink(data='1') - - # THEN: socket should be closed and invalid data logged - mock_log.error.assert_has_calls(log_check) - assert 1 == mock_disconnect_from_host.call_count, 'Should have only been called once' - mock_send_command.assert_not_called() - - @skip('Needs update to new setup') - def test_process_pjlink_authenticate_pin_not_set_error(self): - """ - Test process_pjlink authentication but pin not set - """ - # GIVEN: Initial mocks and data - mock_log = patch.object(openlp.core.projectors.pjlink, 'log').start() - mock_disconnect_from_host = patch('openlp.core.projectors.pjlink.PJLink.disconnect_from_host').start() - mock_send_command = patch('openlp.core.projectors.pjlink.PJLink.send_command').start() - - pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) - pjlink.pin = None - log_check = [call('({ip}) Authenticate connection but no PIN - aborting'.format(ip=pjlink.name)), ] - - # WHEN: process_pjlink called with no salt - pjlink.process_pjlink(data='1 {salt}'.format(salt=TEST_SALT)) - - # THEN: socket should be closed and invalid data logged - mock_log.error.assert_has_calls(log_check) - assert 1 == mock_disconnect_from_host.call_count, 'Should have only been called once' - mock_send_command.assert_not_called() - - @skip('Change to pjlink_udp.get_datagram() call') - @patch.object(openlp.core.projectors.pjlink, 'log') - def test_process_ackn_duplicate(self, mock_log): - """ - Test process_ackn method with multiple calls with same data - """ - # TODO: Change this to call pjlink_udp.get_datagram() so ACKN can be processed properly - - # GIVEN: Test setup - pjlink = PJLink(projector=self.test_list[0]) - check_list = {TEST1_DATA['ip']: {'data': TEST1_DATA['mac_adx'], 'port': PJLINK_PORT}} - log_warn_calls = [call('(___TEST_ONE___) Host {host} already replied - ' - 'ignoring'.format(host=TEST1_DATA['ip']))] - log_debug_calls = [call('PJlinkCommands(args=() kwargs={})'), - call('(___TEST_ONE___) reset_information() connect status is S_NOT_CONNECTED'), - call('(___TEST_ONE___) Processing ACKN packet'), - call('(___TEST_ONE___) Adding {host} to ACKN list'.format(host=TEST1_DATA['ip'])), - call('(___TEST_ONE___) Processing ACKN packet')] - - # WHEN: process_ackn called twice with same data - pjlink.process_ackn(data=TEST1_DATA['mac_adx'], host=TEST1_DATA['ip'], port=PJLINK_PORT) - pjlink.process_ackn(data=TEST1_DATA['mac_adx'], host=TEST1_DATA['ip'], port=PJLINK_PORT) - - # THEN: pjlink_udp.ack_list should equal test_list - # NOTE: This assert only returns AssertionError - does not list differences. Maybe add a compare function? - if pjlink.ackn_list != check_list: - # Check this way so we can print differences to stdout - print('\nackn_list: ', pjlink.ackn_list) - print('test_list: ', check_list, '\n') - assert pjlink.ackn_list == check_list - mock_log.debug.assert_has_calls(log_debug_calls) - mock_log.warning.assert_has_calls(log_warn_calls) - - @skip('Change to pjlink_udp.get_datagram() call') - @patch.object(openlp.core.projectors.pjlink, 'log') - def test_process_ackn_multiple(self, mock_log): - """ - Test process_ackn method with multiple calls - """ - # TODO: Change this to call pjlink_udp.get_datagram() so ACKN can be processed properly - - # GIVEN: Test setup - pjlink_udp = PJLinkUDP(projector_list=self.test_list) - check_list = {TEST1_DATA['ip']: {'data': TEST1_DATA['mac_adx'], 'port': PJLINK_PORT}, - TEST2_DATA['ip']: {'data': TEST2_DATA['mac_adx'], 'port': PJLINK_PORT}} - log_debug_calls = [call('(UDP) PJLinkUDP() Initialized'), - call('(UDP) Processing ACKN packet'), - call('(UDP) Adding {host} to ACKN list'.format(host=TEST1_DATA['ip'])), - call('(UDP) Processing ACKN packet'), - call('(UDP) Adding {host} to ACKN list'.format(host=TEST2_DATA['ip']))] - - # WHEN: process_ackn called twice with different data - pjlink_udp.process_ackn(data=TEST1_DATA['mac_adx'], host=TEST1_DATA['ip'], port=PJLINK_PORT) - pjlink_udp.process_ackn(data=TEST2_DATA['mac_adx'], host=TEST2_DATA['ip'], port=PJLINK_PORT) - - # THEN: pjlink_udp.ack_list should equal test_list - # NOTE: This assert only returns AssertionError - does not list differences. Maybe add a compare function? - if pjlink_udp.ackn_list != check_list: - # Check this way so we can print differences to stdout - print('\nackn_list: ', pjlink_udp.ackn_list) - print('test_list: ', check_list) - assert pjlink_udp.ackn_list == check_list - mock_log.debug.assert_has_calls(log_debug_calls) - - @skip('Change to pjlink_udp.get_datagram() call') - @patch.object(openlp.core.projectors.pjlink, 'log') - def test_process_ackn_single(self, mock_log): - """ - Test process_ackn method with single call - """ - # TODO: Change this to call pjlink_udp.get_datagram() so ACKN can be processed properly - - # GIVEN: Test setup - pjlink_udp = PJLinkUDP(projector_list=self.test_list) - check_list = {TEST1_DATA['ip']: {'data': TEST1_DATA['mac_adx'], 'port': PJLINK_PORT}} - log_debug_calls = [call('(UDP) PJLinkUDP() Initialized'), - call('(UDP) Processing ACKN packet'), - call('(UDP) Adding {host} to ACKN list'.format(host=TEST1_DATA['ip']))] - - # WHEN: process_ackn called twice with different data - pjlink_udp.process_ackn(data=TEST1_DATA['mac_adx'], host=TEST1_DATA['ip'], port=PJLINK_PORT) - - # THEN: pjlink_udp.ack_list should equal test_list - # NOTE: This assert only returns AssertionError - does not list differences. Maybe add a compare function? - if pjlink_udp.ackn_list != check_list: - # Check this way so we can print differences to stdout - print('\nackn_list: ', pjlink_udp.ackn_list) - print('test_list: ', check_list) - assert pjlink_udp.ackn_list == check_list - mock_log.debug.assert_has_calls(log_debug_calls) - - @skip('Change to pjlink_udp.get_datagram() call') - @patch.object(openlp.core.projectors.pjlink, 'log') - def test_process_srch(self, mock_log): - """ - Test process_srch method - """ - # TODO: Change this to call pjlink_udp.get_datagram() so ACKN can be processed properly - - # GIVEN: Test setup - log_warn_calls = [call('(UDP) SRCH packet received from {ip} - ignoring'.format(ip=TEST1_DATA['ip'])), ] - log_debug_calls = [call('(UDP) PJLinkUDP() Initialized'), ] - pjlink_udp = PJLinkUDP(projector_list=self.test_list) - - # WHEN: process_srch called - pjlink_udp.process_srch(data=None, host=TEST1_DATA['ip'], port=PJLINK_PORT) - - # THEN: log entries should be entered - mock_log.warning.assert_has_calls(log_warn_calls) + mock_log.error.assert_has_calls(log_error_calls) + mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) + assert (chk == E_NO_AUTHENTICATION), \ + 'Should have returned {data}'.format(data=STATUS_CODE[E_NO_AUTHENTICATION]) diff --git a/tests/openlp_core/projectors/test_projector_pjlink_base_01.py b/tests/openlp_core/projectors/test_projector_pjlink_base_01.py index b44d2eca3..b32437e46 100644 --- a/tests/openlp_core/projectors/test_projector_pjlink_base_01.py +++ b/tests/openlp_core/projectors/test_projector_pjlink_base_01.py @@ -20,7 +20,7 @@ # along with this program. If not, see . # ########################################################################## """ -Package to test the openlp.core.projectors.pjlink base package. +Package to test the openlp.core.projectors.pjlink base package part 1. """ from unittest import TestCase from unittest.mock import MagicMock, call, patch diff --git a/tests/openlp_core/projectors/test_projector_pjlink_base_02.py b/tests/openlp_core/projectors/test_projector_pjlink_base_02.py index c45f230a2..86a4fd400 100644 --- a/tests/openlp_core/projectors/test_projector_pjlink_base_02.py +++ b/tests/openlp_core/projectors/test_projector_pjlink_base_02.py @@ -20,7 +20,7 @@ # along with this program. If not, see . # ########################################################################## """ -Package to test the openlp.core.projectors.pjlink base package. +Package to test the openlp.core.projectors.pjlink base package part 2. """ from unittest import TestCase from unittest.mock import call, patch diff --git a/tests/openlp_core/projectors/test_projector_pjlink_base_03.py b/tests/openlp_core/projectors/test_projector_pjlink_base_03.py new file mode 100644 index 000000000..bba030262 --- /dev/null +++ b/tests/openlp_core/projectors/test_projector_pjlink_base_03.py @@ -0,0 +1,130 @@ +# -*- coding: utf-8 -*- +# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 + +########################################################################## +# OpenLP - Open Source Lyrics Projection # +# ---------------------------------------------------------------------- # +# Copyright (c) 2008-2019 OpenLP Developers # +# ---------------------------------------------------------------------- # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +########################################################################## +""" +Package to test the openlp.core.projectors.pjlink base package part 3. +""" +from unittest import TestCase +from unittest.mock import call, patch + +import openlp.core.projectors.pjlink +from openlp.core.projectors.constants import PJLINK_CLASS, STATUS_CODE, \ + S_NOT_CONNECTED, S_OFF, S_ON, QSOCKET_STATE +from openlp.core.projectors.db import Projector +from openlp.core.projectors.pjlink import PJLink +from tests.resources.projector.data import TEST1_DATA + + +class TestPJLinkBase(TestCase): + """ + Tests for the PJLink module + """ + def setUp(self): + """ + Initialize test state(s) + """ + # Default PJLink instance for tests + self.pjlink = PJLink(Projector(**TEST1_DATA), no_poll=True) + + def tearDown(self): + """ + Cleanup test state(s) + """ + del(self.pjlink) + + @patch.object(openlp.core.projectors.pjlink, 'log') + def test_projector_reset_information(self, mock_log): + """ + Test reset_information() resets all information and stops timers + """ + # GIVEN: Test object + log_debug_calls = [call('({ip}) reset_information() connect status is ' + 'S_NOT_CONNECTED'.format(ip=self.pjlink.name)), + call('({ip}): Calling poll_timer.stop()'.format(ip=self.pjlink.name)), + call('({ip}): Calling socket_timer.stop()'.format(ip=self.pjlink.name)), + call('({ip}): Calling status_timer.stop()'.format(ip=self.pjlink.name))] + + # Attributes not available until instantiation, so mock here + with patch.object(self.pjlink, 'socket_timer') as mock_socket_timer, \ + patch.object(self.pjlink, 'status_timer') as mock_status_timer, \ + patch.object(self.pjlink, 'poll_timer') as mock_poll_timer, \ + patch.object(self.pjlink, 'state') as mock_state: + mock_state.return_value = QSOCKET_STATE[S_NOT_CONNECTED] + # Set attributes to something other than None or {} or [] + self.pjlink.fan = True + self.pjlink.filter_time = True + self.pjlink.lamp = True + self.pjlink.mac_adx_received = 'Some random MAC' + self.pjlink.manufacturer = 'PJLINK' + self.pjlink.model = '1' + self.pjlink.model_filter = 'Filter' + self.pjlink.model_lamp = 'Lamp' + self.pjlink.mute = True + self.pjlink.other_info = 'Another Test' + self.pjlink.pjlink_class = 2 + self.pjlink.pjlink_name = 'OPENLPTEST' + self.pjlink.power = S_ON + self.pjlink.projector_errors = {'test1': True, 'test2': False} + self.pjlink.serial_no = 'Some Number' + self.pjlink.serial_no_received = 'Some Other Number' + self.pjlink.sw_version = 'Some Version' + self.pjlink.sw_version_received = 'Some Other Version' + self.pjlink.shutter = True + self.pjlink.source_available = True + self.pjlink.source = True + self.pjlink.status_timer_checks = {'test1': object(), 'test2': object()} + self.pjlink.send_busy = False + self.pjlink.send_queue = ['test1', 'test2'] + self.pjlink.priority_queue = ['test1', 'test2'] + + # WHEN: reset_information() is called + self.pjlink.reset_information() + + # THEN: All information should be reset and timers stopped + mock_log.debug.assert_has_calls(log_debug_calls) + assert self.pjlink.fan is None, 'fan should be None' + assert self.pjlink.filter_time is None, 'filter_time should be None' + assert self.pjlink.lamp is None, 'lamp should be None' + assert self.pjlink.mac_adx_received is None, 'mac_adx_received should be None' + assert self.pjlink.manufacturer is None, 'manufacturer should be None' + assert self.pjlink.model is None, 'model should be None' + assert self.pjlink.model_filter is None, 'model_filter should be None' + assert self.pjlink.model_lamp is None, 'model_lamp should be None' + assert not self.pjlink.mute, 'mute should be False' + assert self.pjlink.other_info is None, 'other should be None' + assert self.pjlink.pjlink_class == PJLINK_CLASS, 'pjlink_class should be {cls}'.format(cls=PJLINK_CLASS) + assert self.pjlink.pjlink_name is None, 'pjlink_name should be None' + assert self.pjlink.power == S_OFF, 'power should be {data}'.format(data=STATUS_CODE[S_OFF]) + assert self.pjlink.projector_errors == {}, 'projector_errors should be an empty dict' + assert self.pjlink.serial_no is None, 'serial_no should be None' + assert self.pjlink.serial_no_received is None, 'serial_no_received should be None' + assert self.pjlink.sw_version is None, 'sw_version should be None' + assert self.pjlink.sw_version_received is None, 'sw_version_received should be None' + assert not self.pjlink.shutter, 'shutter should be False' + assert self.pjlink.source_available is None, 'source_available should be None' + assert self.pjlink.source is None, 'source should be None' + assert self.pjlink.status_timer_checks == {}, 'status_timer_checks should be an empty dict' + assert not self.pjlink.send_busy, 'send_busy should be False' + assert self.pjlink.send_queue == [], 'send_queue should be an empty list' + assert self.pjlink.priority_queue == [], 'priority_queue should be an empty list' + assert mock_socket_timer.stop.called, 'socket_timer.stop() should have been called' + assert mock_status_timer.stop.called, 'status_timer.stop() should have been called' + assert mock_poll_timer.stop.called, 'poll_timer.stop() should have been called' From 2069c94a109583e1b0ec1f94a70f2661e11d5ba6 Mon Sep 17 00:00:00 2001 From: Ken Roberts Date: Wed, 15 May 2019 06:23:58 -0700 Subject: [PATCH 22/22] Remove extraneous parens --- .../projectors/test_projector_commands_01.py | 44 ++++----- .../projectors/test_projector_commands_02.py | 64 ++++++------ .../projectors/test_projector_commands_03.py | 16 +-- .../test_projector_pjlink_base_02.py | 98 +++++++++---------- 4 files changed, 111 insertions(+), 111 deletions(-) diff --git a/tests/openlp_core/projectors/test_projector_commands_01.py b/tests/openlp_core/projectors/test_projector_commands_01.py index 207ab92f9..deaba7619 100644 --- a/tests/openlp_core/projectors/test_projector_commands_01.py +++ b/tests/openlp_core/projectors/test_projector_commands_01.py @@ -92,7 +92,7 @@ class TestPJLinkCommands(TestCase): # THEN: Shutter should be closed and mute should be True assert self.pjlink.shutter, 'Shutter should changed' assert self.pjlink.mute, 'Audio should not have changed' - assert (not mock_UpdateIcons.emit.called), 'Update icons should NOT have been called' + assert not mock_UpdateIcons.emit.called, 'Update icons should NOT have been called' mock_log.warning.assert_has_calls(log_warning_text) mock_log.debug.assert_has_calls(log_debug_text) @@ -140,8 +140,8 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='AVMT', data='30') # THEN: Shutter should be closed and mute should be True - assert (not self.pjlink.shutter), 'Shutter should have been set to off' - assert (not self.pjlink.mute), 'Audio should be on' + assert not self.pjlink.shutter, 'Shutter should have been set to off' + assert not self.pjlink.mute, 'Audio should be on' assert mock_UpdateIcons.emit.called, 'Update icons should have been called' mock_log.warning.assert_has_calls(log_warning_text) mock_log.debug.assert_has_calls(log_debug_text) @@ -193,7 +193,7 @@ class TestPJLinkCommands(TestCase): assert self.pjlink.shutter, 'Shutter should have been set to closed' assert self.pjlink.mute, 'Audio should not have changed' assert mock_UpdateIcons.emit.called, 'Update icons should have been called' - assert ('AVMT' not in self.pjlink.status_timer_checks), 'Status timer list should not have AVMT callback' + assert 'AVMT' not in self.pjlink.status_timer_checks, 'Status timer list should not have AVMT callback' assert mock_status_timer.stop.called, 'Projector status_timer.stop() should have been called' mock_log.warning.assert_has_calls(log_warning_text) mock_log.debug.assert_has_calls(log_debug_text) @@ -214,7 +214,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='CLSS', data='1') # THEN: Projector class should be set with proper value - assert ('1' == self.pjlink.pjlink_class), 'Should have set class=1' + assert '1' == self.pjlink.pjlink_class, 'Should have set class=1' mock_log.error.assert_has_calls(log_error_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -235,7 +235,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='CLSS', data='2') # THEN: Projector class should be set with proper value - assert ('2' == self.pjlink.pjlink_class), 'Should have set class=2' + assert '2' == self.pjlink.pjlink_class, 'Should have set class=2' mock_log.error.assert_has_calls(log_error_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -256,7 +256,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='CLSS', data='Z') # THEN: Projector class should be set with default value - assert (self.pjlink.pjlink_class == '1'), 'Invalid NaN class reply should have set class=1' + assert self.pjlink.pjlink_class == '1', 'Invalid NaN class reply should have set class=1' mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -276,7 +276,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='CLSS', data='Invalid') # THEN: Projector class should be set with default value - assert (self.pjlink.pjlink_class == '1'), 'Invalid class reply should have set class=1' + assert self.pjlink.pjlink_class == '1', 'Invalid class reply should have set class=1' mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -296,7 +296,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='CLSS', data='Class 1') # THEN: Projector class should be set with proper value - assert ('1' == self.pjlink.pjlink_class), 'Non-standard class reply should have set class=1' + assert '1' == self.pjlink.pjlink_class, 'Non-standard class reply should have set class=1' mock_log.error.assert_has_calls(log_error_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -316,7 +316,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='CLSS', data='Version2') # THEN: Projector class should be set with proper value - assert ('2' == self.pjlink.pjlink_class), 'Non-standard class reply should have set class=1' + assert '2' == self.pjlink.pjlink_class, 'Non-standard class reply should have set class=1' mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -348,7 +348,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='ERST', data=chk_data) # THEN: PJLink instance errors should match chk_value - assert (self.pjlink.projector_errors == chk_test), 'Projector errors should be all E_ERROR' + assert self.pjlink.projector_errors == chk_test, 'Projector errors should be all E_ERROR' mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -368,7 +368,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='ERST', data=chk_data) # THEN: PJLink instance errors should be None - assert (self.pjlink.projector_errors is None), 'projector_errors should have been set to None' + assert self.pjlink.projector_errors is None, 'projector_errors should have been set to None' mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -400,7 +400,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='ERST', data=chk_data) # THEN: PJLink instance errors should match chk_value - assert (self.pjlink.projector_errors == chk_test), 'Projector errors should be all E_WARN' + assert self.pjlink.projector_errors == chk_test, 'Projector errors should be all E_WARN' mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -423,7 +423,7 @@ class TestPJLinkCommands(TestCase): process_command(self.pjlink, cmd='ERST', data=chk_data) # THEN: pjlink.projector_errors should be empty and warning logged - assert (not self.pjlink.projector_errors), 'There should be no errors' + assert not self.pjlink.projector_errors, 'There should be no errors' mock_log.warning.assert_has_calls(log_warn_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -445,7 +445,7 @@ class TestPJLinkCommands(TestCase): process_command(self.pjlink, cmd='ERST', data=chk_data) # THEN: pjlink.projector_errors should be empty and warning logged - assert (not self.pjlink.projector_errors), 'There should be no errors' + assert not self.pjlink.projector_errors, 'There should be no errors' mock_log.warning.assert_has_calls(log_warn_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -472,10 +472,10 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='ERST', data=chk_data) # THEN: PJLink instance errors should match only cover warning - assert (1 == len(self.pjlink.projector_errors)), 'There should only be 1 error listed in projector_errors' - assert ('Cover' in self.pjlink.projector_errors), '"Cover" should be the only error listed' - assert (self.pjlink.projector_errors['Cover'] == E_WARN), '"Cover" should have E_WARN listed as error' - assert (chk_test == self.pjlink.projector_errors), 'projector_errors should match test errors' + assert 1 == len(self.pjlink.projector_errors), 'There should only be 1 error listed in projector_errors' + assert 'Cover' in self.pjlink.projector_errors, '"Cover" should be the only error listed' + assert self.pjlink.projector_errors['Cover'] == E_WARN, '"Cover" should have E_WARN listed as error' + assert chk_test == self.pjlink.projector_errors, 'projector_errors should match test errors' mock_log.warning.assert_has_calls(log_warn_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -498,7 +498,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='INF1', data=chk_data) # THEN: Data should be saved - assert (self.pjlink.manufacturer == chk_data), 'Test data should have been saved' + assert self.pjlink.manufacturer == chk_data, 'Test data should have been saved' mock_log.warning.assert_has_calls(log_warn_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -521,7 +521,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='INF2', data=chk_data) # THEN: Data should be saved - assert (self.pjlink.model == chk_data), 'Test data should have been saved' + assert self.pjlink.model == chk_data, 'Test data should have been saved' mock_log.warning.assert_has_calls(log_warn_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -544,6 +544,6 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='INFO', data=chk_data) # THEN: Data should be saved - assert (self.pjlink.other_info == chk_data), 'Test data should have been saved' + assert self.pjlink.other_info == chk_data, 'Test data should have been saved' mock_log.warning.assert_has_calls(log_warn_calls) mock_log.debug.assert_has_calls(log_debug_calls) diff --git a/tests/openlp_core/projectors/test_projector_commands_02.py b/tests/openlp_core/projectors/test_projector_commands_02.py index 54306c0fe..2462010cc 100644 --- a/tests/openlp_core/projectors/test_projector_commands_02.py +++ b/tests/openlp_core/projectors/test_projector_commands_02.py @@ -67,7 +67,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='INPT', data='21') # THEN: Input selected should reflect current input - assert ('21' == self.pjlink.source), 'Input source should be set to "21"' + assert '21' == self.pjlink.source, 'Input source should be set to "21"' mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -88,7 +88,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='INPT', data='91') # THEN: Input selected should reflect current input - assert (not self.pjlink.source), 'Input source should not have changed' + assert not self.pjlink.source, 'Input source should not have changed' mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -110,7 +110,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='INPT', data='25') # THEN: Input selected should reflect current input - assert ('11' == self.pjlink.source), 'Input source should not have changed' + assert '11' == self.pjlink.source, 'Input source should not have changed' mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -138,7 +138,7 @@ class TestPJLinkCommands(TestCase): # THEN: Data should have been sorted and saved properly mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (self.pjlink.source_available == chk_test), "Sources should have been sorted and saved" + assert self.pjlink.source_available == chk_test, "Sources should have been sorted and saved" @patch.object(openlp.core.projectors.pjlinkcommands, 'log') def test_projector_lamp_invalid_missing_data(self, mock_log): @@ -158,7 +158,7 @@ class TestPJLinkCommands(TestCase): # THEN: Lamp should have been set with proper lamp status mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (not self.pjlink.lamp), 'Projector lamp info should not have changed' + assert not self.pjlink.lamp, 'Projector lamp info should not have changed' @patch.object(openlp.core.projectors.pjlinkcommands, 'log') def test_projector_lamp_invalid_nan(self, mock_log): @@ -180,11 +180,11 @@ class TestPJLinkCommands(TestCase): # THEN: lamps should not have changed mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (2 == len(self.pjlink.lamp)), 'Projector lamp list should not have changed' + assert 2 == len(self.pjlink.lamp), 'Projector lamp list should not have changed' assert self.pjlink.lamp[0]['On'], 'Lamp 1 power status should not have changed' - assert (0 == self.pjlink.lamp[0]['Hours']), 'Lamp 1 hours should not have changed' - assert (not self.pjlink.lamp[1]['On']), 'Lamp 2 power status should not have changed' - assert (11111 == self.pjlink.lamp[1]['Hours']), 'Lamp 2 hours should not have changed' + assert 0 == self.pjlink.lamp[0]['Hours'], 'Lamp 1 hours should not have changed' + assert not self.pjlink.lamp[1]['On'], 'Lamp 2 power status should not have changed' + assert 11111 == self.pjlink.lamp[1]['Hours'], 'Lamp 2 hours should not have changed' @patch.object(openlp.core.projectors.pjlinkcommands, 'log') def test_projector_lamp_multiple(self, mock_log): @@ -204,13 +204,13 @@ class TestPJLinkCommands(TestCase): # THEN: Lamp should have been set with proper lamp status mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (3 == len(self.pjlink.lamp)), 'Projector should have 3 lamps specified' + assert 3 == len(self.pjlink.lamp), 'Projector should have 3 lamps specified' assert self.pjlink.lamp[0]['On'], 'Lamp 1 power status should have been set to TRUE' - assert (11111 == self.pjlink.lamp[0]['Hours']), 'Lamp 1 hours should have been set to 11111' - assert (not self.pjlink.lamp[1]['On']), 'Lamp 2 power status should have been set to FALSE' - assert (22222 == self.pjlink.lamp[1]['Hours']), 'Lamp 2 hours should have been set to 22222' + assert 11111 == self.pjlink.lamp[0]['Hours'], 'Lamp 1 hours should have been set to 11111' + assert not self.pjlink.lamp[1]['On'], 'Lamp 2 power status should have been set to FALSE' + assert 22222 == self.pjlink.lamp[1]['Hours'], 'Lamp 2 hours should have been set to 22222' assert self.pjlink.lamp[2]['On'], 'Lamp 3 power status should have been set to TRUE' - assert (33333 == self.pjlink.lamp[2]['Hours']), 'Lamp 3 hours should have been set to 33333' + assert 33333 == self.pjlink.lamp[2]['Hours'], 'Lamp 3 hours should have been set to 33333' @patch.object(openlp.core.projectors.pjlinkcommands, 'log') def test_projector_lamp_single(self, mock_log): @@ -229,9 +229,9 @@ class TestPJLinkCommands(TestCase): # THEN: Lamp should have been set with proper lamp status mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (1 == len(self.pjlink.lamp)), 'Projector should have 1 lamp specified' + assert 1 == len(self.pjlink.lamp), 'Projector should have 1 lamp specified' assert self.pjlink.lamp[0]['On'], 'Lamp 1 power status should have been set to TRUE' - assert (11111 == self.pjlink.lamp[0]['Hours']), 'Lamp 1 hours should have been set to 11111' + assert 11111 == self.pjlink.lamp[0]['Hours'], 'Lamp 1 hours should have been set to 11111' @patch.object(openlp.core.projectors.pjlinkcommands, 'log') def test_projector_name(self, mock_log): @@ -253,7 +253,7 @@ class TestPJLinkCommands(TestCase): # THEN: name should be set and logged mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (self.pjlink.pjlink_name == chk_data), 'Name test data should have been saved' + assert self.pjlink.pjlink_name == chk_data, 'Name test data should have been saved' @patch.object(openlp.core.projectors.pjlink.PJLink, 'send_command') @patch.object(openlp.core.projectors.pjlink.PJLink, 'change_status') @@ -276,7 +276,7 @@ class TestPJLinkCommands(TestCase): # THEN: Projector power should not have changed mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (S_STANDBY == self.pjlink.power), 'Power should not have changed' + assert S_STANDBY == self.pjlink.power, 'Power should not have changed' mock_UpdateIcons.emit.assert_not_called() mock_change_status.assert_not_called() mock_send_command.assert_not_called() @@ -302,9 +302,9 @@ class TestPJLinkCommands(TestCase): # THEN: Power should be set to ON mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (S_STANDBY == self.pjlink.power), 'Power should have been set to OFF' + assert S_STANDBY == self.pjlink.power, 'Power should have been set to OFF' assert mock_UpdateIcons.emit.called, 'projectorUpdateIcons should have been called' - assert (not mock_send_command.called), 'send_command should not have been called' + assert not mock_send_command.called, 'send_command should not have been called' mock_change_status.assert_called_once_with(S_STANDBY) @patch.object(openlp.core.projectors.pjlink.PJLink, 'send_command') @@ -328,7 +328,7 @@ class TestPJLinkCommands(TestCase): # THEN: Power should be set to ON mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (S_ON == self.pjlink.power), 'Power should have been set to ON' + assert S_ON == self.pjlink.power, 'Power should have been set to ON' assert mock_UpdateIcons.emit.called, 'projectorUpdateIcons should have been called' mock_send_command.assert_called_once_with('INST') mock_change_status.assert_called_once_with(S_ON) @@ -352,7 +352,7 @@ class TestPJLinkCommands(TestCase): # THEN: Filter model number should be saved mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (self.pjlink.model_filter == new_data), 'Filter model should have been saved' + assert self.pjlink.model_filter == new_data, 'Filter model should have been saved' @patch.object(openlp.core.projectors.pjlinkcommands, 'log') def test_projector_rfil_nosave(self, mock_log): @@ -374,7 +374,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='RFIL', data=new_data) # THEN: Filter model number should be saved - assert (self.pjlink.model_filter != new_data), 'Filter model should NOT have been saved' + assert self.pjlink.model_filter != new_data, 'Filter model should NOT have been saved' mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -397,7 +397,7 @@ class TestPJLinkCommands(TestCase): # THEN: Filter model number should be saved mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (self.pjlink.model_lamp == new_data), 'Lamp model should have been saved' + assert self.pjlink.model_lamp == new_data, 'Lamp model should have been saved' @patch.object(openlp.core.projectors.pjlinkcommands, 'log') def test_projector_rlmp_nosave(self, mock_log): @@ -419,7 +419,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='RLMP', data=new_data) # THEN: Filter model number should be saved - assert (self.pjlink.model_lamp != new_data), 'Lamp model should NOT have been saved' + assert self.pjlink.model_lamp != new_data, 'Lamp model should NOT have been saved' mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -446,7 +446,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='SNUM', data=new_data) # THEN: Serial number should be set - assert (self.pjlink.serial_no != new_data), 'Projector serial number should NOT have been set' + assert self.pjlink.serial_no != new_data, 'Projector serial number should NOT have been set' mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -469,7 +469,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='SNUM', data=new_data) # THEN: Serial number should be set - assert (self.pjlink.serial_no == new_data), 'Projector serial number should have been set' + assert self.pjlink.serial_no == new_data, 'Projector serial number should have been set' mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -497,7 +497,7 @@ class TestPJLinkCommands(TestCase): process_command(self.pjlink, cmd='SVER', data=new_data) # THEN: Version information should change - assert (self.pjlink.sw_version == new_data), 'Software version should have changed' + assert self.pjlink.sw_version == new_data, 'Software version should have changed' mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -519,8 +519,8 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='SVER', data=new_data) # THEN: Version information should not change - assert (not self.pjlink.sw_version), 'Software version should not have changed' - assert (not self.pjlink.sw_version_received), 'Received software version should not have changed' + assert not self.pjlink.sw_version, 'Software version should not have changed' + assert not self.pjlink.sw_version_received, 'Received software version should not have changed' mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) @@ -544,7 +544,7 @@ class TestPJLinkCommands(TestCase): process_command(projector=self.pjlink, cmd='SVER', data=new_data) # THEN: Version information should not change - assert (self.pjlink.sw_version == new_data), 'Software version should have been updated' - assert (not self.pjlink.sw_version_received), 'Received version field should not have changed' + assert self.pjlink.sw_version == new_data, 'Software version should have been updated' + assert not self.pjlink.sw_version_received, 'Received version field should not have changed' mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) diff --git a/tests/openlp_core/projectors/test_projector_commands_03.py b/tests/openlp_core/projectors/test_projector_commands_03.py index b782d205e..788ac1430 100644 --- a/tests/openlp_core/projectors/test_projector_commands_03.py +++ b/tests/openlp_core/projectors/test_projector_commands_03.py @@ -74,7 +74,7 @@ class TestPJLinkCommands(TestCase): mock_log.error.assert_has_calls(log_error_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (chk == S_AUTHENTICATE), 'Should have returned {data}'.format(data=STATUS_CODE[S_AUTHENTICATE]) + assert chk == S_AUTHENTICATE, 'Should have returned {data}'.format(data=STATUS_CODE[S_AUTHENTICATE]) @patch.object(openlp.core.projectors.pjlinkcommands, 'log') def test_process_pjlink_authenticate_pin_not_set_error(self, mock_log): @@ -98,7 +98,7 @@ class TestPJLinkCommands(TestCase): mock_log.error.assert_has_calls(log_error_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (chk == E_NO_AUTHENTICATION), \ + assert chk == E_NO_AUTHENTICATION, \ 'Should have returned {data}'.format(data=STATUS_CODE[E_NO_AUTHENTICATION]) @patch.object(openlp.core.projectors.pjlinkcommands, 'log') @@ -124,7 +124,7 @@ class TestPJLinkCommands(TestCase): mock_log.error.assert_has_calls(log_error_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (chk == E_NO_AUTHENTICATION), \ + assert chk == E_NO_AUTHENTICATION, \ 'Should have returned {data}'.format(data=STATUS_CODE[E_NO_AUTHENTICATION]) @patch.object(openlp.core.projectors.pjlinkcommands, 'log') @@ -150,7 +150,7 @@ class TestPJLinkCommands(TestCase): mock_log.error.assert_has_calls(log_error_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (chk == E_NO_AUTHENTICATION), \ + assert chk == E_NO_AUTHENTICATION, \ 'Should have returned {data}'.format(data=STATUS_CODE[E_NO_AUTHENTICATION]) @patch.object(openlp.core.projectors.pjlinkcommands, 'log') @@ -175,7 +175,7 @@ class TestPJLinkCommands(TestCase): mock_log.error.assert_has_calls(log_error_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (chk == E_NO_AUTHENTICATION), \ + assert chk == E_NO_AUTHENTICATION, \ 'Should have returned {data}'.format(data=STATUS_CODE[E_NO_AUTHENTICATION]) @patch.object(openlp.core.projectors.pjlinkcommands, 'log') @@ -201,7 +201,7 @@ class TestPJLinkCommands(TestCase): mock_log.error.assert_has_calls(log_error_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (chk == S_CONNECT), 'Should have returned {data}'.format(data=STATUS_CODE[S_CONNECT]) + assert chk == S_CONNECT, 'Should have returned {data}'.format(data=STATUS_CODE[S_CONNECT]) @patch.object(openlp.core.projectors.pjlinkcommands, 'log') def test_process_pjlink_normal_pin_set_error(self, mock_log): @@ -224,7 +224,7 @@ class TestPJLinkCommands(TestCase): mock_log.error.assert_has_calls(log_error_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (chk == E_NO_AUTHENTICATION), \ + assert chk == E_NO_AUTHENTICATION, \ 'Should have returned {data}'.format(data=STATUS_CODE[E_NO_AUTHENTICATION]) @patch.object(openlp.core.projectors.pjlinkcommands, 'log') @@ -249,5 +249,5 @@ class TestPJLinkCommands(TestCase): mock_log.error.assert_has_calls(log_error_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (chk == E_NO_AUTHENTICATION), \ + assert chk == E_NO_AUTHENTICATION, \ 'Should have returned {data}'.format(data=STATUS_CODE[E_NO_AUTHENTICATION]) diff --git a/tests/openlp_core/projectors/test_projector_pjlink_base_02.py b/tests/openlp_core/projectors/test_projector_pjlink_base_02.py index 86a4fd400..2f36814f7 100644 --- a/tests/openlp_core/projectors/test_projector_pjlink_base_02.py +++ b/tests/openlp_core/projectors/test_projector_pjlink_base_02.py @@ -96,10 +96,10 @@ class TestPJLinkBase(TestCase): mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) mock_change_status.called_with(E_NETWORK, 'Error while sending data to projector') - assert (not self.pjlink.send_queue), 'Send queue should be empty' - assert (not self.pjlink.priority_queue), 'Priority queue should be empty' + assert not self.pjlink.send_queue, 'Send queue should be empty' + assert not self.pjlink.priority_queue, 'Priority queue should be empty' assert mock_timer.start.called, 'Timer should have been called' - assert (not mock_reset.called), 'reset_information() should not should have been called' + assert not mock_reset.called, 'reset_information() should not should have been called' assert mock_disconnect.called, 'disconnect_from_host() should have been called' assert self.pjlink.send_busy, 'send_busy should be True' @@ -127,10 +127,10 @@ class TestPJLinkBase(TestCase): mock_log.error.assert_has_calls(log_error_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (not self.pjlink.send_queue), 'Send queue should be empty' - assert (not self.pjlink.priority_queue), 'Priority queue should be empty' - assert (not mock_timer.called), 'Timer should not have been called' - assert (not mock_reset.called), 'reset_information() should not have been called' + assert not self.pjlink.send_queue, 'Send queue should be empty' + assert not self.pjlink.priority_queue, 'Priority queue should be empty' + assert not mock_timer.called, 'Timer should not have been called' + assert not mock_reset.called, 'reset_information() should not have been called' @patch.object(openlp.core.projectors.pjlink.PJLink, 'write') @patch.object(openlp.core.projectors.pjlink.PJLink, 'disconnect_from_host') @@ -173,11 +173,11 @@ class TestPJLinkBase(TestCase): mock_log.error.assert_has_calls(log_error_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (not self.pjlink.send_queue), 'Send queue should be empty' - assert (not self.pjlink.priority_queue), 'Priority queue should be empty' + assert not self.pjlink.send_queue, 'Send queue should be empty' + assert not self.pjlink.priority_queue, 'Priority queue should be empty' assert mock_timer.start.called, 'Timer should have been called' - assert (not mock_reset.called), 'reset_information() should not have been called' - assert (not mock_disconnect.called), 'disconnect_from_host() should not have been called' + assert not mock_reset.called, 'reset_information() should not have been called' + assert not mock_disconnect.called, 'disconnect_from_host() should not have been called' assert self.pjlink.send_busy, 'send_busy flag should be True' @patch.object(openlp.core.projectors.pjlink.PJLink, 'disconnect_from_host') @@ -211,12 +211,12 @@ class TestPJLinkBase(TestCase): mock_log.error.assert_has_calls(log_error_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (self.pjlink.send_queue == [test_command]), 'Send queue should have one entry' - assert (not self.pjlink.priority_queue), 'Priority queue should be empty' - assert (not mock_timer.called), 'Timer should not have been called' - assert (not mock_reset.called), 'reset_information() should not have been called' + assert self.pjlink.send_queue == [test_command], 'Send queue should have one entry' + assert not self.pjlink.priority_queue, 'Priority queue should be empty' + assert not mock_timer.called, 'Timer should not have been called' + assert not mock_reset.called, 'reset_information() should not have been called' assert mock_disconnect.called, 'disconnect_from_host() should have been called' - assert (not self.pjlink.send_busy), 'send_busy flag should be False' + assert not self.pjlink.send_busy, 'send_busy flag should be False' @patch.object(openlp.core.projectors.pjlink.PJLink, 'write') @patch.object(openlp.core.projectors.pjlink.PJLink, 'disconnect_from_host') @@ -261,11 +261,11 @@ class TestPJLinkBase(TestCase): mock_log.error.assert_has_calls(log_error_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (not self.pjlink.send_queue), 'Send queue should be empty' - assert (not self.pjlink.priority_queue), 'Priority queue should be empty' + assert not self.pjlink.send_queue, 'Send queue should be empty' + assert not self.pjlink.priority_queue, 'Priority queue should be empty' assert mock_timer.start.called, 'Timer should have been called' - assert (not mock_reset.called), 'reset_information() should not have been called' - assert (not mock_disconnect.called), 'disconnect_from_host() should not have been called' + assert not mock_reset.called, 'reset_information() should not have been called' + assert not mock_disconnect.called, 'disconnect_from_host() should not have been called' assert self.pjlink.send_busy, 'send_busy flag should be True' @patch.object(openlp.core.projectors.pjlink.PJLink, 'write') @@ -314,10 +314,10 @@ class TestPJLinkBase(TestCase): mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) assert self.pjlink.send_queue, 'Send queue should have one entry' - assert (not self.pjlink.priority_queue), 'Priority queue should be empty' + assert not self.pjlink.priority_queue, 'Priority queue should be empty' assert mock_timer.start.called, 'Timer should have been called' - assert (not mock_reset.called), 'reset_information() should not have been called' - assert (not mock_disconnect.called), 'disconnect_from_host() should not have been called' + assert not mock_reset.called, 'reset_information() should not have been called' + assert not mock_disconnect.called, 'disconnect_from_host() should not have been called' assert self.pjlink.send_busy, 'send_busy flag should be True' @patch.object(openlp.core.projectors.pjlink.PJLink, 'state') @@ -358,9 +358,9 @@ class TestPJLinkBase(TestCase): mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) assert self.pjlink.send_queue, 'Send queue should have one entry' - assert (not self.pjlink.priority_queue), 'Priority queue should be empty' - assert (not mock_timer.start.called), 'Timer should not have been called' - assert (not mock_reset.called), 'reset_information() should not have been called' + assert not self.pjlink.priority_queue, 'Priority queue should be empty' + assert not mock_timer.start.called, 'Timer should not have been called' + assert not mock_reset.called, 'reset_information() should not have been called' assert self.pjlink.send_busy, 'send_busy flag should be True' @patch.object(openlp.core.projectors.pjlink.PJLink, 'state') @@ -402,10 +402,10 @@ class TestPJLinkBase(TestCase): mock_log.error.assert_has_calls(log_error_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.debug.assert_has_calls(log_debug_calls) - assert (not self.pjlink.send_queue), 'Send queue should be empty' + assert not self.pjlink.send_queue, 'Send queue should be empty' assert self.pjlink.priority_queue, 'Priority queue should have one entry' - assert (not mock_timer.start.called), 'Timer should not have been called' - assert (not mock_reset.called), 'reset_information() should not have been called' + assert not mock_timer.start.called, 'Timer should not have been called' + assert not mock_reset.called, 'reset_information() should not have been called' assert self.pjlink.send_busy, 'send_busy flag should be True' # ------------ Test PJLink.send_command ---------- @@ -440,7 +440,7 @@ class TestPJLinkBase(TestCase): mock_log.debug.assert_has_calls(log_debug_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.error.assert_has_calls(log_error_calls) - assert (not mock_reset.called), 'reset_information() should not have been called' + assert not mock_reset.called, 'reset_information() should not have been called' assert mock_send_command.called, '_underscore_send_command() should have been called' @patch.object(openlp.core.projectors.pjlink.PJLink, 'state') @@ -473,8 +473,8 @@ class TestPJLinkBase(TestCase): mock_log.warning.assert_has_calls(log_warning_calls) mock_log.error.assert_has_calls(log_error_calls) mock_priority.append.assert_called_with(test_command) - assert (not mock_send.append.called), 'send_queue should not have changed' - assert (not mock_reset.called), 'reset_information() should not have been called' + assert not mock_send.append.called, 'send_queue should not have changed' + assert not mock_reset.called, 'reset_information() should not have been called' assert mock_send_command.called, '_underscore_send_command() should have been called' @patch.object(openlp.core.projectors.pjlink.PJLink, 'state') @@ -506,9 +506,9 @@ class TestPJLinkBase(TestCase): mock_log.debug.assert_has_calls(log_debug_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.error.assert_has_calls(log_error_calls) - assert (self.pjlink.send_queue == [test_command]), 'Send queue should have one entry' - assert (not self.pjlink.priority_queue), 'Priority queue should be empty' - assert (not mock_reset.called), 'reset_information() should not have been called' + assert self.pjlink.send_queue == [test_command], 'Send queue should have one entry' + assert not self.pjlink.priority_queue, 'Priority queue should be empty' + assert not mock_reset.called, 'reset_information() should not have been called' assert mock_send_command.called, '_underscore_send_command() should have been called' @patch.object(openlp.core.projectors.pjlink.PJLink, 'state') @@ -540,9 +540,9 @@ class TestPJLinkBase(TestCase): mock_log.debug.assert_has_calls(log_debug_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.error.assert_has_calls(log_error_calls) - assert (not self.pjlink.send_queue), 'Send queue should be empty' - assert (self.pjlink.priority_queue == [test_command]), 'Priority queue should have one entry' - assert (not mock_reset.called), 'reset_information() should not have been called' + assert not self.pjlink.send_queue, 'Send queue should be empty' + assert self.pjlink.priority_queue == [test_command], 'Priority queue should have one entry' + assert not mock_reset.called, 'reset_information() should not have been called' assert mock_send_command.called, '_underscore_send_command() should have been called' @patch.object(openlp.core.projectors.pjlink.PJLink, 'state') @@ -569,10 +569,10 @@ class TestPJLinkBase(TestCase): mock_log.debug.assert_has_calls(log_debug_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.error.assert_has_calls(log_error_calls) - assert (not self.pjlink.send_queue), 'Send queue should be empty' - assert (not self.pjlink.priority_queue), 'Priority queue should be empty' - assert (not mock_reset.called), 'reset_information() should not have been called' - assert (not mock_send_command.called), '_underscore_send_command() should not have been called' + assert not self.pjlink.send_queue, 'Send queue should be empty' + assert not self.pjlink.priority_queue, 'Priority queue should be empty' + assert not mock_reset.called, 'reset_information() should not have been called' + assert not mock_send_command.called, '_underscore_send_command() should not have been called' @patch.object(openlp.core.projectors.pjlink.PJLink, 'state') @patch.object(openlp.core.projectors.pjlink.PJLink, 'reset_information') @@ -602,8 +602,8 @@ class TestPJLinkBase(TestCase): mock_log.warning.assert_has_calls(log_warning_calls) mock_log.error.assert_has_calls(log_error_calls) assert self.pjlink.send_queue, 'Send queue should have one entry' - assert (not self.pjlink.priority_queue), 'Priority queue should be empty' - assert (not mock_reset.called), 'reset_information() should not have been called' + assert not self.pjlink.priority_queue, 'Priority queue should be empty' + assert not mock_reset.called, 'reset_information() should not have been called' assert mock_send_command.called, '_underscore_send_command() should have been called' @patch.object(openlp.core.projectors.pjlink.PJLink, 'state') @@ -633,9 +633,9 @@ class TestPJLinkBase(TestCase): mock_log.debug.assert_has_calls(log_debug_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.error.assert_has_calls(log_error_calls) - assert (not self.pjlink.send_queue), 'Send queue should be empty' + assert not self.pjlink.send_queue, 'Send queue should be empty' assert self.pjlink.priority_queue, 'Priority queue should have one entry' - assert (not mock_reset.called), 'reset_information() should not have been called' + assert not mock_reset.called, 'reset_information() should not have been called' assert mock_send_command.called, '_underscore_send_command() should have been called' @patch.object(openlp.core.projectors.pjlink.PJLink, 'state') @@ -661,7 +661,7 @@ class TestPJLinkBase(TestCase): mock_log.debug.assert_has_calls(log_debug_calls) mock_log.warning.assert_has_calls(log_warning_calls) mock_log.error.assert_has_calls(log_error_calls) - assert (not self.pjlink.send_queue), 'Send queue should be empty' - assert (not self.pjlink.priority_queue), 'Priority queue should be empty' + assert not self.pjlink.send_queue, 'Send queue should be empty' + assert not self.pjlink.priority_queue, 'Priority queue should be empty' assert mock_reset.called, 'reset_information() should have been called' - assert (not mock_send_command.called), '_underscore_send_command() should not have been called' + assert not mock_send_command.called, '_underscore_send_command() should not have been called'