openlp-dev team mailing list archive
-
openlp-dev team
-
Mailing list archive
-
Message #00049
[Merge] lp:~trb143/openlp/webengine-migrate-trunk into lp:~openlp-dev/openlp/webengine-migrate
Tim Bentley has proposed merging lp:~trb143/openlp/webengine-migrate-trunk into lp:~openlp-dev/openlp/webengine-migrate.
Commit message:
Fixed trunk merge so now matches that.
Requested reviews:
OpenLP Development (openlp-dev)
For more details, see:
https://code.launchpad.net/~trb143/openlp/webengine-migrate-trunk/+merge/362287
--
The attached diff has been truncated due to its size.
Your team OpenLP Development is requested to review the proposed merge of lp:~trb143/openlp/webengine-migrate-trunk into lp:~openlp-dev/openlp/webengine-migrate.
=== modified file 'openlp/core/app.py'
--- openlp/core/app.py 2018-10-24 21:02:06 +0000
+++ openlp/core/app.py 2019-01-27 20:26:59 +0000
@@ -35,8 +35,10 @@
from PyQt5 import QtCore, QtWebEngineWidgets, QtWidgets # noqa
+from openlp.core.state import State
from openlp.core.common import is_macosx, is_win
from openlp.core.common.applocation import AppLocation
+from openlp.core.loader import loader
from openlp.core.common.i18n import LanguageManager, UiStrings, translate
from openlp.core.common.path import copytree, create_paths
from openlp.core.common.registry import Registry
@@ -115,8 +117,10 @@
# Check if OpenLP has been upgrade and if a backup of data should be created
self.backup_on_upgrade(has_run_wizard, can_show_splash)
# start the main app window
+ loader()
self.main_window = MainWindow()
Registry().execute('bootstrap_initialise')
+ State().flush_preconditions()
Registry().execute('bootstrap_post_set_up')
Registry().initialise = False
self.main_window.show()
@@ -134,7 +138,7 @@
if Settings().value('core/update check'):
check_for_update(self.main_window)
self.main_window.is_display_blank()
- self.main_window.app_startup()
+ Registry().execute('bootstrap_completion')
return self.exec()
@staticmethod
=== modified file 'openlp/core/common/actions.py'
--- openlp/core/common/actions.py 2018-10-02 04:39:42 +0000
+++ openlp/core/common/actions.py 2019-01-27 20:26:59 +0000
@@ -20,7 +20,7 @@
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
"""
-The :mod:`~openlp.core.utils.actions` module provides action list classes used
+The :mod:`~openlp.core.common.actions` module provides action list classes used
by the shortcuts system.
"""
import logging
=== modified file 'openlp/core/common/mixins.py'
--- openlp/core/common/mixins.py 2018-10-02 04:39:42 +0000
+++ openlp/core/common/mixins.py 2019-01-27 20:26:59 +0000
@@ -50,7 +50,8 @@
setattr(self, name, self.logging_wrapper(m, self))
return self._logger
- def logging_wrapper(self, func, parent):
+ @staticmethod
+ def logging_wrapper(func, parent):
"""
Code to added debug wrapper to work on called functions within a decorated class.
"""
=== modified file 'openlp/core/common/registry.py'
--- openlp/core/common/registry.py 2018-10-24 21:02:06 +0000
+++ openlp/core/common/registry.py 2019-01-27 20:26:59 +0000
@@ -205,6 +205,7 @@
Registry().register(de_hump(self.__class__.__name__), self)
Registry().register_function('bootstrap_initialise', self.bootstrap_initialise)
Registry().register_function('bootstrap_post_set_up', self.bootstrap_post_set_up)
+ Registry().register_function('bootstrap_completion', self.bootstrap_completion)
def bootstrap_initialise(self):
"""
@@ -217,3 +218,9 @@
Dummy method to be overridden
"""
pass
+
+ def bootstrap_completion(self):
+ """
+ Dummy method to be overridden
+ """
+ pass
=== modified file 'openlp/core/lib/mediamanageritem.py'
--- openlp/core/lib/mediamanageritem.py 2018-10-02 04:39:42 +0000
+++ openlp/core/lib/mediamanageritem.py 2019-01-27 20:26:59 +0000
@@ -130,6 +130,9 @@
self.has_file_icon = False
self.has_delete_icon = True
self.add_to_service_item = False
+ self.can_preview = True
+ self.can_make_live = True
+ self.can_add_to_service = True
def retranslate_ui(self):
"""
@@ -183,11 +186,14 @@
if self.has_delete_icon:
toolbar_actions.append(['Delete', StringContent.Delete, UiIcons().delete, self.on_delete_click])
# Preview
- toolbar_actions.append(['Preview', StringContent.Preview, UiIcons().preview, self.on_preview_click])
+ if self.can_preview:
+ toolbar_actions.append(['Preview', StringContent.Preview, UiIcons().preview, self.on_preview_click])
# Live Button
- toolbar_actions.append(['Live', StringContent.Live, UiIcons().live, self.on_live_click])
+ if self.can_make_live:
+ toolbar_actions.append(['Live', StringContent.Live, UiIcons().live, self.on_live_click])
# Add to service Button
- toolbar_actions.append(['Service', StringContent.Service, UiIcons().add, self.on_add_click])
+ if self.can_add_to_service:
+ toolbar_actions.append(['Service', StringContent.Service, UiIcons().add, self.on_add_click])
for action in toolbar_actions:
if action[0] == StringContent.Preview:
self.toolbar.addSeparator()
@@ -211,27 +217,30 @@
icon=UiIcons().edit,
triggers=self.on_edit_click)
create_widget_action(self.list_view, separator=True)
- create_widget_action(self.list_view,
- 'listView{plugin}{preview}Item'.format(plugin=self.plugin.name.title(),
- preview=StringContent.Preview.title()),
- text=self.plugin.get_string(StringContent.Preview)['title'],
- icon=UiIcons().preview,
- can_shortcuts=True,
- triggers=self.on_preview_click)
- create_widget_action(self.list_view,
- 'listView{plugin}{live}Item'.format(plugin=self.plugin.name.title(),
- live=StringContent.Live.title()),
- text=self.plugin.get_string(StringContent.Live)['title'],
- icon=UiIcons().live,
- can_shortcuts=True,
- triggers=self.on_live_click)
- create_widget_action(self.list_view,
- 'listView{plugin}{service}Item'.format(plugin=self.plugin.name.title(),
- service=StringContent.Service.title()),
- can_shortcuts=True,
- text=self.plugin.get_string(StringContent.Service)['title'],
- icon=UiIcons().add,
- triggers=self.on_add_click)
+ if self.can_preview:
+ create_widget_action(self.list_view,
+ 'listView{plugin}{preview}Item'.format(plugin=self.plugin.name.title(),
+ preview=StringContent.Preview.title()),
+ text=self.plugin.get_string(StringContent.Preview)['title'],
+ icon=UiIcons().preview,
+ can_shortcuts=True,
+ triggers=self.on_preview_click)
+ if self.can_make_live:
+ create_widget_action(self.list_view,
+ 'listView{plugin}{live}Item'.format(plugin=self.plugin.name.title(),
+ live=StringContent.Live.title()),
+ text=self.plugin.get_string(StringContent.Live)['title'],
+ icon=UiIcons().live,
+ can_shortcuts=True,
+ triggers=self.on_live_click)
+ if self.can_add_to_service:
+ create_widget_action(self.list_view,
+ 'listView{plugin}{service}Item'.format(plugin=self.plugin.name.title(),
+ service=StringContent.Service.title()),
+ can_shortcuts=True,
+ text=self.plugin.get_string(StringContent.Service)['title'],
+ icon=UiIcons().add,
+ triggers=self.on_add_click)
if self.has_delete_icon:
create_widget_action(self.list_view, separator=True)
create_widget_action(self.list_view,
@@ -462,10 +471,12 @@
Allows the list click action to be determined dynamically
"""
if Settings().value('advanced/double click live'):
- self.on_live_click()
+ if self.can_make_live:
+ self.on_live_click()
elif not Settings().value('advanced/single click preview'):
# NOTE: The above check is necessary to prevent bug #1419300
- self.on_preview_click()
+ if self.can_preview:
+ self.on_preview_click()
def on_selection_change(self):
"""
=== modified file 'openlp/core/lib/plugin.py'
--- openlp/core/lib/plugin.py 2018-10-02 04:39:42 +0000
+++ openlp/core/lib/plugin.py 2019-01-27 20:26:59 +0000
@@ -24,11 +24,9 @@
"""
import logging
-from PyQt5 import QtCore
-
from openlp.core.common.i18n import UiStrings
from openlp.core.common.mixins import RegistryProperties
-from openlp.core.common.registry import Registry
+from openlp.core.common.registry import Registry, RegistryBase
from openlp.core.common.settings import Settings
from openlp.core.version import get_version
@@ -61,7 +59,7 @@
VisibleName = 'visible_name'
-class Plugin(QtCore.QObject, RegistryProperties):
+class Plugin(RegistryBase, RegistryProperties):
"""
Base class for openlp plugins to inherit from.
@@ -326,6 +324,9 @@
"""
return self.text_strings[name]
+ def set_plugin_text_strings(self):
+ pass
+
def set_plugin_ui_text_strings(self, tooltips):
"""
Called to define all translatable texts of the plugin
=== modified file 'openlp/core/lib/pluginmanager.py'
--- openlp/core/lib/pluginmanager.py 2018-09-07 14:59:21 +0000
+++ openlp/core/lib/pluginmanager.py 2019-01-27 20:26:59 +0000
@@ -26,9 +26,10 @@
from PyQt5 import QtWidgets
+from openlp.core.state import State
from openlp.core.common import extension_loader
from openlp.core.common.applocation import AppLocation
-from openlp.core.common.i18n import UiStrings
+from openlp.core.common.i18n import translate, UiStrings
from openlp.core.common.mixins import LogMixin, RegistryProperties
from openlp.core.common.registry import RegistryBase
from openlp.core.lib.plugin import Plugin, PluginStatus
@@ -53,11 +54,22 @@
def bootstrap_initialise(self):
"""
Bootstrap all the plugin manager functions
- """
- self.find_plugins()
- # hook methods have to happen after find_plugins. Find plugins needs
- # the controllers hence the hooks have moved from setupUI() to here
- # Find and insert settings tabs
+ Scan a directory for objects inheriting from the ``Plugin`` class.
+ """
+ glob_pattern = os.path.join('plugins', '*', '[!.]*plugin.py')
+ extension_loader(glob_pattern)
+ plugin_classes = Plugin.__subclasses__()
+ for p in plugin_classes:
+ try:
+ p()
+ self.log_debug('Loaded plugin {plugin}'.format(plugin=str(p)))
+ except TypeError:
+ self.log_exception('Failed to load plugin {plugin}'.format(plugin=str(p)))
+
+ def bootstrap_post_set_up(self):
+ """
+ Bootstrap all the plugin manager functions
+ """
self.hook_settings_tabs()
# Find and insert media manager items
self.hook_media_manager()
@@ -70,36 +82,23 @@
# Call the initialise method to setup plugins.
self.initialise_plugins()
- def find_plugins(self):
- """
- Scan a directory for objects inheriting from the ``Plugin`` class.
- """
- glob_pattern = os.path.join('plugins', '*', '[!.]*plugin.py')
- extension_loader(glob_pattern)
- plugin_classes = Plugin.__subclasses__()
- plugin_objects = []
- for p in plugin_classes:
- try:
- plugin = p()
- self.log_debug('Loaded plugin {plugin}'.format(plugin=str(p)))
- plugin_objects.append(plugin)
- except TypeError:
- self.log_exception('Failed to load plugin {plugin}'.format(plugin=str(p)))
- plugins_list = sorted(plugin_objects, key=lambda plugin: plugin.weight)
- for plugin in plugins_list:
- if plugin.check_pre_conditions():
- self.log_debug('Plugin {plugin} active'.format(plugin=str(plugin.name)))
- plugin.set_status()
- else:
- plugin.status = PluginStatus.Disabled
- self.plugins.append(plugin)
+ def bootstrap_completion(self):
+ """
+ Give all the plugins a chance to perform some tasks at startup
+ """
+ self.application.process_events()
+ for plugin in State().list_plugins():
+ if plugin and plugin.is_active():
+ plugin.app_startup()
+ self.application.process_events()
- def hook_media_manager(self):
+ @staticmethod
+ def hook_media_manager():
"""
Create the plugins' media manager items.
"""
- for plugin in self.plugins:
- if plugin.status is not PluginStatus.Disabled:
+ for plugin in State().list_plugins():
+ if plugin and plugin.status is not PluginStatus.Disabled:
plugin.create_media_manager_item()
def hook_settings_tabs(self):
@@ -109,8 +108,8 @@
Tabs are set for all plugins not just Active ones
"""
- for plugin in self.plugins:
- if plugin.status is not PluginStatus.Disabled:
+ for plugin in State().list_plugins():
+ if plugin and plugin.status is not PluginStatus.Disabled:
plugin.create_settings_tab(self.settings_form)
def hook_import_menu(self):
@@ -119,8 +118,8 @@
item to the import menu.
"""
- for plugin in self.plugins:
- if plugin.status is not PluginStatus.Disabled:
+ for plugin in State().list_plugins():
+ if plugin and plugin.status is not PluginStatus.Disabled:
plugin.add_import_menu_item(self.main_window.file_import_menu)
def hook_export_menu(self):
@@ -128,8 +127,8 @@
Loop through all the plugins and give them an opportunity to add an
item to the export menu.
"""
- for plugin in self.plugins:
- if plugin.status is not PluginStatus.Disabled:
+ for plugin in State().list_plugins():
+ if plugin and plugin.status is not PluginStatus.Disabled:
plugin.add_export_menu_item(self.main_window.file_export_menu)
def hook_tools_menu(self):
@@ -137,18 +136,19 @@
Loop through all the plugins and give them an opportunity to add an
item to the tools menu.
"""
- for plugin in self.plugins:
- if plugin.status is not PluginStatus.Disabled:
+ for plugin in State().list_plugins():
+ if plugin and plugin.status is not PluginStatus.Disabled:
plugin.add_tools_menu_item(self.main_window.tools_menu)
- def hook_upgrade_plugin_settings(self, settings):
+ @staticmethod
+ def hook_upgrade_plugin_settings(settings):
"""
Loop through all the plugins and give them an opportunity to upgrade their settings.
:param settings: The Settings object containing the old settings.
"""
- for plugin in self.plugins:
- if plugin.status is not PluginStatus.Disabled:
+ for plugin in State().list_plugins():
+ if plugin and plugin.status is not PluginStatus.Disabled:
plugin.upgrade_settings(settings)
def initialise_plugins(self):
@@ -156,43 +156,55 @@
Loop through all the plugins and give them an opportunity to initialise themselves.
"""
uninitialised_plugins = []
- for plugin in self.plugins:
- self.log_info('initialising plugins {plugin} in a {state} state'.format(plugin=plugin.name,
- state=plugin.is_active()))
- if plugin.is_active():
- try:
- plugin.initialise()
- self.log_info('Initialisation Complete for {plugin}'.format(plugin=plugin.name))
- except Exception:
- uninitialised_plugins.append(plugin.name.title())
- self.log_exception('Unable to initialise plugin {plugin}'.format(plugin=plugin.name))
+
+ for plugin in State().list_plugins():
+ if plugin:
+ self.log_info('initialising plugins {plugin} in a {state} state'.format(plugin=plugin.name,
+ state=plugin.is_active()))
+ if plugin.is_active():
+ try:
+ plugin.initialise()
+ self.log_info('Initialisation Complete for {plugin}'.format(plugin=plugin.name))
+ except Exception:
+ uninitialised_plugins.append(plugin.name.title())
+ self.log_exception('Unable to initialise plugin {plugin}'.format(plugin=plugin.name))
+ display_text = ''
+
if uninitialised_plugins:
- QtWidgets.QMessageBox.critical(None, UiStrings().Error, 'Unable to initialise the following plugins:\n' +
- '\n'.join(uninitialised_plugins) + '\n\nSee the log file for more details',
+ display_text = translate('OpenLP.PluginManager', 'Unable to initialise the following plugins:') + \
+ '\n\n'.join(uninitialised_plugins) + '\n\n'
+ error_text = State().get_text()
+ if error_text:
+ display_text = display_text + error_text + '\n'
+ if display_text:
+ display_text = display_text + translate('OpenLP.PluginManager', 'See the log file for more details')
+ QtWidgets.QMessageBox.critical(None, UiStrings().Error, display_text,
QtWidgets.QMessageBox.StandardButtons(QtWidgets.QMessageBox.Ok))
def finalise_plugins(self):
"""
Loop through all the plugins and give them an opportunity to clean themselves up
"""
- for plugin in self.plugins:
- if plugin.is_active():
+ for plugin in State().list_plugins():
+ if plugin and plugin.is_active():
plugin.finalise()
self.log_info('Finalisation Complete for {plugin}'.format(plugin=plugin.name))
- def get_plugin_by_name(self, name):
+ @staticmethod
+ def get_plugin_by_name(name):
"""
Return the plugin which has a name with value ``name``.
"""
- for plugin in self.plugins:
- if plugin.name == name:
+ for plugin in State().list_plugins():
+ if plugin and plugin.name == name:
return plugin
return None
- def new_service_created(self):
+ @staticmethod
+ def new_service_created():
"""
Loop through all the plugins and give them an opportunity to handle a new service
"""
- for plugin in self.plugins:
+ for plugin in State().list_plugins():
if plugin.is_active():
plugin.new_service_created()
=== modified file 'openlp/core/lib/serviceitem.py'
--- openlp/core/lib/serviceitem.py 2018-12-01 05:52:49 +0000
+++ openlp/core/lib/serviceitem.py 2019-01-27 20:26:59 +0000
@@ -32,6 +32,7 @@
from PyQt5 import QtGui
+from openlp.core.state import State
from openlp.core.common import md5_hash
from openlp.core.common.applocation import AppLocation
from openlp.core.common.i18n import translate
@@ -348,7 +349,7 @@
self.processor = header.get('processor', None)
self.has_original_files = True
self.metadata = header.get('item_meta_data', [])
- if 'background_audio' in header:
+ if 'background_audio' in header and State().check_preconditions('media'):
self.background_audio = []
for file_path in header['background_audio']:
# In OpenLP 3.0 we switched to storing Path objects in JSON files
@@ -525,6 +526,10 @@
path_from = frame['path']
else:
path_from = os.path.join(frame['path'], frame['title'])
+ if isinstance(path_from, str):
+ # Handle service files prior to OpenLP 3.0
+ # Windows can handle both forward and backward slashes, so we use ntpath to get the basename
+ path_from = Path(path_from)
return path_from
def remove_frame(self, frame):
@@ -593,7 +598,7 @@
self.is_valid = False
break
elif self.is_command():
- if self.is_capable(ItemCapabilities.IsOptical):
+ if self.is_capable(ItemCapabilities.IsOptical) and State().check_preconditions('media'):
if not os.path.exists(slide['title']):
self.is_valid = False
break
=== added file 'openlp/core/loader.py'
--- openlp/core/loader.py 1970-01-01 00:00:00 +0000
+++ openlp/core/loader.py 2019-01-27 20:26:59 +0000
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2018 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; version 2 of the License. #
+# #
+# 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, write to the Free Software Foundation, Inc., 59 #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+###############################################################################
+"""
+The :mod:`~openlp.core.loader` module provides a bootstrap for the singleton classes
+"""
+
+from openlp.core.state import State
+from openlp.core.ui.media.mediacontroller import MediaController
+from openlp.core.lib.pluginmanager import PluginManager
+from openlp.core.display.render import Renderer
+from openlp.core.lib.imagemanager import ImageManager
+from openlp.core.ui.slidecontroller import LiveController, PreviewController
+
+
+def loader():
+ """
+ God class to load all the components which are registered with the Registry
+
+ :return: None
+ """
+ State().load_settings()
+ MediaController()
+ PluginManager()
+ # Set up the path with plugins
+ ImageManager()
+ Renderer()
+ # Create slide controllers
+ PreviewController()
+ LiveController()
=== added file 'openlp/core/state.py'
--- openlp/core/state.py 1970-01-01 00:00:00 +0000
+++ openlp/core/state.py 2019-01-27 20:26:59 +0000
@@ -0,0 +1,175 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2018 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; version 2 of the License. #
+# #
+# 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, write to the Free Software Foundation, Inc., 59 #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+###############################################################################
+
+"""
+The :mod:`core` module provides state management
+
+All the core functions of the OpenLP application including the GUI, settings, logging and a plugin framework are
+contained within the openlp.core module.
+"""
+import logging
+
+from openlp.core.common.registry import Registry
+from openlp.core.common.mixins import LogMixin
+from openlp.core.lib.plugin import PluginStatus
+
+
+log = logging.getLogger()
+
+
+class StateModule(LogMixin):
+ def __init__(self):
+ """
+ Holder of State information per module
+ """
+ super(StateModule, self).__init__()
+ self.name = None
+ self.order = 0
+ self.is_plugin = None
+ self.status = PluginStatus.Inactive
+ self.pass_preconditions = False
+ self.requires = None
+ self.required_by = None
+ self.text = None
+
+
+class State(LogMixin):
+
+ __instance__ = None
+
+ def __new__(cls):
+ """
+ Re-implement the __new__ method to make sure we create a true singleton.
+ """
+ if not cls.__instance__:
+ cls.__instance__ = object.__new__(cls)
+ return cls.__instance__
+
+ def load_settings(self):
+ self.modules = {}
+
+ def save_settings(self):
+ pass
+
+ def add_service(self, name, order, is_plugin=False, status=PluginStatus.Active, requires=None):
+ """
+ Add a module to the array and load dependencies. There will only be one item per module
+ :param name: Module name
+ :param order: Order to display
+ :param is_plugin: Am I a plugin
+ :param status: The active status
+ :param requires: Module name this requires
+ :return:
+ """
+ if name not in self.modules:
+ state = StateModule()
+ state.name = name
+ state.order = order
+ state.is_plugin = is_plugin
+ state.status = status
+ state.requires = requires
+ state.required_by = []
+ self.modules[name] = state
+ if requires and requires in self.modules:
+ if requires not in self.modules[requires].required_by:
+ self.modules[requires].required_by.append(name)
+
+ def missing_text(self, name, text):
+ """
+ Updates the preconditions state of a module
+
+ :param name: Module name
+ :param text: Module missing text
+ :return:
+ """
+ self.modules[name].text = text
+
+ def get_text(self):
+ """
+ return an string of error text
+ :return: a string of text
+ """
+ error_text = ''
+ for mod in self.modules:
+ if self.modules[mod].text:
+ error_text = error_text + self.modules[mod].text + '\n'
+ return error_text
+
+ def update_pre_conditions(self, name, status):
+ """
+ Updates the preconditions state of a module
+
+ :param name: Module name
+ :param status: Module new status
+ :return:
+ """
+ self.modules[name].pass_preconditions = status
+ if self.modules[name].is_plugin:
+ plugin = Registry().get('{mod}_plugin'.format(mod=name))
+ if status:
+ self.log_debug('Plugin {plugin} active'.format(plugin=str(plugin.name)))
+ plugin.set_status()
+ else:
+ plugin.status = PluginStatus.Disabled
+
+ def flush_preconditions(self):
+ """
+ Now all modules are loaded lets update all the preconditions.
+
+ :return:
+ """
+ for mods in self.modules:
+ for req in self.modules[mods].required_by:
+ self.modules[req].pass_preconditions = self.modules[mods].pass_preconditions
+ plugins_list = sorted(self.modules, key=lambda state: self.modules[state].order)
+ mdl = {}
+ for pl in plugins_list:
+ mdl[pl] = self.modules[pl]
+ self.modules = mdl
+
+ def is_module_active(self, name):
+ return self.modules[name].status == PluginStatus.Active
+
+ def check_preconditions(self, name):
+ """
+ Checks if a modules preconditions have been met.
+
+ :param name: Module name
+ :return: Have the preconditions been met.
+ :rtype: bool
+ """
+ if self.modules[name].requires is None:
+ return self.modules[name].pass_preconditions
+ else:
+ mod = self.modules[name].requires
+ return self.modules[mod].pass_preconditions
+
+ def list_plugins(self):
+ """
+ Return a list of plugins
+ :return: an array of plugins
+ """
+ plugins = []
+ for mod in self.modules:
+ if self.modules[mod].is_plugin:
+ plugins.append(Registry().get('{mod}_plugin'.format(mod=mod)))
+ return plugins
=== modified file 'openlp/core/ui/icons.py'
--- openlp/core/ui/icons.py 2018-10-30 19:46:55 +0000
+++ openlp/core/ui/icons.py 2019-01-27 20:26:59 +0000
@@ -79,7 +79,7 @@
'book': {'icon': 'fa.book'},
'bottom': {'icon': 'fa.angle-double-down'},
'box': {'icon': 'fa.briefcase'},
- 'clapperboard': {'icon': 'fa.chess-board'},
+ 'clapperboard': {'icon': 'fa.film'},
'clock': {'icon': 'fa.clock-o'},
'clone': {'icon': 'fa.clone'},
'close': {'icon': 'fa.times-circle-o'},
=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py 2018-10-30 19:46:55 +0000
+++ openlp/core/ui/mainwindow.py 2019-01-27 20:26:59 +0000
@@ -30,6 +30,7 @@
from PyQt5 import QtCore, QtGui, QtWidgets
+from openlp.core.state import State
from openlp.core.api import websockets
from openlp.core.api.http import server
from openlp.core.common import add_actions, is_macosx, is_win
@@ -41,23 +42,18 @@
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
from openlp.core.display.screens import ScreenList
-from openlp.core.lib.imagemanager import ImageManager
-from openlp.core.display.render import Renderer
from openlp.core.lib.plugin import PluginStatus
-from openlp.core.lib.pluginmanager import PluginManager
from openlp.core.lib.ui import create_action
from openlp.core.projectors.manager import ProjectorManager
from openlp.core.ui.aboutform import AboutForm
from openlp.core.ui.firsttimeform import FirstTimeForm
from openlp.core.ui.formattingtagform import FormattingTagForm
from openlp.core.ui.icons import UiIcons
-from openlp.core.ui.media.mediacontroller import MediaController
from openlp.core.ui.pluginform import PluginForm
from openlp.core.ui.printserviceform import PrintServiceForm
from openlp.core.ui.servicemanager import ServiceManager
from openlp.core.ui.settingsform import SettingsForm
from openlp.core.ui.shortcutlistform import ShortcutListForm
-from openlp.core.ui.slidecontroller import LiveController, PreviewController
from openlp.core.ui.style import PROGRESSBAR_STYLE, get_library_stylesheet
from openlp.core.ui.thememanager import ThemeManager
from openlp.core.version import get_version
@@ -90,9 +86,6 @@
self.control_splitter.setOrientation(QtCore.Qt.Horizontal)
self.control_splitter.setObjectName('control_splitter')
self.main_content_layout.addWidget(self.control_splitter)
- # Create slide controllers
- PreviewController(self)
- LiveController(self)
preview_visible = Settings().value('user interface/preview panel')
live_visible = Settings().value('user interface/live panel')
panel_locked = Settings().value('user interface/lock panel')
@@ -501,16 +494,11 @@
self.copy_data = False
Settings().set_up_default_values()
self.about_form = AboutForm(self)
- MediaController()
self.ws_server = websockets.WebSocketServer()
self.http_server = server.HttpServer(self)
SettingsForm(self)
self.formatting_tag_form = FormattingTagForm(self)
self.shortcut_form = ShortcutListForm(self)
- # Set up the path with plugins
- PluginManager(self)
- ImageManager()
- Renderer()
# Set up the interface
self.setup_ui(self)
# Define the media Dock Manager
@@ -660,22 +648,12 @@
self.set_view_mode(False, True, False, False, True, True)
self.mode_live_item.setChecked(True)
- def app_startup(self):
- """
- Give all the plugins a chance to perform some tasks at startup
- """
- self.application.process_events()
- for plugin in self.plugin_manager.plugins:
- if plugin.is_active():
- plugin.app_startup()
- self.application.process_events()
-
def first_time(self):
"""
Import themes if first time
"""
self.application.process_events()
- for plugin in self.plugin_manager.plugins:
+ for plugin in State().list_plugins():
if hasattr(plugin, 'first_time'):
self.application.process_events()
plugin.first_time()
@@ -713,7 +691,7 @@
self.projector_manager_dock.setVisible(True)
else:
self.projector_manager_dock.setVisible(False)
- for plugin in self.plugin_manager.plugins:
+ for plugin in State().list_plugins():
self.active_plugin = plugin
old_status = self.active_plugin.status
self.active_plugin.set_status()
@@ -880,7 +858,7 @@
setting_sections.extend([self.header_section])
setting_sections.extend(['crashreport'])
# Add plugin sections.
- setting_sections.extend([plugin.name for plugin in self.plugin_manager.plugins])
+ setting_sections.extend([plugin.name for plugin in State().list_plugins()])
# Copy the settings file to the tmp dir, because we do not want to change the original one.
temp_dir_path = Path(gettempdir(), 'openlp')
create_paths(temp_dir_path)
=== modified file 'openlp/core/ui/media/__init__.py'
--- openlp/core/ui/media/__init__.py 2018-10-27 01:40:20 +0000
+++ openlp/core/ui/media/__init__.py 2019-01-27 20:26:59 +0000
@@ -24,10 +24,6 @@
"""
import logging
-from PyQt5 import QtCore
-
-from openlp.core.common.settings import Settings
-
log = logging.getLogger(__name__ + '.__init__')
@@ -54,7 +50,7 @@
Folder = 5
-class MediaInfo(object):
+class ItemMediaInfo(object):
"""
This class hold the media related info
"""
@@ -73,39 +69,6 @@
media_type = MediaType()
-def get_media_players():
- """
- This method extracts the configured media players and overridden player
- from the settings.
- """
- log.debug('get_media_players')
- saved_players = Settings().value('media/players')
- reg_ex = QtCore.QRegExp(r'.*\[(.*)\].*')
- if Settings().value('media/override player') == QtCore.Qt.Checked:
- if reg_ex.exactMatch(saved_players):
- overridden_player = '{text}'.format(text=reg_ex.cap(1))
- else:
- overridden_player = 'auto'
- else:
- overridden_player = ''
- saved_players_list = saved_players.replace('[', '').replace(']', '').split(',') if saved_players else []
- return saved_players_list, overridden_player
-
-
-def set_media_players(players_list, overridden_player='auto'):
- """
- This method saves the configured media players and overridden player to the settings
-
- :param players_list: A list with all active media players.
- :param overridden_player: Here an special media player is chosen for all media actions.
- """
- log.debug('set_media_players')
- players = ','.join(players_list)
- if Settings().value('media/override player') == QtCore.Qt.Checked and overridden_player != 'auto':
- players = players.replace(overridden_player, '[{text}]'.format(text=overridden_player))
- Settings().setValue('media/players', players)
-
-
def parse_optical_path(input_string):
"""
Split the optical path info.
=== modified file 'openlp/core/ui/media/mediacontroller.py'
--- openlp/core/ui/media/mediacontroller.py 2018-10-02 04:39:42 +0000
+++ openlp/core/ui/media/mediacontroller.py 2019-01-27 20:26:59 +0000
@@ -25,13 +25,19 @@
"""
import datetime
import logging
-import os
-
+
+try:
+ from pymediainfo import MediaInfo
+ pymediainfo_available = True
+except ImportError:
+ pymediainfo_available = False
+
+from subprocess import check_output
from PyQt5 import QtCore, QtWidgets
+from openlp.core.state import State
from openlp.core.api.http import register_endpoint
-from openlp.core.common import extension_loader
-from openlp.core.common.i18n import UiStrings, translate
+from openlp.core.common.i18n import translate
from openlp.core.common.mixins import LogMixin, RegistryProperties
from openlp.core.common.registry import Registry, RegistryBase
from openlp.core.common.settings import Settings
@@ -39,11 +45,9 @@
from openlp.core.lib.ui import critical_error_message_box
from openlp.core.ui import DisplayControllerType
from openlp.core.ui.icons import UiIcons
-from openlp.core.ui.media import MediaInfo, MediaState, MediaType, get_media_players, parse_optical_path, \
- set_media_players
+from openlp.core.ui.media import MediaState, ItemMediaInfo, MediaType, parse_optical_path
from openlp.core.ui.media.endpoint import media_endpoint
-from openlp.core.ui.media.mediaplayer import MediaPlayer
-from openlp.core.ui.media.vendor.mediainfoWrapper import MediaInfoWrapper
+from openlp.core.ui.media.vlcplayer import VlcPlayer, get_vlc
from openlp.core.widgets.toolbar import OpenLPToolbar
@@ -63,7 +67,6 @@
super(MediaSlider, self).__init__(direction)
self.manager = manager
self.controller = controller
- self.no_matching_player = translate('MediaPlugin.MediaItem', 'File %s not supported using player %s')
def mouseMoveEvent(self, event):
"""
@@ -78,7 +81,6 @@
def mousePressEvent(self, event):
"""
Mouse Press event no new functionality
-
:param event: The triggering event
"""
QtWidgets.QSlider.mousePressEvent(self, event)
@@ -111,7 +113,9 @@
Constructor
"""
super(MediaController, self).__init__(parent)
- self.media_players = {}
+
+ def setup(self):
+ self.vlc_player = None
self.display_controllers = {}
self.current_media_players = {}
# Timer for video state
@@ -135,70 +139,40 @@
Registry().register_function('songs_hide', self.media_hide)
Registry().register_function('songs_blank', self.media_blank)
Registry().register_function('songs_unblank', self.media_unblank)
- Registry().register_function('mediaitem_media_rebuild', self._set_active_players)
Registry().register_function('mediaitem_suffixes', self._generate_extensions_lists)
register_endpoint(media_endpoint)
- def _set_active_players(self):
- """
- Set the active players and available media files
- """
- saved_players = get_media_players()[0]
- for player in list(self.media_players.keys()):
- self.media_players[player].is_active = player in saved_players
-
def _generate_extensions_lists(self):
"""
Set the active players and available media files
"""
suffix_list = []
self.audio_extensions_list = []
- for player in list(self.media_players.values()):
- if player.is_active:
- for item in player.audio_extensions_list:
- if item not in self.audio_extensions_list:
- self.audio_extensions_list.append(item)
- suffix_list.append(item[2:])
+ if self.vlc_player.is_active:
+ for item in self.vlc_player.audio_extensions_list:
+ if item not in self.audio_extensions_list:
+ self.audio_extensions_list.append(item)
+ suffix_list.append(item[2:])
self.video_extensions_list = []
- for player in list(self.media_players.values()):
- if player.is_active:
- for item in player.video_extensions_list:
- if item not in self.video_extensions_list:
- self.video_extensions_list.append(item)
- suffix_list.append(item[2:])
+ if self.vlc_player.is_active:
+ for item in self.vlc_player.video_extensions_list:
+ if item not in self.video_extensions_list:
+ self.video_extensions_list.append(item)
+ suffix_list.append(item[2:])
self.service_manager.supported_suffixes(suffix_list)
- def register_players(self, player):
- """
- Register each media Player (Webkit, Phonon, etc) and store
- for later use
-
- :param player: Individual player class which has been enabled
- """
- self.media_players[player.name] = player
-
def bootstrap_initialise(self):
"""
Check to see if we have any media Player's available.
"""
- controller_dir = os.path.join('core', 'ui', 'media')
- # Find all files that do not begin with '.' (lp:#1738047) and end with player.py
- glob_pattern = os.path.join(controller_dir, '[!.]*player.py')
- extension_loader(glob_pattern, ['mediaplayer.py'])
- player_classes = MediaPlayer.__subclasses__()
- for player_class in player_classes:
- self.register_players(player_class(self))
- if not self.media_players:
- return False
- saved_players, overridden_player = get_media_players()
- invalid_media_players = \
- [media_player for media_player in saved_players if media_player not in self.media_players or
- not self.media_players[media_player].check_available()]
- if invalid_media_players:
- for invalidPlayer in invalid_media_players:
- saved_players.remove(invalidPlayer)
- set_media_players(saved_players, overridden_player)
- self._set_active_players()
+ self.setup()
+ self.vlc_player = VlcPlayer(self)
+ State().add_service("mediacontroller", 0)
+ if get_vlc() and pymediainfo_available:
+ State().update_pre_conditions("mediacontroller", True)
+ else:
+ State().missing_text("mediacontroller", translate('OpenLP.SlideController',
+ "VLC or pymediainfo are missing, so you are unable to play any media"))
self._generate_extensions_lists()
return True
@@ -236,36 +210,6 @@
if self.display_controllers[DisplayControllerType.Preview].media_info.can_loop_playback:
self.media_play(self.display_controllers[DisplayControllerType.Preview], True)
- def get_media_display_css(self):
- """
- Add css style sheets to htmlbuilder
- """
- css = ''
- for player in list(self.media_players.values()):
- if player.is_active:
- css += player.get_media_display_css()
- return css
-
- def get_media_display_javascript(self):
- """
- Add javascript functions to htmlbuilder
- """
- js = ''
- for player in list(self.media_players.values()):
- if player.is_active:
- js += player.get_media_display_javascript()
- return js
-
- def get_media_display_html(self):
- """
- Add html code to htmlbuilder
- """
- html = ''
- for player in list(self.media_players.values()):
- if player.is_active:
- html += player.get_media_display_html()
- return html
-
def register_controller(self, controller):
"""
Registers media controls where the players will be placed to run.
@@ -281,7 +225,7 @@
:param controller: First element is the controller which should be used
"""
- controller.media_info = MediaInfo()
+ controller.media_info = ItemMediaInfo()
# Build a Media ToolBar
controller.mediabar = OpenLPToolbar(controller)
controller.mediabar.add_toolbar_action('playbackPlay', text='media_playback_play',
@@ -345,16 +289,12 @@
"""
# clean up possible running old media files
self.finalise()
- # update player status
- self._set_active_players()
display.has_audio = True
if display.is_live and preview:
return
if preview:
display.has_audio = False
- for player in list(self.media_players.values()):
- if player.is_active:
- player.setup(display)
+ self.vlc_player.setup(display)
def set_controls_visible(self, controller, value):
"""
@@ -367,8 +307,7 @@
controller.mediabar.setVisible(value)
if controller.is_live and controller.display:
if self.current_media_players and value:
- if self.current_media_players[controller.controller_type] != self.media_players['webkit']:
- controller.display.set_transparency(False)
+ controller.display.set_transparency(False)
@staticmethod
def resize(display, player):
@@ -389,16 +328,19 @@
:param hidden: The player which is doing the playing
:param video_behind_text: Is the video to be played behind text.
"""
- is_valid = False
+ is_valid = True
controller = self.display_controllers[source]
# stop running videos
self.media_reset(controller)
- controller.media_info = MediaInfo()
+ controller.media_info = ItemMediaInfo()
controller.media_info.volume = controller.volume_slider.value()
controller.media_info.is_background = video_behind_text
# background will always loop video.
controller.media_info.can_loop_playback = video_behind_text
- controller.media_info.file_info = QtCore.QFileInfo(service_item.get_frame_path())
+ if service_item.is_capable(ItemCapabilities.HasBackgroundAudio):
+ controller.media_info.file_info = service_item.background_audio
+ else:
+ controller.media_info.file_info = [service_item.get_frame_path()]
display = self._define_display(controller)
if controller.is_live:
# if this is an optical device use special handling
@@ -411,7 +353,7 @@
else:
log.debug('video is not optical and live')
controller.media_info.length = service_item.media_length
- is_valid = self._check_file_type(controller, display, service_item)
+ is_valid = self._check_file_type(controller, display)
display.override['theme'] = ''
display.override['video'] = True
if controller.media_info.is_background:
@@ -431,7 +373,7 @@
else:
log.debug('video is not optical and preview')
controller.media_info.length = service_item.media_length
- is_valid = self._check_file_type(controller, display, service_item)
+ is_valid = self._check_file_type(controller, display)
if not is_valid:
# Media could not be loaded correctly
critical_error_message_box(translate('MediaPlugin.MediaItem', 'Unsupported File'),
@@ -462,19 +404,21 @@
return True
@staticmethod
- def media_length(service_item):
+ def media_length(media_path):
"""
Uses Media Info to obtain the media length
- :param service_item: The ServiceItem containing the details to be played.
+ :param media_path: The file path to be checked..
"""
- media_info = MediaInfo()
- media_info.volume = 0
- media_info.file_info = QtCore.QFileInfo(service_item.get_frame_path())
- media_data = MediaInfoWrapper.parse(service_item.get_frame_path())
+ if MediaInfo.can_parse():
+ media_data = MediaInfo.parse(media_path)
+ else:
+ xml = check_output(['mediainfo', '-f', '--Output=XML', '--Inform=OLDXML', media_path])
+ if not xml.startswith(b'<?xml'):
+ xml = check_output(['mediainfo', '-f', '--Output=XML', media_path])
+ media_data = MediaInfo(xml.decode("utf-8"))
# duration returns in milli seconds
- service_item.set_media_length(media_data.tracks[0].duration)
- return True
+ return media_data.tracks[0].duration
def media_setup_optical(self, filename, title, audio_track, subtitle_track, start, end, display, controller):
"""
@@ -493,7 +437,7 @@
# stop running videos
self.media_reset(controller)
# Setup media info
- controller.media_info = MediaInfo()
+ controller.media_info = ItemMediaInfo()
controller.media_info.file_info = QtCore.QFileInfo(filename)
if audio_track == -1 and subtitle_track == -1:
controller.media_info.media_type = MediaType.CD
@@ -508,86 +452,49 @@
# When called from mediaitem display is None
if display is None:
display = controller.preview_display
- # Find vlc player
- used_players = get_media_players()[0]
- vlc_player = None
- for title in used_players:
- player = self.media_players[title]
- if player.name == 'vlc':
- vlc_player = player
- if vlc_player is None:
- critical_error_message_box(translate('MediaPlugin.MediaItem', 'VLC player required'),
- translate('MediaPlugin.MediaItem',
- 'VLC player required for playback of optical devices'))
- return False
- vlc_player.load(display)
- self.resize(display, vlc_player)
- self.current_media_players[controller.controller_type] = vlc_player
+ self.vlc_player.load(display)
+ self.resize(display, self.vlc_player)
+ self.current_media_players[controller.controller_type] = self.vlc_player
if audio_track == -1 and subtitle_track == -1:
controller.media_info.media_type = MediaType.CD
else:
controller.media_info.media_type = MediaType.DVD
return True
- @staticmethod
- def _get_used_players(service_item):
- """
- Find the player for a given service item
-
- :param service_item: where the information is about the media and required player
- :return: player description
- """
- used_players = get_media_players()[0]
- # If no player, we can't play
- if not used_players:
- return False
- default_player = [used_players[0]]
- if service_item.processor and service_item.processor != UiStrings().Automatic:
- # check to see if the player is usable else use the default one.
- if service_item.processor.lower() not in used_players:
- used_players = default_player
- else:
- used_players = [service_item.processor.lower()]
- return used_players
-
- def _check_file_type(self, controller, display, service_item):
+ def _check_file_type(self, controller, display):
"""
Select the correct media Player type from the prioritized Player list
:param controller: First element is the controller which should be used
:param display: Which display to use
- :param service_item: The ServiceItem containing the details to be played.
"""
- used_players = self._get_used_players(service_item)
- if controller.media_info.file_info.isFile():
- suffix = '*.%s' % controller.media_info.file_info.suffix().lower()
- for title in used_players:
- if not title:
- continue
- player = self.media_players[title]
+ for file in controller.media_info.file_info:
+ if file.is_file:
+ suffix = '*%s' % file.suffix.lower()
+ player = self.vlc_player
+ file = str(file)
if suffix in player.video_extensions_list:
if not controller.media_info.is_background or controller.media_info.is_background and \
player.can_background:
self.resize(display, player)
- if player.load(display):
+ if player.load(display, file):
self.current_media_players[controller.controller_type] = player
controller.media_info.media_type = MediaType.Video
return True
if suffix in player.audio_extensions_list:
- if player.load(display):
+ if player.load(display, file):
self.current_media_players[controller.controller_type] = player
controller.media_info.media_type = MediaType.Audio
return True
- else:
- for title in used_players:
- player = self.media_players[title]
+ else:
+ player = self.vlc_player
+ file = str(file)
if player.can_folder:
self.resize(display, player)
- if player.load(display):
+ if player.load(display, file):
self.current_media_players[controller.controller_type] = player
controller.media_info.media_type = MediaType.Video
return True
- # no valid player found
return False
def media_play_msg(self, msg, status=True):
=== modified file 'openlp/core/ui/media/mediaplayer.py'
--- openlp/core/ui/media/mediaplayer.py 2017-12-29 09:15:48 +0000
+++ openlp/core/ui/media/mediaplayer.py 2019-01-27 20:26:59 +0000
@@ -60,11 +60,12 @@
"""
pass
- def load(self, display):
+ def load(self, display, file):
"""
Load a new media file and check if it is valid
:param display: The display to be updated.
+ :param file: The file to be loaded
"""
return True
=== modified file 'openlp/core/ui/media/playertab.py'
--- openlp/core/ui/media/playertab.py 2018-09-12 05:43:27 +0000
+++ openlp/core/ui/media/playertab.py 2019-01-27 20:26:59 +0000
@@ -32,7 +32,6 @@
from openlp.core.lib.settingstab import SettingsTab
from openlp.core.lib.ui import create_button
from openlp.core.ui.icons import UiIcons
-from openlp.core.ui.media import get_media_players, set_media_players
from openlp.core.widgets.buttons import ColorButton
@@ -55,7 +54,7 @@
"""
Constructor
"""
- self.media_players = Registry().get('media_controller').media_players
+ # self.media_players = Registry().get('media_controller').media_players
self.saved_used_players = None
self.icon_path = UiIcons().player
player_translated = translate('OpenLP.PlayerTab', 'Players')
@@ -202,7 +201,7 @@
"""
if self.saved_used_players:
self.used_players = self.saved_used_players
- self.used_players = get_media_players()[0]
+ # self.used_players = get_media_players()[0]
self.saved_used_players = self.used_players
settings = Settings()
settings.beginGroup(self.settings_section)
@@ -220,13 +219,13 @@
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')
+ # 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')
def post_set_up(self, post_update=False):
"""
=== removed file 'openlp/core/ui/media/vendor/mediainfoWrapper.py'
--- openlp/core/ui/media/vendor/mediainfoWrapper.py 2018-10-30 19:46:55 +0000
+++ openlp/core/ui/media/vendor/mediainfoWrapper.py 1970-01-01 00:00:00 +0000
@@ -1,129 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
-
-###############################################################################
-# OpenLP - Open Source Lyrics Projection #
-# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2018 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; version 2 of the License. #
-# #
-# 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, write to the Free Software Foundation, Inc., 59 #
-# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-###############################################################################
-"""
-The :mod:`~openlp.core.ui.media.mediainfo` module contains code to run mediainfo on a media file and obtain
-information related to the rwquested media.
-"""
-import json
-import os
-from subprocess import check_output
-
-from bs4 import BeautifulSoup, NavigableString
-
-
-ENV_DICT = os.environ
-
-
-class Track(object):
-
- def __getattribute__(self, name):
- try:
- return object.__getattribute__(self, name)
- except Exception:
- pass
- return None
-
- def __init__(self, xml_dom_fragment):
- self.xml_dom_fragment = xml_dom_fragment
- self.track_type = xml_dom_fragment.attrs['type']
- for el in self.xml_dom_fragment.children:
- if not isinstance(el, NavigableString):
- node_name = el.name.lower().strip().strip('_')
- if node_name == 'id':
- node_name = 'track_id'
- node_value = el.string
- other_node_name = "other_%s" % node_name
- if getattr(self, node_name) is None:
- setattr(self, node_name, node_value)
- else:
- if getattr(self, other_node_name) is None:
- setattr(self, other_node_name, [node_value, ])
- else:
- getattr(self, other_node_name).append(node_value)
-
- for o in [d for d in self.__dict__.keys() if d.startswith('other_')]:
- try:
- primary = o.replace('other_', '')
- setattr(self, primary, int(getattr(self, primary)))
- except Exception:
- for v in getattr(self, o):
- try:
- current = getattr(self, primary)
- setattr(self, primary, int(v))
- getattr(self, o).append(current)
- break
- except Exception:
- pass
-
- def __repr__(self):
- return "<Track track_id='{0}', track_type='{1}'>".format(self.track_id, self.track_type)
-
- def to_data(self):
- data = {}
- for k, v in self.__dict__.items():
- if k != 'xml_dom_fragment':
- data[k] = v
- return data
-
-
-class MediaInfoWrapper(object):
-
- def __init__(self, xml):
- self.xml_dom = xml
- xml_types = (str,) # no unicode type in python3
- if isinstance(xml, xml_types):
- self.xml_dom = MediaInfoWrapper.parse_xml_data_into_dom(xml)
-
- @staticmethod
- def parse_xml_data_into_dom(xml_data):
- return BeautifulSoup(xml_data, "xml")
-
- @staticmethod
- def parse(filename, environment=ENV_DICT):
- xml = check_output(['mediainfo', '-f', '--Output=XML', '--Inform=OLDXML', filename])
- if not xml.startswith(b'<?xml'):
- xml = check_output(['mediainfo', '-f', '--Output=XML', filename])
- xml_dom = MediaInfoWrapper.parse_xml_data_into_dom(xml)
- return MediaInfoWrapper(xml_dom)
-
- def _populate_tracks(self):
- if self.xml_dom is None:
- return
- for xml_track in self.xml_dom.Mediainfo.File.find_all("track"):
- self._tracks.append(Track(xml_track))
-
- @property
- def tracks(self):
- if not hasattr(self, "_tracks"):
- self._tracks = []
- if len(self._tracks) == 0:
- self._populate_tracks()
- return self._tracks
-
- def to_data(self):
- data = {'tracks': []}
- for track in self.tracks:
- data['tracks'].append(track.to_data())
- return data
-
- def to_json(self):
- return json.dumps(self.to_data())
=== modified file 'openlp/core/ui/media/vendor/vlc.py'
--- openlp/core/ui/media/vendor/vlc.py 2018-10-02 04:39:42 +0000
+++ openlp/core/ui/media/vendor/vlc.py 2019-01-27 20:26:59 +0000
@@ -1,8 +1,9 @@
#! /usr/bin/python
+# -*- coding: utf-8 -*-
# Python ctypes bindings for VLC
#
-# Copyright (C) 2009-2012 the VideoLAN team
+# Copyright (C) 2009-2017 the VideoLAN team
# $Id: $
#
# Authors: Olivier Aubert <contact at olivieraubert.net>
@@ -27,7 +28,7 @@
U{http://wiki.videolan.org/LibVLC}.
You can find the documentation and a README file with some examples
-at U{http://www.advene.org/download/python-ctypes/}.
+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
@@ -40,16 +41,22 @@
"""
import ctypes
-import functools
+from ctypes.util import find_library
import os
import sys
-from ctypes.util import find_library
+import functools
+
# Used by EventManager in override.py
from inspect import getargspec
-
-__version__ = "N/A"
-build_date = "Mon Jan 25 19:40:05 2016"
+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,
@@ -62,6 +69,8 @@
bytes = bytes
basestring = (str, bytes)
PYTHON3 = True
+
+
def str_to_bytes(s):
"""Translate string or bytes to bytes.
"""
@@ -70,6 +79,7 @@
else:
return s
+
def bytes_to_str(b):
"""Translate bytes to string.
"""
@@ -83,6 +93,8 @@
bytes = str
basestring = basestring
PYTHON3 = False
+
+
def str_to_bytes(s):
"""Translate string or bytes to bytes.
"""
@@ -91,6 +103,7 @@
else:
return s
+
def bytes_to_str(b):
"""Translate bytes to unicode string.
"""
@@ -103,9 +116,22 @@
# instanciated.
_internal_guard = object()
+
def find_lib():
dll = None
- plugin_path = 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:
@@ -113,7 +139,8 @@
except OSError: # may fail
dll = ctypes.CDLL('libvlc.so.5')
elif sys.platform.startswith('win'):
- p = find_library('libvlc.dll')
+ libname = 'libvlc.dll'
+ p = find_library(libname)
if p is None:
try: # some registry settings
# leaner than win32api, win32con
@@ -132,22 +159,26 @@
except ImportError: # no PyWin32
pass
if plugin_path is None:
- # try some standard locations.
- for p in ('Program Files\\VideoLan\\', 'VideoLan\\',
- 'Program Files\\', ''):
- p = 'C:\\' + p + 'VLC\\libvlc.dll'
+ # 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('libvlc.dll')
- # restore cwd after dll has been loaded
+ # 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('libvlc.dll')
+ dll = ctypes.CDLL(libname)
else:
plugin_path = os.path.dirname(p)
dll = ctypes.CDLL(p)
@@ -155,13 +186,20 @@
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):
+ if os.path.exists(p) and os.path.exists(c):
+ # pre-load libvlccore VLC 2.2.8+
+ ctypes.CDLL(c)
dll = ctypes.CDLL(p)
- d += 'modules'
- if os.path.isdir(d):
- plugin_path = d
- else: # hope, some PATH is set...
+ 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:
@@ -169,20 +207,24 @@
return (dll, plugin_path)
+
# plugin_path used on win32 and MacOS in override.py
-dll, plugin_path = find_lib()
+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
+ _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.
@@ -191,6 +233,7 @@
(not reevaluated).
Adapted from https://wiki.python.org/moin/PythonDecoratorLibrary
"""
+
def __init__(self, func):
self.func = func
self._cache = {}
@@ -208,14 +251,16 @@
return self.func.__doc__
def __get__(self, obj, objtype):
- """Support instance methods.
- """
- return functools.partial(self.__call__, obj)
+ """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.
"""
@@ -224,9 +269,11 @@
_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.
"""
@@ -245,6 +292,7 @@
return f
raise NameError('no function %r' % (name,))
+
def _Cobject(cls, ctype):
"""(INTERNAL) New instance from ctypes.
"""
@@ -252,15 +300,18 @@
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.")
+ 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.
"""
@@ -273,9 +324,11 @@
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.
@@ -284,15 +337,20 @@
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):
@@ -308,24 +366,33 @@
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:
@@ -338,7 +405,7 @@
ctypes.c_char_p,
ctypes.c_char_p,
ctypes.c_char_p,
- ctypes.c_int ]
+ ctypes.c_int]
PyFile_AsFd = ctypes.pythonapi.PyObject_AsFileDescriptor
PyFile_AsFd.restype = ctypes.c_int
@@ -355,7 +422,8 @@
PyFile_AsFile.restype = FILE_ptr
PyFile_AsFile.argtypes = [ctypes.py_object]
- # Generated enum types #
+
+# Generated enum types #
class _Enum(ctypes.c_uint):
'''(INTERNAL) Base class
@@ -373,12 +441,13 @@
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) )
+ 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.
@@ -389,11 +458,51 @@
3: 'WARNING',
4: 'ERROR',
}
-LogLevel.DEBUG = LogLevel(0)
-LogLevel.ERROR = LogLevel(4)
-LogLevel.NOTICE = LogLevel(2)
+
+
+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.
'''
@@ -425,10 +534,21 @@
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',
@@ -438,6 +558,8 @@
1026: 'MediaListPlayerStopped',
0x500: 'MediaDiscovererStarted',
1281: 'MediaDiscovererEnded',
+ 1282: 'RendererDiscovererItemAdded',
+ 1283: 'RendererDiscovererItemDeleted',
0x600: 'VlmMediaAdded',
1537: 'VlmMediaRemoved',
1538: 'VlmMediaChanged',
@@ -450,57 +572,73 @@
1545: 'VlmMediaInstanceStatusEnd',
1546: 'VlmMediaInstanceStatusError',
}
-EventType.MediaDiscovererEnded = EventType(1281)
-EventType.MediaDiscovererStarted = EventType(0x500)
-EventType.MediaDurationChanged = EventType(2)
-EventType.MediaFreed = EventType(4)
-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.MediaPlayerBackward = EventType(264)
-EventType.MediaPlayerBuffering = EventType(259)
-EventType.MediaPlayerEncounteredError = EventType(266)
-EventType.MediaPlayerEndReached = EventType(265)
-EventType.MediaPlayerForward = EventType(263)
-EventType.MediaPlayerLengthChanged = EventType(273)
-EventType.MediaPlayerMediaChanged = EventType(0x100)
-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.MediaPlayerVout = EventType(274)
-EventType.MediaStateChanged = EventType(5)
-EventType.MediaSubItemAdded = EventType(1)
-EventType.MediaSubItemTreeAdded = EventType(6)
-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.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.VlmMediaInstanceStatusPause = EventType(1544)
EventType.VlmMediaInstanceStatusPlaying = EventType(1543)
-EventType.VlmMediaInstanceStopped = EventType(1540)
-EventType.VlmMediaRemoved = EventType(1537)
+EventType.VlmMediaInstanceStopped = EventType(1540)
+EventType.VlmMediaRemoved = EventType(1537)
+
class Meta(_Enum):
'''Meta data types.
@@ -529,37 +667,46 @@
20: 'Episode',
21: 'ShowName',
22: 'Actors',
+ 23: 'AlbumArtist',
+ 24: 'DiscNumber',
+ 25: 'DiscTotal',
}
-Meta.Actors = Meta(22)
-Meta.Album = Meta(4)
-Meta.Artist = Meta(1)
-Meta.ArtworkURL = Meta(15)
-Meta.Copyright = Meta(3)
-Meta.Date = Meta(8)
+
+
+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.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.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)
+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, buffering=2, playing=3, paused=4,
+idle/close=0, opening=1, playing=3, paused=4,
stopping=5, ended=6, error=7.
'''
_enum_names_ = {
@@ -572,14 +719,17 @@
6: 'Ended',
7: 'Error',
}
-State.Buffering = State(2)
-State.Ended = State(6)
-State.Error = State(7)
+
+
+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)
+State.Opening = State(1)
+State.Paused = State(4)
+State.Playing = State(3)
+State.Stopped = State(5)
+
class TrackType(_Enum):
'''N/A
@@ -590,22 +740,128 @@
1: 'video',
2: 'text',
}
-TrackType.audio = TrackType(0)
-TrackType.text = TrackType(2)
+
+
+TrackType.audio = TrackType(0)
+TrackType.text = TrackType(2)
TrackType.unknown = TrackType(-1)
-TrackType.video = TrackType(1)
-
-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)
+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.
@@ -622,17 +878,20 @@
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.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.
'''
@@ -642,12 +901,17 @@
2: 'down',
3: 'left',
4: 'right',
+ 5: 'popup',
}
+
+
NavigateMode.activate = NavigateMode(0)
-NavigateMode.down = NavigateMode(2)
-NavigateMode.left = NavigateMode(3)
-NavigateMode.right = NavigateMode(4)
-NavigateMode.up = NavigateMode(1)
+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).
@@ -664,16 +928,39 @@
7: 'left',
8: 'right',
}
-Position.bottom = Position(6)
-Position.center = Position(0)
+
+
+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)
+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}.
@@ -688,14 +975,17 @@
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.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)
+VideoLogoOption.repeat = VideoLogoOption(5)
+
class VideoAdjustOption(_Enum):
'''Option values for libvlc_video_{get,set}_adjust_{int,float,bool}.
@@ -708,13 +998,16 @@
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.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.
'''
@@ -729,15 +1022,18 @@
8: '_7_1',
10: 'SPDIF',
}
-AudioOutputDeviceTypes.Error = AudioOutputDeviceTypes(-1)
-AudioOutputDeviceTypes.Mono = AudioOutputDeviceTypes(1)
-AudioOutputDeviceTypes.SPDIF = AudioOutputDeviceTypes(10)
+
+
+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)
+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.
@@ -750,308 +1046,455 @@
4: 'Right',
5: 'Dolbys',
}
-AudioOutputChannel.Dolbys = AudioOutputChannel(5)
-AudioOutputChannel.Error = AudioOutputChannel(-1)
-AudioOutputChannel.Left = AudioOutputChannel(3)
+
+
+AudioOutputChannel.Dolbys = AudioOutputChannel(5)
+AudioOutputChannel.Error = AudioOutputChannel(-1)
+AudioOutputChannel.Left = AudioOutputChannel(3)
AudioOutputChannel.RStereo = AudioOutputChannel(2)
-AudioOutputChannel.Right = AudioOutputChannel(4)
-AudioOutputChannel.Stereo = AudioOutputChannel(1)
+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
+ """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 enum libvlc_log_level)
-\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</b> be thread-safe.
-\warning The message context pointer, the format string parameters and the
- variable arguments are only valid until the callback returns.
- """
- pass
+ @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
+ 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.
-\warning 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]
+ 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]
+ 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]
-\param lines table of scanlines count for each plane [OUT]
-\return the number of picture buffers allocated, 0 indicates failure
-\note
-For each pixels plane, the scanline pitch must be bigger than or equal to
-the number of bytes per pixel multiplied by the pixel width.
-Similarly, the number of scanlines must be bigger than of equal to
-the pixel height.
-Furthermore, we recommend that pitches and lines be multiple of 32
-to not break assumption that might be made by various optimizations
-in the video decoders, video filters and/or video converters.
+ 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]
+ @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.
-\param data data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]
-\param samples pointer to the first audio sample to play back [IN]
-\param count number of audio samples to play back
-\param pts expected play time stamp (see libvlc_delay())
+ 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.
-\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)
+ 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 (i.e. restart from pause).
-\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)
+ """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
-(i.e. discard all pending buffers and stop playback as soon as possible).
-\param data data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]
+ """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
-(i.e. wait for pending buffers to be played).
-\param data data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]
+ """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
+ @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
+ 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]
+ 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
- '''
+ 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 enum libvlc_log_level)
-\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</b> be thread-safe.
-\warning The message context pointer, the format string parameters and the
- variable arguments are only valid until the callback returns.
- '''
- VideoLockCb = ctypes.CFUNCTYPE(ctypes.c_void_p, ctypes.c_void_p, ListPOINTER(ctypes.c_void_p))
+ @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, ListPOINTER(ctypes.c_void_p))
+ 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.
-\warning 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]
- '''
+ 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), ListPOINTER(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))
+ 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]
-\param lines table of scanlines count for each plane [OUT]
-\return the number of picture buffers allocated, 0 indicates failure
-\note
-For each pixels plane, the scanline pitch must be bigger than or equal to
-the number of bytes per pixel multiplied by the pixel width.
-Similarly, the number of scanlines must be bigger than of equal to
-the pixel height.
-Furthermore, we recommend that pitches and lines be multiple of 32
-to not break assumption that might be made by various optimizations
-in the video decoders, video filters and/or video converters.
- '''
+ 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]
- '''
+ @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.
-\param data data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]
-\param samples pointer to the first audio sample to play back [IN]
-\param count number of audio samples to play back
-\param pts expected play time stamp (see libvlc_delay())
- '''
+ 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.
-\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)
- '''
+ 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 (i.e. restart from pause).
-\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)
- '''
+ 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
-(i.e. discard all pending buffers and stop playback as soon as possible).
-\param data data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]
- '''
+ 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
-(i.e. wait for pending buffers to be played).
-\param data data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]
- '''
+ 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), ListPOINTER(ctypes.c_void_p), ctypes.c_char_p, ctypes.POINTER(ctypes.c_uint), ctypes.POINTER(ctypes.c_uint))
+ @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
- '''
+ 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]
- '''
+ 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
+
+
+# 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),
+ ('name', ctypes.c_char_p),
('description', ctypes.c_char_p),
- ('next', ctypes.POINTER(AudioOutput)),
- ]
+ ('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),
+ ('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):
@@ -1061,47 +1504,52 @@
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),
+ ('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),
+ ('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 ),
+ ('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_ = [
@@ -1111,87 +1559,98 @@
('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),
- ]
+ ('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),
+ ('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
+ 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
+ BottomLeft = 9
+ BottomRight = 10
+
def __init__(self, *unused):
raise TypeError('constants only')
- def __setattr__(self, *unused): #PYCHOK expected
+
+ def __setattr__(self, *unused): # PYCHOK expected
raise TypeError('immutable constants')
+
class Rectangle(_Cstruct):
_fields_ = [
- ('top', ctypes.c_int),
- ('left', ctypes.c_int),
+ ('top', ctypes.c_int),
+ ('left', ctypes.c_int),
('bottom', ctypes.c_int),
- ('right', 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 ),
+ ('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).
@@ -1210,48 +1669,53 @@
return r
+
class EventUnion(ctypes.Union):
_fields_ = [
- ('meta_type', ctypes.c_uint ),
- ('new_child', ctypes.c_uint ),
+ ('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 ),
+ ('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_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 ),
+ ('filename', ctypes.c_char_p),
+ ('new_length', ctypes.c_longlong),
+ ('media_event', MediaEvent),
]
+
class Event(_Cstruct):
_fields_ = [
- ('type', EventType ),
+ ('type', EventType),
('object', ctypes.c_void_p),
- ('u', EventUnion ),
+ ('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),
+ ('name', ctypes.c_char_p),
('shortname', ctypes.c_char_p),
- ('longname', ctypes.c_char_p),
- ('help', ctypes.c_char_p),
- ('next', ctypes.POINTER(ModuleDescription)),
- ]
+ ('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).
@@ -1266,33 +1730,75 @@
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 ),
+ ('device', ctypes.c_char_p),
('description', ctypes.c_char_p),
- ]
+]
+
class TitleDescription(_Cstruct):
- _fields = [
+ _fields_ = [
('duration', ctypes.c_longlong),
('name', ctypes.c_char_p),
('menu', ctypes.c_bool),
]
+
class ChapterDescription(_Cstruct):
- _fields = [
+ _fields_ = [
('time_offset', ctypes.c_longlong),
('duration', ctypes.c_longlong),
('name', ctypes.c_char_p),
]
- # End of header.py #
-
+
+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.
@@ -1308,7 +1814,7 @@
@note: Only a single notification can be registered
for each event type in an EventManager instance.
-
+
'''
_callback_handler = None
@@ -1316,7 +1822,8 @@
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.")
+ 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):
@@ -1336,12 +1843,13 @@
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
+ # 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.
@@ -1350,12 +1858,13 @@
method since ctypes does not prepend self as the
first parameter, hence this closure.
"""
- try: # retrieve Python callback and arguments
+ try: # retrieve Python callback and arguments
call, args, kwds = self._callbacks[k]
- # deref event.contents to simplify callback code
+ # deref event.contents to simplify callback code
call(event.contents, *args, **kwds)
except KeyError: # detached?
pass
+
self._callback_handler = _callback_handler
self._callbacks = {}
@@ -1375,9 +1884,10 @@
k = eventtype.value
if k in self._callbacks:
- del self._callbacks[k] # remove, regardless of libvlc return value
+ 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.
@@ -1385,7 +1895,7 @@
- a string
- a list of strings as first parameters
- the parameters given as the constructor parameters (must be strings)
-
+
'''
def __new__(cls, *args):
@@ -1398,16 +1908,24 @@
elif isinstance(i, basestring):
args = i.strip().split()
elif isinstance(i, _Seqs):
- args = i
+ args = list(i)
else:
raise VLCException('Instance %r' % (args,))
-
- if not args and plugin_path is not None:
- # no parameters passed, for win32 and MacOS,
- # specify the plugin_path if detected earlier
- args = ['vlc', '--plugin-path=' + plugin_path]
+ 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 ]
+ args = [str_to_bytes(a) for a in args]
return libvlc_new(len(args), args)
def media_player_new(self, uri=None):
@@ -1482,9 +2000,9 @@
i = head
while i:
i = i.contents
- d = [{'id': libvlc_audio_output_device_id (self, i.name, d),
+ 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))]
+ 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)
@@ -1502,22 +2020,18 @@
"""
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.
@@ -1525,7 +2039,6 @@
'''
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.
@@ -1535,7 +2048,6 @@
'''
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}().
@@ -1546,18 +2058,18 @@
'''
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 for a LibVLC instance. This is rarely needed:
- the callback is implicitly unset when the instance is destroyed.
- This function will wait for any pending callbacks invocation to complete
- (causing a deadlock if called from within the callback).
+ '''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, data, p_instance):
+ 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.
@@ -1565,9 +2077,8 @@
@param p_instance: libvlc instance.
@version: LibVLC 2.1.0 or later.
'''
- return libvlc_log_set(self, data, p_instance)
+ 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}()).
@@ -1575,105 +2086,41 @@
'''
return libvlc_log_set_file(self, stream)
-
- 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_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 media_discoverer_new_from_name(self, psz_name):
- '''Discover media service by name.
- @param psz_name: service name.
+ 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.
- '''
- return libvlc_media_discoverer_new_from_name(self, str_to_bytes(psz_name))
-
-
+ @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 audio_output_list_get(self):
- '''Gets the list of available audio output modules.
- @return: list of available audio outputs. It must be freed it 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 psz_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 it 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))
-
-
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.
@@ -1685,9 +2132,9 @@
@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)
+ 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.
@@ -1698,9 +2145,9 @@
@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))
+ 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.
@@ -1708,7 +2155,6 @@
'''
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.
@@ -1717,7 +2163,6 @@
'''
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.
@@ -1726,7 +2171,6 @@
'''
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.
@@ -1736,7 +2180,6 @@
'''
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.
@@ -1745,7 +2188,6 @@
'''
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.
@@ -1754,7 +2196,6 @@
'''
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.
@@ -1763,7 +2204,6 @@
'''
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.
@@ -1776,9 +2216,9 @@
@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)
+ 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.
@@ -1786,7 +2226,6 @@
'''
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.
@@ -1794,7 +2233,6 @@
'''
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.
@@ -1802,7 +2240,6 @@
'''
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.
@@ -1811,7 +2248,6 @@
'''
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.
@@ -1826,7 +2262,6 @@
'''
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.
@@ -1835,7 +2270,6 @@
'''
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.
@@ -1844,7 +2278,6 @@
'''
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.
@@ -1853,7 +2286,6 @@
'''
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.
@@ -1862,7 +2294,6 @@
'''
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.
@@ -1872,7 +2303,6 @@
'''
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.
@@ -1882,7 +2312,6 @@
'''
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.
@@ -1900,13 +2329,219 @@
'''
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):
@@ -1946,11 +2581,16 @@
"""
mediaTrack_pp = ctypes.POINTER(MediaTrack)()
n = libvlc_media_tracks_get(self, ctypes.byref(mediaTrack_pp))
- info = ctypes.cast(ctypes.mediaTrack_pp, ctypes.POINTER(ctypes.POINTER(MediaTrack) * n))
- return info
-
-
-
+ 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
@@ -1967,7 +2607,6 @@
'''
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
@@ -1983,15 +2622,13 @@
'''
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 (libvlc_media_t). Use
+ '''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
@@ -2001,35 +2638,28 @@
'''
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.
- This methods automatically calls L{parse_async}(), so after calling
- it you may receive a libvlc_MediaMetaChanged event. If you prefer a synchronous
- version ensure that you call L{parse}() before get_meta().
See L{parse}
- See L{parse_async}
+ 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).
@@ -2038,26 +2668,21 @@
'''
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 defined in libvlc_structures.c ( libvlc_NothingSpecial=0,
- libvlc_Opening, libvlc_Buffering, libvlc_Playing, libvlc_Paused,
- libvlc_Stopped, libvlc_Ended,
- libvlc_Error).
- See libvlc_state_t.
+ '''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).
@@ -2065,7 +2690,6 @@
'''
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
@@ -2082,71 +2706,164 @@
'''
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) meta data and tracks information.
+ This fetches (local) art, meta data and tracks information.
The method is synchronous.
- See L{parse_async}
+ \deprecated This function could block indefinitely.
+ Use L{parse_with_options}() instead
+ See L{parse_with_options}
See L{get_meta}
- See libvlc_media_get_tracks_info.
+ See L{get_tracks_info}.
'''
return libvlc_media_parse(self)
-
def parse_async(self):
'''Parse a media.
- This fetches (local) meta data and tracks information.
+ 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 libvlc_media_get_tracks_info.
+ See L{get_tracks_info}.
'''
return libvlc_media_parse_async(self)
-
def is_parsed(self):
- '''Get Parsed status for media descriptor object.
+ '''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 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_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
'''
@@ -2155,41 +2872,60 @@
'''(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 localized_name(self):
- '''Get media service discover object its localized name.
- @return: localized name.
- '''
- return libvlc_media_discoverer_localized_name(self)
-
-
def media_list(self):
'''Get media service discover media list.
@return: list of media items.
'''
return libvlc_media_discoverer_media_list(self)
- @memoize_parameterless
- def event_manager(self):
- '''Get event manager from media service discover object.
- @return: event manager object.
- '''
- return libvlc_media_discoverer_event_manager(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
'''
@@ -2198,7 +2934,7 @@
'''(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,
@@ -2206,7 +2942,6 @@
'''
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
@@ -2214,27 +2949,26 @@
'''
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):
@@ -2250,10 +2984,10 @@
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.
@@ -2262,20 +2996,16 @@
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.
@@ -2284,7 +3014,6 @@
'''
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.
@@ -2293,7 +3022,6 @@
'''
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.
@@ -2303,7 +3031,6 @@
'''
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.
@@ -2312,7 +3039,6 @@
'''
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.
@@ -2323,7 +3049,6 @@
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.
@@ -2339,7 +3064,6 @@
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.
@@ -2349,20 +3073,17 @@
'''
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.
@@ -2377,13 +3098,14 @@
'''
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):
@@ -2401,10 +3123,8 @@
def get_instance(self):
"""Return the associated Instance.
"""
- return self._instance #PYCHOK expected
-
-
-
+ 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
@@ -2414,7 +3134,6 @@
'''
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.
@@ -2428,47 +3147,53 @@
'''
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: libvlc_state_t for 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.
@@ -2483,7 +3208,6 @@
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.
@@ -2491,46 +3215,43 @@
'''
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:]
@@ -2545,7 +3266,7 @@
def get_instance(self):
"""Return the associated Instance.
"""
- return self._instance #PYCHOK expected
+ return self._instance # PYCHOK expected
def set_mrl(self, mrl, *options):
"""Set the MRL to play.
@@ -2596,19 +3317,31 @@
'''
titleDescription_pp = ctypes.POINTER(TitleDescription)()
n = libvlc_media_player_get_full_title_descriptions(self, ctypes.byref(titleDescription_pp))
- info = ctypes.cast(ctypes.titleDescription_pp, ctypes.POINTER(ctypes.POINTER(TitleDescription) * n))
- return info
+ 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 index: of the title to query for chapters.
- @return: the chapter list
+ @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(ctypes.chapterDescription_pp, ctypes.POINTER(ctypes.POINTER(ChapterDescription) * n))
- return info
+ 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).
@@ -2627,13 +3360,13 @@
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.
@@ -2672,8 +3405,40 @@
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
@@ -2683,14 +3448,12 @@
'''
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.
@@ -2698,7 +3461,6 @@
'''
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.
@@ -2712,21 +3474,18 @@
'''
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.
@@ -2734,24 +3493,52 @@
'''
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).
@@ -2760,7 +3547,6 @@
'''
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}(),
@@ -2774,7 +3560,6 @@
'''
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}().
@@ -2784,70 +3569,61 @@
'''
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:
- @begincode
+ @code.m
\@protocol VLCOpenGLVideoViewEmbedding <NSObject>
- (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 Qt4 see the QMacCocoaViewContainer. Then
+ If you want to use it along with Qt see the QMacCocoaViewContainer. Then
the following code should work:
- @begincode
-
+ @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_agl(self, drawable):
- '''Set the agl handler where the media player should render its video output.
- @param drawable: the agl handler.
- '''
- return libvlc_media_player_set_agl(self, drawable)
-
-
- def get_agl(self):
- '''Get the agl handler previously set with L{set_agl}().
- @return: the agl handler or 0 if none where set.
- '''
- return libvlc_media_player_get_agl(self)
-
-
def set_xwindow(self, drawable):
'''Set an X Window System drawable where the media player should render its
- video output. If LibVLC was built without X11 output support, then this has
- no effects.
- The specified identifier must correspond to an existing Input/Output class
- X11 window. Pixmaps are B{not} supported. The caller shall ensure that
- the X11 server is the same as the one the VLC instance has been configured
- with. This function must be called before video playback is started;
- otherwise it will only take effect after playback stop and restart.
- @param drawable: the ID of the X window.
+ 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
@@ -2857,7 +3633,6 @@
'''
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
@@ -2866,11 +3641,27 @@
'''
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):
- '''Set callbacks and private data for decoded audio.
+ '''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).
@@ -2881,7 +3672,6 @@
'''
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}().
@@ -2892,19 +3682,17 @@
'''
return libvlc_audio_set_volume_callback(self, set_volume)
-
def audio_set_format_callbacks(self, setup, cleanup):
- '''Set decoded audio format. This only works in combination with
- L{audio_set_callbacks}().
+ '''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):
- '''Set decoded audio format.
+ '''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").
@@ -2914,21 +3702,18 @@
'''
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.
@@ -2936,14 +3721,12 @@
'''
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.
@@ -2952,35 +3735,30 @@
'''
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.
@@ -2988,40 +3766,34 @@
'''
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
@@ -3030,7 +3802,6 @@
'''
return libvlc_media_player_get_rate(self)
-
def set_rate(self, rate):
'''Set movie play rate.
@param rate: movie play rate to set.
@@ -3038,42 +3809,30 @@
'''
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 libvlc_state_t.
+ @return: the current state of the media player (playing, paused, ...) See L{State}.
'''
return libvlc_media_player_get_state(self)
-
- def get_fps(self):
- '''Get movie fps rate.
- @return: frames per second (fps) for this playing movie, or 0 if unspecified.
- '''
- return libvlc_media_player_get_fps(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.
@@ -3081,13 +3840,11 @@
'''
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.
@@ -3095,7 +3852,6 @@
'''
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.
@@ -3104,7 +3860,18 @@
'''
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
@@ -3112,7 +3879,6 @@
'''
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
@@ -3125,14 +3891,12 @@
'''
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
@@ -3146,7 +3910,6 @@
'''
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
@@ -3157,7 +3920,6 @@
'''
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}().
@@ -3165,7 +3927,6 @@
'''
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
@@ -3176,35 +3937,40 @@
'''
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).
@@ -3212,15 +3978,6 @@
'''
return libvlc_video_set_spu(self, i_spu)
-
- def video_set_subtitle_file(self, psz_subtitle):
- '''Set new video subtitle file.
- @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 video_get_spu_delay(self):
'''Get the current subtitle delay. Positive values means subtitles are being
displayed later, negative values earlier.
@@ -3229,7 +3986,6 @@
'''
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,
@@ -3241,55 +3997,45 @@
'''
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.
+ '''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.
- @param i_page: teletex page number requested.
+ 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 toggle_teletext(self):
- '''Toggle teletext transparent status on video output.
- '''
- return libvlc_toggle_teletext(self)
-
-
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).
@@ -3297,41 +4043,36 @@
'''
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 where to save the screenshot to.
+ @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)
@@ -3341,7 +4082,6 @@
'''
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.
@@ -3349,82 +4089,73 @@
'''
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 libvlc_video_logo_option_t.
+ @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 libvlc_video_logo_option_t.
+ @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 libvlc_video_logo_option_t.
+ @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 libvlc_video_adjust_option_t.
+ @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 libvlc_video_adjust_option_t.
+ @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 libvlc_video_adjust_option_t.
+ @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 libvlc_video_adjust_option_t.
+ @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 succeded, -1 on error.
+ @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}().
@@ -3434,12 +4165,11 @@
@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 it with L{audio_output_device_list_release}().
+ @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
@@ -3467,34 +4197,46 @@
'''
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).
@@ -3502,21 +4244,18 @@
'''
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).
@@ -3524,22 +4263,19 @@
'''
return libvlc_audio_set_track(self, i_track)
-
def audio_get_channel(self):
'''Get current audio channel.
- @return: the audio channel See libvlc_audio_output_channel_t.
+ @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 libvlc_audio_output_channel_t.
+ @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).
@@ -3547,7 +4283,6 @@
'''
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).
@@ -3556,7 +4291,6 @@
'''
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
@@ -3579,20 +4313,22 @@
'''
return libvlc_media_player_set_equalizer(self, p_equalizer)
-
- # LibVLC __version__ functions #
-
-def libvlc_errmsg():
- '''A human-readable error message for the last LibVLC error in the calling
- thread. The resulting string is valid until another error occurs (at least
- until the next LibVLC call).
- @warning
- This will be None if there was no error.
- '''
- f = _Cfunctions.get('libvlc_errmsg', None) or \
- _Cfunction('libvlc_errmsg', (), None,
- ctypes.c_char_p)
- return f()
+ 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.
@@ -3601,9 +4337,10 @@
'''
f = _Cfunctions.get('libvlc_clearerr', None) or \
_Cfunction('libvlc_clearerr', (), None,
- 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.
@@ -3613,13 +4350,42 @@
'''
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)
+ 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.
@@ -3627,9 +4393,10 @@
'''
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))
+ 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.
@@ -3637,9 +4404,10 @@
'''
f = _Cfunctions.get('libvlc_release', None) or \
_Cfunction('libvlc_release', ((1,),), None,
- None, Instance)
+ 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.
@@ -3647,9 +4415,10 @@
'''
f = _Cfunctions.get('libvlc_retain', None) or \
_Cfunction('libvlc_retain', ((1,),), None,
- None, Instance)
+ 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.
@@ -3658,9 +4427,10 @@
'''
f = _Cfunctions.get('libvlc_add_intf', None) or \
_Cfunction('libvlc_add_intf', ((1,), (1,),), None,
- ctypes.c_int, Instance, ctypes.c_char_p)
+ 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.
@@ -3671,9 +4441,10 @@
'''
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)
+ 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}().
@@ -3685,9 +4456,10 @@
'''
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)
+ 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".
@@ -3695,9 +4467,10 @@
'''
f = _Cfunctions.get('libvlc_get_version', None) or \
_Cfunction('libvlc_get_version', (), None,
- ctypes.c_char_p)
+ 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)".
@@ -3705,9 +4478,10 @@
'''
f = _Cfunctions.get('libvlc_get_compiler', None) or \
_Cfunction('libvlc_get_compiler', (), None,
- ctypes.c_char_p)
+ ctypes.c_char_p)
return f()
+
def libvlc_get_changeset():
'''Retrieve libvlc changeset.
Example: "aa9bce0bc4".
@@ -3715,9 +4489,10 @@
'''
f = _Cfunctions.get('libvlc_get_changeset', None) or \
_Cfunction('libvlc_get_changeset', (), None,
- ctypes.c_char_p)
+ 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
@@ -3726,9 +4501,10 @@
'''
f = _Cfunctions.get('libvlc_free', None) or \
_Cfunction('libvlc_free', ((1,),), None,
- None, ctypes.c_void_p)
+ 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.
@@ -3739,9 +4515,10 @@
'''
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)
+ 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.
@@ -3751,21 +4528,26 @@
'''
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)
+ 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)
+ ctypes.c_char_p, ctypes.c_uint)
return f(event_type)
+
def libvlc_log_get_context(ctx):
- '''Gets debugging information about a log message: the name of the VLC module
- emitting the message and the message location within the source code.
+ '''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).
@@ -3774,14 +4556,18 @@
'''
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))
+ 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 VLC object 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.
+ '''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.
@@ -3793,23 +4579,28 @@
'''
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))
+ 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 for a LibVLC instance. This is rarely needed:
- the callback is implicitly unset when the instance is destroyed.
- This function will wait for any pending callbacks invocation to complete
- (causing a deadlock if called from within the callback).
+ '''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)
+ None, Instance)
return f(p_instance)
-def libvlc_log_set(cb, data, 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.
@@ -3820,8 +4611,9 @@
'''
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(cb, data, p_instance)
+ 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.
@@ -3831,18 +4623,20 @@
'''
f = _Cfunctions.get('libvlc_log_set_file', None) or \
_Cfunction('libvlc_log_set_file', ((1,), (1,),), None,
- None, Instance, FILE_ptr)
+ 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))
+ 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.
@@ -3850,9 +4644,10 @@
'''
f = _Cfunctions.get('libvlc_audio_filter_list_get', None) or \
_Cfunction('libvlc_audio_filter_list_get', ((1,),), None,
- ctypes.POINTER(ModuleDescription), Instance)
+ 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.
@@ -3860,9 +4655,10 @@
'''
f = _Cfunctions.get('libvlc_video_filter_list_get', None) or \
_Cfunction('libvlc_video_filter_list_get', ((1,),), None,
- ctypes.POINTER(ModuleDescription), Instance)
+ 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
@@ -3873,9 +4669,572 @@
'''
f = _Cfunctions.get('libvlc_clock', None) or \
_Cfunction('libvlc_clock', (), None,
- ctypes.c_int64)
+ 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.
@@ -3890,9 +5249,10 @@
'''
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)
+ 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}.
@@ -3902,9 +5262,10 @@
'''
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)
+ 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).
@@ -3926,9 +5287,27 @@
'''
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)
+ 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}.
@@ -3938,9 +5317,10 @@
'''
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)
+ 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
@@ -3958,9 +5338,10 @@
'''
f = _Cfunctions.get('libvlc_media_add_option', None) or \
_Cfunction('libvlc_media_add_option', ((1,), (1,),), None,
- None, Media, ctypes.c_char_p)
+ 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
@@ -3977,20 +5358,22 @@
'''
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)
+ 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 (libvlc_media_t). Use
+ '''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)
+ 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
@@ -4001,9 +5384,10 @@
'''
f = _Cfunctions.get('libvlc_media_release', None) or \
_Cfunction('libvlc_media_release', ((1,),), None,
- None, Media)
+ 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.
@@ -4011,26 +5395,25 @@
'''
f = _Cfunctions.get('libvlc_media_get_mrl', None) or \
_Cfunction('libvlc_media_get_mrl', ((1,),), string_result,
- ctypes.c_void_p, Media)
+ 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)
+ 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.
- This methods automatically calls L{libvlc_media_parse_async}(), so after calling
- it you may receive a libvlc_MediaMetaChanged event. If you prefer a synchronous
- version ensure that you call L{libvlc_media_parse}() before get_meta().
See L{libvlc_media_parse}
- See L{libvlc_media_parse_async}
+ See L{libvlc_media_parse_with_options}
See libvlc_MediaMetaChanged.
@param p_md: the media descriptor.
@param e_meta: the meta to read.
@@ -4038,9 +5421,10 @@
'''
f = _Cfunctions.get('libvlc_media_get_meta', None) or \
_Cfunction('libvlc_media_get_meta', ((1,), (1,),), string_result,
- ctypes.c_void_p, Media, Meta)
+ 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).
@@ -4050,9 +5434,10 @@
'''
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)
+ 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.
@@ -4060,24 +5445,24 @@
'''
f = _Cfunctions.get('libvlc_media_save_meta', None) or \
_Cfunction('libvlc_media_save_meta', ((1,),), None,
- ctypes.c_int, Media)
+ 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 defined in libvlc_structures.c ( libvlc_NothingSpecial=0,
- libvlc_Opening, libvlc_Buffering, libvlc_Playing, libvlc_Paused,
- libvlc_Stopped, libvlc_Ended,
- libvlc_Error).
- See libvlc_state_t.
+ '''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)
+ 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.
@@ -4086,9 +5471,10 @@
'''
f = _Cfunctions.get('libvlc_media_get_stats', None) or \
_Cfunction('libvlc_media_get_stats', ((1,), (1,),), None,
- ctypes.c_int, Media, ctypes.POINTER(MediaStats))
+ 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
@@ -4098,9 +5484,10 @@
'''
f = _Cfunctions.get('libvlc_media_subitems', None) or \
_Cfunction('libvlc_media_subitems', ((1,),), class_result(MediaList),
- ctypes.c_void_p, Media)
+ 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.
@@ -4109,9 +5496,10 @@
'''
f = _Cfunctions.get('libvlc_media_event_manager', None) or \
_Cfunction('libvlc_media_event_manager', ((1,),), class_result(EventManager),
- ctypes.c_void_p, Media)
+ 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.
@@ -4119,52 +5507,66 @@
'''
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(p_md):
- '''Parse a media.
- This fetches (local) meta data and tracks information.
- The method is synchronous.
- See L{libvlc_media_parse_async}
- See L{libvlc_media_get_meta}
- See 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) meta data and tracks information.
- The method is the asynchronous of L{libvlc_media_parse}().
+ 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 the media was already parsed you will not receive this
- event.
- See L{libvlc_media_parse}
+ 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 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)
+ 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_is_parsed(p_md):
+
+def libvlc_media_get_parsed_status(p_md):
'''Get Parsed status for media descriptor object.
- See libvlc_MediaParsedChanged.
+ See libvlc_MediaParsedChanged
+ See L{MediaParsedStatus}.
@param p_md: media descriptor object.
- @return: true if media object has been parsed otherwise it returns false \libvlc_return_bool.
+ @return: a value of the L{MediaParsedStatus} enum.
+ @version: LibVLC 3.0.0 or later.
'''
- f = _Cfunctions.get('libvlc_media_is_parsed', None) or \
- _Cfunction('libvlc_media_is_parsed', ((1,),), None,
- ctypes.c_int, Media)
+ 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
@@ -4174,9 +5576,10 @@
'''
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)
+ 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
@@ -4185,9 +5588,10 @@
'''
f = _Cfunctions.get('libvlc_media_get_user_data', None) or \
_Cfunction('libvlc_media_get_user_data', ((1,),), None,
- ctypes.c_void_p, Media)
+ 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
@@ -4200,9 +5604,23 @@
'''
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)))
+ 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.
@@ -4211,121 +5629,254 @@
'''
f = _Cfunctions.get('libvlc_media_tracks_release', None) or \
_Cfunction('libvlc_media_tracks_release', ((1,), (1,),), None,
- None, ctypes.POINTER(MediaTrack), ctypes.c_uint)
+ None, ctypes.POINTER(MediaTrack), ctypes.c_uint)
return f(p_tracks, i_count)
-def libvlc_media_discoverer_new_from_name(p_inst, psz_name):
- '''Discover media service by name.
+
+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.
+ @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_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)
+ 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_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_localized_name(p_mdis):
- '''Get media service discover object its localized name.
- @param p_mdis: media discover object.
- @return: localized name.
- '''
- 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_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_event_manager(p_mdis):
- '''Get event manager from media service discover object.
- @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_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_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_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.
@@ -4334,27 +5885,30 @@
'''
f = _Cfunctions.get('libvlc_media_list_new', None) or \
_Cfunction('libvlc_media_list_new', ((1,),), class_result(MediaList),
- ctypes.c_void_p, Instance)
+ 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)
+ 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)
+ 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.
@@ -4364,9 +5918,10 @@
'''
f = _Cfunctions.get('libvlc_media_list_set_media', None) or \
_Cfunction('libvlc_media_list_set_media', ((1,), (1,),), None,
- None, MediaList, Media)
+ 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.
@@ -4376,9 +5931,10 @@
'''
f = _Cfunctions.get('libvlc_media_list_media', None) or \
_Cfunction('libvlc_media_list_media', ((1,),), class_result(Media),
- ctypes.c_void_p, MediaList)
+ 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.
@@ -4388,9 +5944,10 @@
'''
f = _Cfunctions.get('libvlc_media_list_add_media', None) or \
_Cfunction('libvlc_media_list_add_media', ((1,), (1,),), None,
- ctypes.c_int, MediaList, Media)
+ 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.
@@ -4401,9 +5958,10 @@
'''
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)
+ 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.
@@ -4413,9 +5971,10 @@
'''
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)
+ 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.
@@ -4424,9 +5983,10 @@
'''
f = _Cfunctions.get('libvlc_media_list_count', None) or \
_Cfunction('libvlc_media_list_count', ((1,),), None,
- ctypes.c_int, MediaList)
+ 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.
@@ -4436,9 +5996,10 @@
'''
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)
+ 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.
@@ -4449,9 +6010,10 @@
'''
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)
+ 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.
@@ -4459,18 +6021,20 @@
'''
f = _Cfunctions.get('libvlc_media_list_is_readonly', None) or \
_Cfunction('libvlc_media_list_is_readonly', ((1,),), None,
- ctypes.c_int, MediaList)
+ 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)
+ 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.
@@ -4478,9 +6042,10 @@
'''
f = _Cfunctions.get('libvlc_media_list_unlock', None) or \
_Cfunction('libvlc_media_list_unlock', ((1,),), None,
- None, MediaList)
+ 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.
@@ -4489,170 +6054,401 @@
'''
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)
+ ctypes.c_void_p, MediaList)
return f(p_ml)
-def libvlc_media_list_player_new(p_instance):
- '''Create new media_list_player.
+
+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: media list player instance or None on error.
+ @return: an unique pointer 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)
+ f = _Cfunctions.get('libvlc_log_open', None) or \
+ _Cfunction('libvlc_log_open', ((1,),), None,
+ Log_ptr, 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_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_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: libvlc_state_t 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)
+
+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.
@@ -4661,9 +6457,10 @@
'''
f = _Cfunctions.get('libvlc_media_player_new', None) or \
_Cfunction('libvlc_media_player_new', ((1,),), class_result(MediaPlayer),
- ctypes.c_void_p, Instance)
+ 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.
@@ -4671,9 +6468,10 @@
'''
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)
+ 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
@@ -4684,9 +6482,10 @@
'''
f = _Cfunctions.get('libvlc_media_player_release', None) or \
_Cfunction('libvlc_media_player_release', ((1,),), None,
- None, MediaPlayer)
+ 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.
@@ -4694,9 +6493,10 @@
'''
f = _Cfunctions.get('libvlc_media_player_retain', None) or \
_Cfunction('libvlc_media_player_retain', ((1,),), None,
- None, MediaPlayer)
+ 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.
@@ -4705,9 +6505,10 @@
'''
f = _Cfunctions.get('libvlc_media_player_set_media', None) or \
_Cfunction('libvlc_media_player_set_media', ((1,), (1,),), None,
- None, MediaPlayer, Media)
+ 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.
@@ -4715,9 +6516,10 @@
'''
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)
+ 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.
@@ -4725,9 +6527,10 @@
'''
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)
+ 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.
@@ -4735,9 +6538,10 @@
'''
f = _Cfunctions.get('libvlc_media_player_is_playing', None) or \
_Cfunction('libvlc_media_player_is_playing', ((1,),), None,
- ctypes.c_int, MediaPlayer)
+ ctypes.c_int, MediaPlayer)
return f(p_mi)
+
def libvlc_media_player_play(p_mi):
'''Play.
@param p_mi: the Media Player.
@@ -4745,9 +6549,10 @@
'''
f = _Cfunctions.get('libvlc_media_player_play', None) or \
_Cfunction('libvlc_media_player_play', ((1,),), None,
- ctypes.c_int, MediaPlayer)
+ 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.
@@ -4756,32 +6561,71 @@
'''
f = _Cfunctions.get('libvlc_media_player_set_pause', None) or \
_Cfunction('libvlc_media_player_set_pause', ((1,), (1,),), None,
- None, MediaPlayer, ctypes.c_int)
+ 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)
+ 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)
+ 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).
@@ -4791,9 +6635,10 @@
'''
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)
+ 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}(),
@@ -4808,9 +6653,10 @@
'''
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)
+ 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}().
@@ -4821,30 +6667,31 @@
'''
f = _Cfunctions.get('libvlc_video_set_format_callbacks', None) or \
_Cfunction('libvlc_video_set_format_callbacks', ((1,), (1,), (1,),), None,
- None, MediaPlayer, VideoFormatCb, VideoCleanupCb)
+ 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:
- @begincode
+ @code.m
\@protocol VLCOpenGLVideoViewEmbedding <NSObject>
- (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 Qt4 see the QMacCocoaViewContainer. Then
+ If you want to use it along with Qt see the QMacCocoaViewContainer. Then
the following code should work:
- @begincode
-
+ @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.
@@ -4852,9 +6699,10 @@
'''
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)
+ 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.
@@ -4862,46 +6710,37 @@
'''
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_agl(p_mi, drawable):
- '''Set the agl handler where the media player should render its video output.
- @param p_mi: the Media Player.
- @param drawable: the agl handler.
- '''
- 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):
- '''Get the agl handler previously set with L{libvlc_media_player_set_agl}().
- @param p_mi: the Media Player.
- @return: the agl handler or 0 if none where set.
- '''
- 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)
+ 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. If LibVLC was built without X11 output support, then this has
- no effects.
- The specified identifier must correspond to an existing Input/Output class
- X11 window. Pixmaps are B{not} supported. The caller shall ensure that
- the X11 server is the same as the one the VLC instance has been configured
- with. This function must be called before video playback is started;
- otherwise it will only take effect after playback stop and restart.
- @param p_mi: the Media Player.
- @param drawable: the ID of the X window.
+ 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)
+ 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
@@ -4912,9 +6751,10 @@
'''
f = _Cfunctions.get('libvlc_media_player_get_xwindow', None) or \
_Cfunction('libvlc_media_player_get_xwindow', ((1,),), None,
- ctypes.c_uint32, MediaPlayer)
+ 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
@@ -4924,9 +6764,10 @@
'''
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)
+ 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
@@ -4936,13 +6777,41 @@
'''
f = _Cfunctions.get('libvlc_media_player_get_hwnd', None) or \
_Cfunction('libvlc_media_player_get_hwnd', ((1,),), None,
- ctypes.c_void_p, MediaPlayer)
+ 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):
- '''Set callbacks and private data for decoded audio.
+ '''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).
@@ -4954,9 +6823,11 @@
'''
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)
+ 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}().
@@ -4968,12 +6839,13 @@
'''
f = _Cfunctions.get('libvlc_audio_set_volume_callback', None) or \
_Cfunction('libvlc_audio_set_volume_callback', ((1,), (1,),), None,
- None, MediaPlayer, AudioSetVolumeCb)
+ None, MediaPlayer, AudioSetVolumeCb)
return f(mp, set_volume)
+
def libvlc_audio_set_format_callbacks(mp, setup, cleanup):
- '''Set decoded audio format. This only works in combination with
- L{libvlc_audio_set_callbacks}().
+ '''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).
@@ -4981,11 +6853,12 @@
'''
f = _Cfunctions.get('libvlc_audio_set_format_callbacks', None) or \
_Cfunction('libvlc_audio_set_format_callbacks', ((1,), (1,), (1,),), None,
- None, MediaPlayer, AudioSetupCb, AudioCleanupCb)
+ None, MediaPlayer, AudioSetupCb, AudioCleanupCb)
return f(mp, setup, cleanup)
+
def libvlc_audio_set_format(mp, format, rate, channels):
- '''Set decoded audio format.
+ '''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.
@@ -4996,9 +6869,10 @@
'''
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)
+ 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.
@@ -5006,9 +6880,10 @@
'''
f = _Cfunctions.get('libvlc_media_player_get_length', None) or \
_Cfunction('libvlc_media_player_get_length', ((1,),), None,
- ctypes.c_longlong, MediaPlayer)
+ 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.
@@ -5016,9 +6891,10 @@
'''
f = _Cfunctions.get('libvlc_media_player_get_time', None) or \
_Cfunction('libvlc_media_player_get_time', ((1,),), None,
- ctypes.c_longlong, MediaPlayer)
+ 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.
@@ -5027,9 +6903,10 @@
'''
f = _Cfunctions.get('libvlc_media_player_set_time', None) or \
_Cfunction('libvlc_media_player_set_time', ((1,), (1,),), None,
- None, MediaPlayer, ctypes.c_longlong)
+ 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.
@@ -5037,9 +6914,10 @@
'''
f = _Cfunctions.get('libvlc_media_player_get_position', None) or \
_Cfunction('libvlc_media_player_get_position', ((1,),), None,
- ctypes.c_float, MediaPlayer)
+ 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.
@@ -5049,9 +6927,10 @@
'''
f = _Cfunctions.get('libvlc_media_player_set_position', None) or \
_Cfunction('libvlc_media_player_set_position', ((1,), (1,),), None,
- None, MediaPlayer, ctypes.c_float)
+ 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.
@@ -5059,9 +6938,10 @@
'''
f = _Cfunctions.get('libvlc_media_player_set_chapter', None) or \
_Cfunction('libvlc_media_player_set_chapter', ((1,), (1,),), None,
- None, MediaPlayer, ctypes.c_int)
+ 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.
@@ -5069,9 +6949,10 @@
'''
f = _Cfunctions.get('libvlc_media_player_get_chapter', None) or \
_Cfunction('libvlc_media_player_get_chapter', ((1,),), None,
- ctypes.c_int, MediaPlayer)
+ 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.
@@ -5079,9 +6960,10 @@
'''
f = _Cfunctions.get('libvlc_media_player_get_chapter_count', None) or \
_Cfunction('libvlc_media_player_get_chapter_count', ((1,),), None,
- ctypes.c_int, MediaPlayer)
+ 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.
@@ -5089,9 +6971,10 @@
'''
f = _Cfunctions.get('libvlc_media_player_will_play', None) or \
_Cfunction('libvlc_media_player_will_play', ((1,),), None,
- ctypes.c_int, MediaPlayer)
+ 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.
@@ -5100,9 +6983,10 @@
'''
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)
+ 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.
@@ -5110,9 +6994,10 @@
'''
f = _Cfunctions.get('libvlc_media_player_set_title', None) or \
_Cfunction('libvlc_media_player_set_title', ((1,), (1,),), None,
- None, MediaPlayer, ctypes.c_int)
+ 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.
@@ -5120,9 +7005,10 @@
'''
f = _Cfunctions.get('libvlc_media_player_get_title', None) or \
_Cfunction('libvlc_media_player_get_title', ((1,),), None,
- ctypes.c_int, MediaPlayer)
+ 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.
@@ -5130,27 +7016,30 @@
'''
f = _Cfunctions.get('libvlc_media_player_get_title_count', None) or \
_Cfunction('libvlc_media_player_get_title_count', ((1,),), None,
- ctypes.c_int, MediaPlayer)
+ 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)
+ 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)
+ 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
@@ -5160,9 +7049,10 @@
'''
f = _Cfunctions.get('libvlc_media_player_get_rate', None) or \
_Cfunction('libvlc_media_player_get_rate', ((1,),), None,
- ctypes.c_float, MediaPlayer)
+ 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.
@@ -5171,28 +7061,20 @@
'''
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)
+ 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 libvlc_state_t.
+ @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)
+ State, MediaPlayer)
return f(p_mi)
-def libvlc_media_player_get_fps(p_mi):
- '''Get movie fps rate.
- @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_has_vout(p_mi):
'''How many video outputs does this media player have?
@@ -5201,9 +7083,10 @@
'''
f = _Cfunctions.get('libvlc_media_player_has_vout', None) or \
_Cfunction('libvlc_media_player_has_vout', ((1,),), None,
- ctypes.c_uint, MediaPlayer)
+ 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.
@@ -5211,9 +7094,10 @@
'''
f = _Cfunctions.get('libvlc_media_player_is_seekable', None) or \
_Cfunction('libvlc_media_player_is_seekable', ((1,),), None,
- ctypes.c_int, MediaPlayer)
+ 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.
@@ -5221,9 +7105,10 @@
'''
f = _Cfunctions.get('libvlc_media_player_can_pause', None) or \
_Cfunction('libvlc_media_player_can_pause', ((1,),), None,
- ctypes.c_int, MediaPlayer)
+ 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.
@@ -5232,18 +7117,20 @@
'''
f = _Cfunctions.get('libvlc_media_player_program_scrambled', None) or \
_Cfunction('libvlc_media_player_program_scrambled', ((1,),), None,
- ctypes.c_int, MediaPlayer)
+ 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)
+ None, MediaPlayer)
return f(p_mi)
+
def libvlc_media_player_navigate(p_mi, navigate):
'''Navigate through DVD Menu.
@param p_mi: the Media Player.
@@ -5252,9 +7139,10 @@
'''
f = _Cfunctions.get('libvlc_media_player_navigate', None) or \
_Cfunction('libvlc_media_player_navigate', ((1,), (1,),), None,
- None, MediaPlayer, ctypes.c_uint)
+ 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.
@@ -5264,18 +7152,37 @@
'''
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)
+ 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))
+ 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
@@ -5284,9 +7191,10 @@
'''
f = _Cfunctions.get('libvlc_toggle_fullscreen', None) or \
_Cfunction('libvlc_toggle_fullscreen', ((1,),), None,
- None, MediaPlayer)
+ 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
@@ -5300,9 +7208,10 @@
'''
f = _Cfunctions.get('libvlc_set_fullscreen', None) or \
_Cfunction('libvlc_set_fullscreen', ((1,), (1,),), None,
- None, MediaPlayer, ctypes.c_int)
+ 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.
@@ -5310,9 +7219,10 @@
'''
f = _Cfunctions.get('libvlc_get_fullscreen', None) or \
_Cfunction('libvlc_get_fullscreen', ((1,),), None,
- ctypes.c_int, MediaPlayer)
+ 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
@@ -5327,9 +7237,10 @@
'''
f = _Cfunctions.get('libvlc_video_set_key_input', None) or \
_Cfunction('libvlc_video_set_key_input', ((1,), (1,),), None,
- None, MediaPlayer, ctypes.c_uint)
+ 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
@@ -5341,9 +7252,10 @@
'''
f = _Cfunctions.get('libvlc_video_set_mouse_input', None) or \
_Cfunction('libvlc_video_set_mouse_input', ((1,), (1,),), None,
- None, MediaPlayer, ctypes.c_uint)
+ 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.
@@ -5352,9 +7264,11 @@
'''
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))
+ 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,
@@ -5373,9 +7287,10 @@
'''
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))
+ 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}().
@@ -5384,9 +7299,10 @@
'''
f = _Cfunctions.get('libvlc_video_get_scale', None) or \
_Cfunction('libvlc_video_get_scale', ((1,),), None,
- ctypes.c_float, MediaPlayer)
+ 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
@@ -5398,9 +7314,10 @@
'''
f = _Cfunctions.get('libvlc_video_set_scale', None) or \
_Cfunction('libvlc_video_set_scale', ((1,), (1,),), None,
- None, MediaPlayer, ctypes.c_float)
+ 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.
@@ -5408,9 +7325,10 @@
'''
f = _Cfunctions.get('libvlc_video_get_aspect_ratio', None) or \
_Cfunction('libvlc_video_get_aspect_ratio', ((1,),), string_result,
- ctypes.c_void_p, MediaPlayer)
+ 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.
@@ -5418,9 +7336,36 @@
'''
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)
+ 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.
@@ -5428,9 +7373,10 @@
'''
f = _Cfunctions.get('libvlc_video_get_spu', None) or \
_Cfunction('libvlc_video_get_spu', ((1,),), None,
- ctypes.c_int, MediaPlayer)
+ 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.
@@ -5438,19 +7384,21 @@
'''
f = _Cfunctions.get('libvlc_video_get_spu_count', None) or \
_Cfunction('libvlc_video_get_spu_count', ((1,),), None,
- ctypes.c_int, MediaPlayer)
+ 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.
+ @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)
+ 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.
@@ -5459,19 +7407,9 @@
'''
f = _Cfunctions.get('libvlc_video_set_spu', None) or \
_Cfunction('libvlc_video_set_spu', ((1,), (1,),), None,
- ctypes.c_int, MediaPlayer, ctypes.c_int)
+ ctypes.c_int, MediaPlayer, ctypes.c_int)
return f(p_mi, i_spu)
-def libvlc_video_set_subtitle_file(p_mi, psz_subtitle):
- '''Set new video subtitle file.
- @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_video_get_spu_delay(p_mi):
'''Get the current subtitle delay. Positive values means subtitles are being
@@ -5482,9 +7420,10 @@
'''
f = _Cfunctions.get('libvlc_video_get_spu_delay', None) or \
_Cfunction('libvlc_video_get_spu_delay', ((1,),), None,
- ctypes.c_int64, MediaPlayer)
+ 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,
@@ -5497,29 +7436,60 @@
'''
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)
+ ctypes.c_int, MediaPlayer, ctypes.c_int64)
return f(p_mi, i_delay)
-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.
- '''
- 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.
- '''
- 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_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.
@@ -5528,9 +7498,10 @@
'''
f = _Cfunctions.get('libvlc_video_get_crop_geometry', None) or \
_Cfunction('libvlc_video_get_crop_geometry', ((1,),), string_result,
- ctypes.c_void_p, MediaPlayer)
+ 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.
@@ -5538,37 +7509,34 @@
'''
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)
+ None, MediaPlayer, ctypes.c_char_p)
return f(p_mi, psz_geometry)
+
def libvlc_video_get_teletext(p_mi):
- '''Get current teletext page requested.
+ '''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)
+ 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.
+ @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)
+ None, MediaPlayer, ctypes.c_int)
return f(p_mi, i_page)
-def libvlc_toggle_teletext(p_mi):
- '''Toggle teletext transparent status on video output.
- @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_video_get_track_count(p_mi):
'''Get number of available video tracks.
@@ -5577,19 +7545,21 @@
'''
f = _Cfunctions.get('libvlc_video_get_track_count', None) or \
_Cfunction('libvlc_video_get_track_count', ((1,),), None,
- ctypes.c_int, MediaPlayer)
+ 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.
+ @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)
+ ctypes.POINTER(TrackDescription), MediaPlayer)
return f(p_mi)
+
def libvlc_video_get_track(p_mi):
'''Get current video track.
@param p_mi: media player.
@@ -5597,9 +7567,10 @@
'''
f = _Cfunctions.get('libvlc_video_get_track', None) or \
_Cfunction('libvlc_video_get_track', ((1,),), None,
- ctypes.c_int, MediaPlayer)
+ 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.
@@ -5608,25 +7579,27 @@
'''
f = _Cfunctions.get('libvlc_video_set_track', None) or \
_Cfunction('libvlc_video_set_track', ((1,), (1,),), None,
- ctypes.c_int, MediaPlayer, ctypes.c_int)
+ 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 where to save the screenshot to.
+ @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)
+ 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.
@@ -5634,9 +7607,10 @@
'''
f = _Cfunctions.get('libvlc_video_set_deinterlace', None) or \
_Cfunction('libvlc_video_set_deinterlace', ((1,), (1,),), None,
- None, MediaPlayer, ctypes.c_char_p)
+ 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.
@@ -5644,9 +7618,10 @@
'''
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)
+ 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.
@@ -5654,9 +7629,10 @@
'''
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)
+ 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)
@@ -5667,9 +7643,10 @@
'''
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)
+ 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.
@@ -5678,127 +7655,138 @@
'''
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)
+ 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 libvlc_video_logo_option_t.
+ @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)
+ 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 libvlc_video_logo_option_t.
+ @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)
+ 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 libvlc_video_logo_option_t.
+ @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)
+ 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 libvlc_video_adjust_option_t.
+ @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)
+ 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 libvlc_video_adjust_option_t.
+ @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)
+ 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 libvlc_video_adjust_option_t.
+ @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)
+ 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 libvlc_video_adjust_option_t.
+ @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)
+ 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 it with In case of error, None is returned.
+ @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)
+ 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))
+ 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 succeded, -1 on error.
+ @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)
+ 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}().
@@ -5809,14 +7797,15 @@
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 it with L{libvlc_audio_output_device_list_release}().
+ @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)
+ 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}().
@@ -5828,15 +7817,16 @@
some circumstances. By default, it is recommended to not specify any
explicit audio device.
@param p_instance: libvlc instance.
- @param psz_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 it with L{libvlc_audio_output_device_list_release}().
+ @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)
+ 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.
@@ -5844,9 +7834,10 @@
'''
f = _Cfunctions.get('libvlc_audio_output_device_list_release', None) or \
_Cfunction('libvlc_audio_output_device_list_release', ((1,),), None,
- None, ctypes.POINTER(AudioOutputDevice))
+ 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
@@ -5875,18 +7866,42 @@
'''
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)
+ 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)
+ None, MediaPlayer)
return f(p_mi)
+
def libvlc_audio_get_mute(p_mi):
'''Get current mute status.
@param p_mi: media player.
@@ -5894,9 +7909,10 @@
'''
f = _Cfunctions.get('libvlc_audio_get_mute', None) or \
_Cfunction('libvlc_audio_get_mute', ((1,),), None,
- ctypes.c_int, MediaPlayer)
+ ctypes.c_int, MediaPlayer)
return f(p_mi)
+
def libvlc_audio_set_mute(p_mi, status):
'''Set mute status.
@param p_mi: media player.
@@ -5904,9 +7920,10 @@
'''
f = _Cfunctions.get('libvlc_audio_set_mute', None) or \
_Cfunction('libvlc_audio_set_mute', ((1,), (1,),), None,
- None, MediaPlayer, ctypes.c_int)
+ 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.
@@ -5914,9 +7931,10 @@
'''
f = _Cfunctions.get('libvlc_audio_get_volume', None) or \
_Cfunction('libvlc_audio_get_volume', ((1,),), None,
- ctypes.c_int, MediaPlayer)
+ 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.
@@ -5925,9 +7943,10 @@
'''
f = _Cfunctions.get('libvlc_audio_set_volume', None) or \
_Cfunction('libvlc_audio_set_volume', ((1,), (1,),), None,
- ctypes.c_int, MediaPlayer, ctypes.c_int)
+ 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.
@@ -5935,19 +7954,21 @@
'''
f = _Cfunctions.get('libvlc_audio_get_track_count', None) or \
_Cfunction('libvlc_audio_get_track_count', ((1,),), None,
- ctypes.c_int, MediaPlayer)
+ 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.
+ @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)
+ ctypes.POINTER(TrackDescription), MediaPlayer)
return f(p_mi)
+
def libvlc_audio_get_track(p_mi):
'''Get current audio track.
@param p_mi: media player.
@@ -5955,9 +7976,10 @@
'''
f = _Cfunctions.get('libvlc_audio_get_track', None) or \
_Cfunction('libvlc_audio_get_track', ((1,),), None,
- ctypes.c_int, MediaPlayer)
+ 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.
@@ -5966,30 +7988,33 @@
'''
f = _Cfunctions.get('libvlc_audio_set_track', None) or \
_Cfunction('libvlc_audio_set_track', ((1,), (1,),), None,
- ctypes.c_int, MediaPlayer, ctypes.c_int)
+ 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 libvlc_audio_output_channel_t.
+ @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)
+ 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 libvlc_audio_output_channel_t.
+ @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)
+ 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.
@@ -5998,9 +8023,10 @@
'''
f = _Cfunctions.get('libvlc_audio_get_delay', None) or \
_Cfunction('libvlc_audio_get_delay', ((1,),), None,
- ctypes.c_int64, MediaPlayer)
+ 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.
@@ -6010,9 +8036,10 @@
'''
f = _Cfunctions.get('libvlc_audio_set_delay', None) or \
_Cfunction('libvlc_audio_set_delay', ((1,), (1,),), None,
- ctypes.c_int, MediaPlayer, ctypes.c_int64)
+ 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.
@@ -6020,9 +8047,10 @@
'''
f = _Cfunctions.get('libvlc_audio_equalizer_get_preset_count', None) or \
_Cfunction('libvlc_audio_equalizer_get_preset_count', (), None,
- ctypes.c_uint)
+ 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
@@ -6033,9 +8061,10 @@
'''
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)
+ 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.
@@ -6043,9 +8072,10 @@
'''
f = _Cfunctions.get('libvlc_audio_equalizer_get_band_count', None) or \
_Cfunction('libvlc_audio_equalizer_get_band_count', (), None,
- ctypes.c_uint)
+ 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
@@ -6056,9 +8086,10 @@
'''
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)
+ 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
@@ -6070,9 +8101,10 @@
'''
f = _Cfunctions.get('libvlc_audio_equalizer_new', None) or \
_Cfunction('libvlc_audio_equalizer_new', (), None,
- ctypes.c_void_p)
+ 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.
@@ -6086,9 +8118,10 @@
'''
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)
+ 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
@@ -6099,9 +8132,10 @@
'''
f = _Cfunctions.get('libvlc_audio_equalizer_release', None) or \
_Cfunction('libvlc_audio_equalizer_release', ((1,),), None,
- None, ctypes.c_void_p)
+ 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
@@ -6114,9 +8148,10 @@
'''
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)
+ 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.
@@ -6125,9 +8160,10 @@
'''
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)
+ 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
@@ -6141,9 +8177,10 @@
'''
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)
+ 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.
@@ -6153,9 +8190,10 @@
'''
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)
+ 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
@@ -6179,322 +8217,243 @@
'''
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)
+ ctypes.c_int, MediaPlayer, ctypes.c_void_p)
return f(p_mi, p_equalizer)
-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)
-
-
-# 4 function(s) blacklisted:
+
+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
-# 28 function(s) not wrapped as methods:
+# 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
@@ -6508,20 +8467,46 @@
# 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_errmsg
+# 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 #
@@ -6531,6 +8516,7 @@
"""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'):
@@ -6548,9 +8534,10 @@
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 ]
+ # 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):
@@ -6558,7 +8545,10 @@
'''
t = [int(i) for i in v.split('.')]
if len(t) == 3:
- t.append(0)
+ 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:
@@ -6568,14 +8558,16 @@
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__.split('-')[-1])
+ return _dot2int(__version__)
except (NameError, ValueError):
return 0
+
def libvlc_hex_version():
"""Return the libvlc version in hex or 0 if unavailable.
"""
@@ -6595,14 +8587,16 @@
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)
@@ -6613,11 +8607,15 @@
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,
@@ -6625,8 +8623,9 @@
player.get_position() * 100))
sys.stdout.flush()
+
def print_version():
- """Print libvlc 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()))
@@ -6636,27 +8635,29 @@
except:
print('Error: %s' % sys.exc_info()[1])
- if sys.argv[1:] and sys.argv[1] not in ('-h', '--help'):
-
- movie = os.path.expanduser(sys.argv[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)
- instance = Instance("--sub-source marq")
+ # 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 NameError:
- print('NameError: %s (%s vs LibVLC %s)' % (sys.exc_info()[1],
- __version__,
- libvlc_get_version()))
+ 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 <http://www.videolan.org/doc/play-howto/en/ch04.html>
+ # Instance() call above, see <http://www.videolan.org/doc/play-howto/en/ch04.html>
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)
@@ -6675,13 +8676,15 @@
# 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.MediaPlayerEndReached, end_callback)
event_manager.event_attach(EventType.MediaPlayerPositionChanged, pos_callback, player)
+
def mspf():
- """Milliseconds per frame."""
+ """Milliseconds per frame"""
return int(1000 // (player.get_fps() or 25))
+
def print_info():
"""Print information about the media"""
try:
@@ -6697,26 +8700,31 @@
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()
+ # 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:')
@@ -6725,15 +8733,18 @@
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,
@@ -6745,7 +8756,7 @@
'p': toggle_echo_position,
'q': quit_app,
'?': print_help,
- }
+ }
print('Press q to quit, ? to get help.%s' % os.linesep)
while True:
@@ -6754,11 +8765,11 @@
if k in keybindings:
keybindings[k]()
elif k.isdigit():
- # jump to fraction of the movie.
- player.set_position(float('0.'+k))
+ # jump to fraction of the movie.
+ player.set_position(float('0.' + k))
else:
- print('Usage: %s <movie_filename>' % sys.argv[0])
+ print('Usage: %s [options] <movie_filename>' % sys.argv[0])
print('Once launched, type ? for help.')
print('')
print_version()
=== modified file 'openlp/core/ui/media/vlcplayer.py'
--- openlp/core/ui/media/vlcplayer.py 2018-10-30 19:46:55 +0000
+++ openlp/core/ui/media/vlcplayer.py 2019-01-27 20:26:59 +0000
@@ -82,7 +82,7 @@
# 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 desgin) in PyInstaller. SetDllDirectoryW original value is restored once
+ # 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
@@ -197,19 +197,19 @@
"""
return get_vlc() is not None
- def load(self, display):
+ def load(self, display, file):
"""
Load a video into VLC
:param display: The display where the media is
+ :param file: file to be played
:return:
"""
vlc = get_vlc()
log.debug('load vid in Vlc Controller')
controller = display.controller
volume = controller.media_info.volume
- file_path = str(controller.media_info.file_info.absoluteFilePath())
- path = os.path.normcase(file_path)
+ path = os.path.normcase(file)
# create the media
if controller.media_info.media_type == MediaType.CD:
if is_win():
=== modified file 'openlp/core/ui/pluginform.py'
--- openlp/core/ui/pluginform.py 2018-10-02 04:39:42 +0000
+++ openlp/core/ui/pluginform.py 2019-01-27 20:26:59 +0000
@@ -26,6 +26,7 @@
from PyQt5 import QtCore, QtWidgets
+from openlp.core.state import State
from openlp.core.common.i18n import translate
from openlp.core.common.mixins import RegistryProperties
from openlp.core.lib.plugin import PluginStatus
@@ -46,7 +47,7 @@
super(PluginForm, self).__init__(parent, QtCore.Qt.WindowSystemMenuHint | QtCore.Qt.WindowTitleHint |
QtCore.Qt.WindowCloseButtonHint)
self.active_plugin = None
- self.programatic_change = False
+ self.programmatic_change = False
self.setup_ui(self)
self.load()
self._clear_details()
@@ -59,30 +60,31 @@
Load the plugin details into the screen
"""
self.plugin_list_widget.clear()
- self.programatic_change = True
+ self.programmatic_change = True
self._clear_details()
- self.programatic_change = True
+ self.programmatic_change = True
plugin_list_width = 0
- for plugin in self.plugin_manager.plugins:
- item = QtWidgets.QListWidgetItem(self.plugin_list_widget)
- # We do this just to make 100% sure the status is an integer as
- # sometimes when it's loaded from the config, it isn't cast to int.
- plugin.status = int(plugin.status)
- # Set the little status text in brackets next to the plugin name.
- if plugin.status == PluginStatus.Disabled:
- status_text = translate('OpenLP.PluginForm', '{name} (Disabled)')
- elif plugin.status == PluginStatus.Active:
- status_text = translate('OpenLP.PluginForm', '{name} (Active)')
- else:
- # PluginStatus.Inactive
- status_text = translate('OpenLP.PluginForm', '{name} (Inactive)')
- item.setText(status_text.format(name=plugin.name_strings['singular']))
- # If the plugin has an icon, set it!
- if plugin.icon:
- item.setIcon(plugin.icon)
- self.plugin_list_widget.addItem(item)
- plugin_list_width = max(plugin_list_width, self.fontMetrics().width(
- translate('OpenLP.PluginForm', '{name} (Inactive)').format(name=plugin.name_strings['singular'])))
+ for plugin in State().list_plugins():
+ if plugin:
+ item = QtWidgets.QListWidgetItem(self.plugin_list_widget)
+ # We do this just to make 100% sure the status is an integer as
+ # sometimes when it's loaded from the config, it isn't cast to int.
+ plugin.status = int(plugin.status)
+ # Set the little status text in brackets next to the plugin name.
+ if plugin.status == PluginStatus.Disabled:
+ status_text = translate('OpenLP.PluginForm', '{name} (Disabled)')
+ elif plugin.status == PluginStatus.Active:
+ status_text = translate('OpenLP.PluginForm', '{name} (Active)')
+ else:
+ # PluginStatus.Inactive
+ status_text = translate('OpenLP.PluginForm', '{name} (Inactive)')
+ item.setText(status_text.format(name=plugin.name_strings['singular']))
+ # If the plugin has an icon, set it!
+ if plugin.icon:
+ item.setIcon(plugin.icon)
+ self.plugin_list_widget.addItem(item)
+ plugin_list_width = max(plugin_list_width, self.fontMetrics().width(
+ translate('OpenLP.PluginForm', '{name} (Inactive)').format(name=plugin.name_strings['singular'])))
self.plugin_list_widget.setFixedWidth(plugin_list_width + self.plugin_list_widget.iconSize().width() + 48)
def _clear_details(self):
@@ -99,14 +101,14 @@
"""
log.debug('PluginStatus: {status}'.format(status=str(self.active_plugin.status)))
self.about_text_browser.setHtml(self.active_plugin.about())
- self.programatic_change = True
+ self.programmatic_change = True
if self.active_plugin.status != PluginStatus.Disabled:
self.status_checkbox.setChecked(self.active_plugin.status == PluginStatus.Active)
self.status_checkbox.setEnabled(True)
else:
self.status_checkbox.setChecked(False)
self.status_checkbox.setEnabled(False)
- self.programatic_change = False
+ self.programmatic_change = False
def on_plugin_list_widget_selection_changed(self):
"""
@@ -117,7 +119,7 @@
return
plugin_name_singular = self.plugin_list_widget.currentItem().text().split('(')[0][:-1]
self.active_plugin = None
- for plugin in self.plugin_manager.plugins:
+ for plugin in State().list_plugins():
if plugin.name_strings['singular'] == plugin_name_singular:
self.active_plugin = plugin
break
@@ -130,7 +132,7 @@
"""
If the status of a plugin is altered, apply the change
"""
- if self.programatic_change or self.active_plugin is None:
+ if self.programmatic_change or self.active_plugin is None:
return
if status:
self.application.set_busy_cursor()
=== modified file 'openlp/core/ui/settingsform.py'
--- openlp/core/ui/settingsform.py 2018-10-30 19:46:55 +0000
+++ openlp/core/ui/settingsform.py 2019-01-27 20:26:59 +0000
@@ -26,6 +26,7 @@
from PyQt5 import QtCore, QtWidgets
+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
@@ -37,7 +38,6 @@
from openlp.core.ui.themestab import ThemesTab
from openlp.core.ui.media.playertab import PlayerTab
from openlp.core.ui.settingsdialog import Ui_SettingsDialog
-from openlp.core.ui.themestab import ThemesTab
log = logging.getLogger(__name__)
@@ -62,7 +62,6 @@
self.themes_tab = None
self.projector_tab = None
self.advanced_tab = None
- self.player_tab = None
self.api_tab = None
def exec(self):
@@ -79,10 +78,11 @@
self.insert_tab(self.advanced_tab)
self.insert_tab(self.screens_tab)
self.insert_tab(self.themes_tab)
+ self.insert_tab(self.advanced_tab)
self.insert_tab(self.player_tab)
self.insert_tab(self.projector_tab)
self.insert_tab(self.api_tab)
- for plugin in self.plugin_manager.plugins:
+ for plugin in State().list_plugins():
if plugin.settings_tab:
self.insert_tab(plugin.settings_tab, plugin.is_active())
self.setting_list_widget.setCurrentRow(0)
@@ -160,7 +160,7 @@
self.themes_tab = ThemesTab(self)
self.projector_tab = ProjectorTab(self)
self.advanced_tab = AdvancedTab(self)
- self.player_tab = PlayerTab(self)
+ # self.player_tab = PlayerTab(self)
self.api_tab = ApiTab(self)
self.screens_tab = ScreensTab(self)
except Exception as e:
@@ -169,9 +169,8 @@
self.general_tab.post_set_up()
self.themes_tab.post_set_up()
self.advanced_tab.post_set_up()
- self.player_tab.post_set_up()
self.api_tab.post_set_up()
- for plugin in self.plugin_manager.plugins:
+ for plugin in State().list_plugins():
if plugin.settings_tab:
plugin.settings_tab.post_set_up()
=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py 2018-12-01 05:54:20 +0000
+++ openlp/core/ui/slidecontroller.py 2019-01-27 20:26:59 +0000
@@ -49,13 +49,6 @@
# Threshold which has to be trespassed to toggle.
HIDE_MENU_THRESHOLD = 27
-AUDIO_TIME_LABEL_STYLESHEET = 'background-color: palette(background); ' \
- 'border-top-color: palette(shadow); ' \
- 'border-left-color: palette(shadow); ' \
- 'border-bottom-color: palette(light); ' \
- 'border-right-color: palette(light); ' \
- 'border-radius: 3px; border-style: inset; ' \
- 'border-width: 1; font-family: monospace; margin: 2px;'
NARROW_MENU = [
'hide_menu'
@@ -65,10 +58,6 @@
'loop_separator',
'delay_spin_box'
]
-AUDIO_LIST = [
- 'audioPauseItem',
- 'audio_time_label'
-]
WIDE_MENU = [
'blank_screen_button',
'theme_screen_button',
@@ -114,6 +103,7 @@
SlideController is the slide controller widget. This widget is what the
user uses to control the displaying of verses/slides/etc on the screen.
"""
+
def __init__(self, *args, **kwargs):
"""
Set up the Slide Controller.
@@ -336,33 +326,6 @@
self.song_menu.setPopupMode(QtWidgets.QToolButton.InstantPopup)
self.song_menu.setMenu(QtWidgets.QMenu(translate('OpenLP.SlideController', 'Go To'), self.toolbar))
self.toolbar.add_toolbar_widget(self.song_menu)
- # Stuff for items with background audio.
- # FIXME: object name should be changed. But this requires that we migrate the shortcut.
- self.audio_pause_item = self.toolbar.add_toolbar_action(
- 'audioPauseItem',
- icon=UiIcons().pause, text=translate('OpenLP.SlideController', 'Pause Audio'),
- tooltip=translate('OpenLP.SlideController', 'Pause audio.'),
- checked=False, visible=False, category=self.category, context=QtCore.Qt.WindowShortcut,
- can_shortcuts=True, triggers=self.set_audio_pause_clicked)
- self.audio_menu = QtWidgets.QMenu(translate('OpenLP.SlideController', 'Background Audio'), self.toolbar)
- self.audio_pause_item.setMenu(self.audio_menu)
- self.audio_pause_item.setParent(self.toolbar)
- self.toolbar.widgetForAction(self.audio_pause_item).setPopupMode(QtWidgets.QToolButton.MenuButtonPopup)
- self.next_track_item = create_action(self, 'nextTrackItem', text=UiStrings().NextTrack,
- icon=UiIcons().arrow_right,
- tooltip=translate('OpenLP.SlideController',
- 'Go to next audio track.'),
- category=self.category,
- can_shortcuts=True,
- triggers=self.on_next_track_clicked)
- self.audio_menu.addAction(self.next_track_item)
- self.track_menu = self.audio_menu.addMenu(translate('OpenLP.SlideController', 'Tracks'))
- self.audio_time_label = QtWidgets.QLabel(' 00:00 ', self.toolbar)
- self.audio_time_label.setAlignment(QtCore.Qt.AlignCenter | QtCore.Qt.AlignHCenter)
- self.audio_time_label.setStyleSheet(AUDIO_TIME_LABEL_STYLESHEET)
- self.audio_time_label.setObjectName('audio_time_label')
- self.toolbar.add_toolbar_widget(self.audio_time_label)
- self.toolbar.set_widget_visible(AUDIO_LIST, False)
self.toolbar.set_widget_visible('song_menu', False)
# Screen preview area
self.preview_frame = QtWidgets.QFrame(self.splitter)
@@ -370,7 +333,7 @@
self.preview_frame.setMinimumHeight(100)
self.preview_frame.setSizePolicy(QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Ignored,
QtWidgets.QSizePolicy.Ignored,
- QtWidgets.QSizePolicy.Label))
+ QtWidgets.QSizePolicy.Label))
self.preview_frame.setFrameShape(QtWidgets.QFrame.StyledPanel)
self.preview_frame.setFrameShadow(QtWidgets.QFrame.Sunken)
self.preview_frame.setObjectName('preview_frame')
@@ -393,7 +356,7 @@
{'key': 'C', 'configurable': True, 'text': translate('OpenLP.SlideController', 'Go to "Chorus"')},
{'key': 'B', 'configurable': True, 'text': translate('OpenLP.SlideController', 'Go to "Bridge"')},
{'key': 'P', 'configurable': True,
- 'text': translate('OpenLP.SlideController', 'Go to "Pre-Chorus"')},
+ 'text': translate('OpenLP.SlideController', 'Go to "Pre-Chorus"')},
{'key': 'I', 'configurable': True, 'text': translate('OpenLP.SlideController', 'Go to "Intro"')},
{'key': 'E', 'configurable': True, 'text': translate('OpenLP.SlideController', 'Go to "Ending"')},
{'key': 'O', 'configurable': True, 'text': translate('OpenLP.SlideController', 'Go to "Other"')}
@@ -459,6 +422,7 @@
This empty class is mostly just to satisfy Python, PEP8 and PyCharm
"""
pass
+
is_songs_plugin_available = False
sender_name = self.sender().objectName()
verse_type = sender_name[15:] if sender_name[:15] == 'shortcutAction_' else ''
@@ -591,8 +555,10 @@
# if self.is_live:
# self.__add_actions_to_widget(self.display)
# The SlidePreview's ratio.
+
# TODO: Need to basically update everything
+
def __add_actions_to_widget(self, widget):
"""
Add actions to the widget specified by `widget`
@@ -695,7 +661,7 @@
self.toolbar.set_widget_visible('song_menu', True)
if item.is_capable(ItemCapabilities.CanLoop) and len(item.slides) > 1:
self.toolbar.set_widget_visible(LOOP_LIST)
- if item.is_media():
+ if item.is_media() or item.is_capable(ItemCapabilities.HasBackgroundAudio):
self.mediabar.show()
self.previous_item.setVisible(not item.is_media())
self.next_item.setVisible(not item.is_media())
@@ -825,30 +791,12 @@
self._reset_blank(self.service_item.is_capable(ItemCapabilities.ProvidesOwnDisplay))
self.info_label.setText(self.service_item.title)
self.slide_list = {}
+ if old_item and old_item.is_capable(ItemCapabilities.HasBackgroundAudio):
+ self.on_media_close()
if self.is_live:
self.song_menu.menu().clear()
- # if self.display.audio_player:
- # self.display.audio_player.reset()
- # self.set_audio_items_visibility(False)
- # self.audio_pause_item.setChecked(False)
- # # If the current item has background audio
- # if self.service_item.is_capable(ItemCapabilities.HasBackgroundAudio):
- # self.log_debug('Starting to play...')
- # self.display.audio_player.add_to_playlist(self.service_item.background_audio)
- # self.track_menu.clear()
- # for counter in range(len(self.service_item.background_audio)):
- # action = self.track_menu.addAction(
- # os.path.basename(str(self.service_item.background_audio[counter])))
- # action.setData(counter)
- # action.triggered.connect(self.on_track_triggered)
- # self.display.audio_player.repeat = \
- # Settings().value(self.main_window.general_settings_section + '/audio repeat list')
- # if Settings().value(self.main_window.general_settings_section + '/audio start paused'):
- # self.audio_pause_item.setChecked(True)
- # self.display.audio_player.pause()
- # else:
- # self.display.audio_player.play()
- # self.set_audio_items_visibility(True)
+ if self.service_item.is_capable(ItemCapabilities.HasBackgroundAudio):
+ self.on_media_start(service_item)
row = 0
width = self.main_window.control_splitter.sizes()[self.split]
if self.service_item.is_text():
@@ -1349,24 +1297,24 @@
self.play_slides_once.setText(UiStrings().PlaySlidesToEnd)
self.on_toggle_loop()
- def set_audio_items_visibility(self, visible):
- """
- Set the visibility of the audio stuff
- """
- self.toolbar.set_widget_visible(AUDIO_LIST, visible)
-
- def set_audio_pause_clicked(self, checked):
- """
- Pause the audio player
-
- :param checked: is the check box checked.
- """
- if not self.audio_pause_item.isVisible():
- return
- if checked:
- self.display.audio_player.pause()
- else:
- self.display.audio_player.play()
+ # def set_audio_items_visibility(self, visible):
+ # """
+ # Set the visibility of the audio stuff
+ # """
+ # self.toolbar.set_widget_visible(AUDIO_LIST, visible)
+
+ # def set_audio_pause_clicked(self, checked):
+ # """
+ # Pause the audio player
+
+ # :param checked: is the check box checked.
+ # """
+ # if not self.audio_pause_item.isVisible():
+ # return
+ # if checked:
+ # self.display.audio_player.pause()
+ # else:
+ # self.display.audio_player.play()
def timerEvent(self, event):
"""
@@ -1503,29 +1451,29 @@
else:
return None
- def on_next_track_clicked(self):
- """
- Go to the next track when next is clicked
- """
- self.display.audio_player.next()
-
- def on_audio_time_remaining(self, time):
- """
- Update how much time is remaining
-
- :param time: the time remaining
- """
- seconds = (self.display.audio_player.player.duration() - self.display.audio_player.player.position()) // 1000
- minutes = seconds // 60
- seconds %= 60
- self.audio_time_label.setText(' %02d:%02d ' % (minutes, seconds))
-
- def on_track_triggered(self, field=None):
- """
- Start playing a track
- """
- action = self.sender()
- self.display.audio_player.go_to(action.data())
+ # def on_next_track_clicked(self):
+ # """
+ # Go to the next track when next is clicked
+ # """
+ # self.display.audio_player.next()
+ #
+ # def on_audio_time_remaining(self, time):
+ # """
+ # Update how much time is remaining
+ #
+ # :param time: the time remaining
+ # """
+ # seconds = (self.display.audio_player.player.duration() - self.display.audio_player.player.position()) // 1000
+ # minutes = seconds // 60
+ # seconds %= 60
+ # self.audio_time_label.setText(' %02d:%02d ' % (minutes, seconds))
+ #
+ # def on_track_triggered(self, field=None):
+ # """
+ # Start playing a track
+ # """
+ # action = self.sender()
+ # self.display.audio_player.go_to(action.data())
class PreviewController(RegistryBase, SlideController):
=== modified file 'openlp/plugins/alerts/alertsplugin.py'
--- openlp/plugins/alerts/alertsplugin.py 2018-10-30 19:46:55 +0000
+++ openlp/plugins/alerts/alertsplugin.py 2019-01-27 20:26:59 +0000
@@ -24,6 +24,7 @@
from PyQt5 import QtGui
+from openlp.core.state import State
from openlp.core.api.http import register_endpoint
from openlp.core.common.actions import ActionList
from openlp.core.common.i18n import UiStrings, translate
@@ -148,6 +149,8 @@
self.alert_form = AlertForm(self)
register_endpoint(alerts_endpoint)
register_endpoint(api_alerts_endpoint)
+ State().add_service(self.name, self.weight, is_plugin=True)
+ State().update_pre_conditions(self.name, self.check_pre_conditions())
def add_tools_menu_item(self, tools_menu):
"""
=== modified file 'openlp/plugins/alerts/lib/alertsmanager.py'
--- openlp/plugins/alerts/lib/alertsmanager.py 2018-11-08 21:06:35 +0000
+++ openlp/plugins/alerts/lib/alertsmanager.py 2019-01-27 20:26:59 +0000
@@ -39,7 +39,7 @@
alerts_text = QtCore.pyqtSignal(list)
def __init__(self, parent):
- super(AlertsManager, self).__init__(parent)
+ super(AlertsManager, self).__init__()
self.timer_id = 0
self.alert_list = []
Registry().register_function('live_display_active', self.generate_alert)
=== modified file 'openlp/plugins/bibles/bibleplugin.py'
--- openlp/plugins/bibles/bibleplugin.py 2018-10-30 19:46:55 +0000
+++ openlp/plugins/bibles/bibleplugin.py 2019-01-27 20:26:59 +0000
@@ -22,6 +22,7 @@
import logging
+from openlp.core.state import State
from openlp.core.api.http import register_endpoint
from openlp.core.common.actions import ActionList
from openlp.core.common.i18n import UiStrings, translate
@@ -78,6 +79,8 @@
self.manager = BibleManager(self)
register_endpoint(bibles_endpoint)
register_endpoint(api_bibles_endpoint)
+ State().add_service('bible', self.weight, is_plugin=True)
+ State().update_pre_conditions('bible', self.check_pre_conditions())
def initialise(self):
"""
=== modified file 'openlp/plugins/custom/customplugin.py'
--- openlp/plugins/custom/customplugin.py 2018-10-30 19:46:55 +0000
+++ openlp/plugins/custom/customplugin.py 2019-01-27 20:26:59 +0000
@@ -26,6 +26,7 @@
import logging
+from openlp.core.state import State
from openlp.core.api.http import register_endpoint
from openlp.core.common.i18n import translate
from openlp.core.lib import build_icon
@@ -69,6 +70,8 @@
self.icon = build_icon(self.icon_path)
register_endpoint(custom_endpoint)
register_endpoint(api_custom_endpoint)
+ State().add_service(self.name, self.weight, is_plugin=True)
+ State().update_pre_conditions(self.name, self.check_pre_conditions())
@staticmethod
def about():
=== modified file 'openlp/plugins/images/imageplugin.py'
--- openlp/plugins/images/imageplugin.py 2018-10-30 19:46:55 +0000
+++ openlp/plugins/images/imageplugin.py 2019-01-27 20:26:59 +0000
@@ -24,6 +24,7 @@
from PyQt5 import QtGui
+from openlp.core.state import State
from openlp.core.api.http import register_endpoint
from openlp.core.common.i18n import translate
from openlp.core.common.settings import Settings
@@ -62,6 +63,8 @@
self.icon = build_icon(self.icon_path)
register_endpoint(images_endpoint)
register_endpoint(api_images_endpoint)
+ State().add_service('image', self.weight, is_plugin=True)
+ State().update_pre_conditions('image', self.check_pre_conditions())
@staticmethod
def about():
=== modified file 'openlp/plugins/media/lib/mediaitem.py'
--- openlp/plugins/media/lib/mediaitem.py 2018-10-02 04:39:42 +0000
+++ openlp/plugins/media/lib/mediaitem.py 2019-01-27 20:26:59 +0000
@@ -25,6 +25,7 @@
from PyQt5 import QtCore, QtWidgets
+from openlp.core.state import State
from openlp.core.common.applocation import AppLocation
from openlp.core.common.i18n import UiStrings, get_natural_key, translate
from openlp.core.common.mixins import RegistryProperties
@@ -33,11 +34,10 @@
from openlp.core.common.settings import Settings
from openlp.core.lib import MediaType, ServiceItemContext, check_item_selected
from openlp.core.lib.mediamanageritem import MediaManagerItem
-from openlp.core.lib.serviceitem import ItemCapabilities, ServiceItem
-from openlp.core.lib.ui import create_horizontal_adjusting_combo_box, create_widget_action, critical_error_message_box
-from openlp.core.ui import DisplayControllerType
+from openlp.core.lib.serviceitem import ItemCapabilities
+from openlp.core.lib.ui import critical_error_message_box
from openlp.core.ui.icons import UiIcons
-from openlp.core.ui.media import format_milliseconds, get_media_players, parse_optical_path, set_media_players
+from openlp.core.ui.media import parse_optical_path, format_milliseconds
from openlp.core.ui.media.vlcplayer import get_vlc
@@ -82,7 +82,7 @@
self.has_search = True
self.media_object = None
# self.display_controller = DisplayController(self.parent())
- Registry().register_function('video_background_replaced', self.video_background_replaced)
+ # Registry().register_function('video_background_replaced', self.video_background_replaced)
Registry().register_function('mediaitem_media_rebuild', self.rebuild_players)
# Allow DnD from the desktop
self.list_view.activateDnD()
@@ -93,20 +93,16 @@
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)
- if 'webkit' in get_media_players()[0]:
- self.replace_action.setToolTip(UiStrings().ReplaceLiveBG)
- self.replace_action_context.setToolTip(UiStrings().ReplaceLiveBG)
- else:
- 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:'))
+ # 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):
"""
@@ -116,127 +112,59 @@
self.has_file_icon = True
self.has_new_icon = False
self.has_edit_icon = False
+ if not State().check_preconditions('media'):
+ self.can_preview = False
+ self.can_make_live = False
+ self.can_add_to_service = False
def add_list_view_to_toolbar(self):
"""
Creates the main widget for listing items.
"""
MediaManagerItem.add_list_view_to_toolbar(self)
- self.list_view.addAction(self.replace_action)
+ # self.list_view.addAction(self.replace_action)
def add_start_header_bar(self):
"""
Adds buttons to the start of the header bar.
"""
- if 'vlc' in get_media_players()[0]:
- disable_optical_button_text = False
+ if State().check_preconditions('media'):
optical_button_text = translate('MediaPlugin.MediaItem', 'Load CD/DVD')
optical_button_tooltip = translate('MediaPlugin.MediaItem', 'Load CD/DVD')
- else:
- disable_optical_button_text = True
- optical_button_text = translate('MediaPlugin.MediaItem', 'Load CD/DVD')
- optical_button_tooltip = translate('MediaPlugin.MediaItem',
- 'CD/DVD playback is only supported if VLC is installed and enabled.')
- self.load_optical = self.toolbar.add_toolbar_action('load_optical', icon=UiIcons().optical,
- text=optical_button_text,
- tooltip=optical_button_tooltip,
- triggers=self.on_load_optical)
- if disable_optical_button_text:
- self.load_optical.setDisabled(True)
+ self.load_optical = self.toolbar.add_toolbar_action('load_optical', icon=UiIcons().optical,
+ text=optical_button_text,
+ tooltip=optical_button_tooltip,
+ triggers=self.on_load_optical)
def add_end_header_bar(self):
"""
Adds buttons to the end of the header bar.
"""
# Replace backgrounds do not work at present so remove functionality.
- self.replace_action = self.toolbar.add_toolbar_action('replace_action', icon=UiIcons().theme,
- triggers=self.on_replace_click)
- if 'webkit' not in get_media_players()[0]:
- self.replace_action.setDisabled(True)
- if hasattr(self, 'replace_action_context'):
- self.replace_action_context.setDisabled(True)
- self.reset_action = self.toolbar.add_toolbar_action('reset_action', icon=UiIcons().close,
- visible=False, triggers=self.on_reset_click)
- self.media_widget = QtWidgets.QWidget(self)
- self.media_widget.setObjectName('media_widget')
- self.display_layout = QtWidgets.QFormLayout(self.media_widget)
- self.display_layout.setContentsMargins(self.display_layout.spacing(), self.display_layout.spacing(),
- self.display_layout.spacing(), self.display_layout.spacing())
- self.display_layout.setObjectName('display_layout')
- self.display_type_label = QtWidgets.QLabel(self.media_widget)
- self.display_type_label.setObjectName('display_type_label')
- self.display_type_combo_box = create_horizontal_adjusting_combo_box(
- self.media_widget, 'display_type_combo_box')
- self.display_type_label.setBuddy(self.display_type_combo_box)
- self.display_layout.addRow(self.display_type_label, self.display_type_combo_box)
+ # self.replace_action = self.toolbar.add_toolbar_action('replace_action', icon=UiIcons().theme,
+ # triggers=self.on_replace_click)
+ # if 'webkit' not in get_media_players()[0]:
+ # self.replace_action.setDisabled(True)
+ # if hasattr(self, 'replace_action_context'):
+ # self.replace_action_context.setDisabled(True)
+ # self.reset_action = self.toolbar.add_toolbar_action('reset_action', icon=UiIcons().close,
+ # visible=False, triggers=self.on_reset_click)
+ # self.media_widget = QtWidgets.QWidget(self)
+ # self.media_widget.setObjectName('media_widget')
+ # self.display_layout = QtWidgets.QFormLayout(self.media_widget)
+ # self.display_layout.setContentsMargins(self.display_layout.spacing(), self.display_layout.spacing(),
+ # self.display_layout.spacing(), self.display_layout.spacing())
+ # self.display_layout.setObjectName('display_layout')
+ # self.display_type_label = QtWidgets.QLabel(self.media_widget)
+ # self.display_type_label.setObjectName('display_type_label')
+ # self.display_type_combo_box = create_horizontal_adjusting_combo_box(
+ # self.media_widget, 'display_type_combo_box')
+ # self.display_type_label.setBuddy(self.display_type_combo_box)
+ # self.display_layout.addRow(self.display_type_label, self.display_type_combo_box)
# Add the Media widget to the page layout.
- self.page_layout.addWidget(self.media_widget)
- self.display_type_combo_box.currentIndexChanged.connect(self.override_player_changed)
-
- def add_custom_context_actions(self):
- create_widget_action(self.list_view, separator=True)
- self.replace_action_context = create_widget_action(
- self.list_view, text=UiStrings().ReplaceBG, icon=':/slides/slide_theme.png',
- triggers=self.on_replace_click)
- self.reset_action_context = create_widget_action(
- self.list_view, text=UiStrings().ReplaceLiveBG, icon=UiIcons().close,
- visible=False, triggers=self.on_reset_click)
-
- @staticmethod
- def override_player_changed(index):
- """
- The Player has been overridden
-
- :param index: Index
- """
- player = get_media_players()[0]
- if index == 0:
- set_media_players(player)
- else:
- set_media_players(player, player[index - 1])
-
- def on_reset_click(self):
- """
- Called to reset the Live background with the media selected,
- """
- self.media_controller.media_reset(self.live_controller)
- self.reset_action.setVisible(False)
- self.reset_action_context.setVisible(False)
-
- def video_background_replaced(self):
- """
- Triggered by main display on change of service item.
- """
- self.reset_action.setVisible(False)
- self.reset_action_context.setVisible(False)
-
- def on_replace_click(self):
- """
- Called to replace Live background with the media selected.
- """
- if check_item_selected(self.list_view,
- translate('MediaPlugin.MediaItem',
- 'You must select a media file to replace the background with.')):
- item = self.list_view.currentItem()
- filename = item.data(QtCore.Qt.UserRole)
- if os.path.exists(filename):
- service_item = ServiceItem()
- service_item.title = 'webkit'
- service_item.processor = 'webkit'
- (path, name) = os.path.split(filename)
- service_item.add_from_command(path, name, CLAPPERBOARD)
- if self.media_controller.video(DisplayControllerType.Live, service_item, video_behind_text=True):
- self.reset_action.setVisible(True)
- self.reset_action_context.setVisible(True)
- else:
- critical_error_message_box(UiStrings().LiveBGError,
- translate('MediaPlugin.MediaItem',
- 'There was no display item to amend.'))
- else:
- critical_error_message_box(UiStrings().LiveBGError,
- translate('MediaPlugin.MediaItem',
- 'There was a problem replacing your background, '
- 'the media file "{name}" no longer exists.').format(name=filename))
+ # self.page_layout.addWidget(self.media_widget)
+ # self.display_type_combo_box.currentIndexChanged.connect(self.override_player_changed)
+ pass
def generate_slide_data(self, service_item, item=None, xml_version=False, remote=False,
context=ServiceItemContext.Service):
@@ -265,7 +193,7 @@
translate('MediaPlugin.MediaItem',
'The optical disc {name} is no longer available.').format(name=name))
return False
- service_item.processor = self.display_type_combo_box.currentText()
+ service_item.processor = 'vlc'
service_item.add_from_command(filename, name, CLAPPERBOARD)
service_item.title = clip_name
# Set the length
@@ -283,11 +211,10 @@
return False
(path, name) = os.path.split(filename)
service_item.title = name
- service_item.processor = self.display_type_combo_box.currentText()
+ service_item.processor = 'vlc'
service_item.add_from_command(path, name, CLAPPERBOARD)
# Only get start and end times if going to a service
- if not self.media_controller.media_length(service_item):
- return False
+ service_item.set_media_length(self.media_controller.media_length(filename))
service_item.add_capability(ItemCapabilities.CanAutoStartForLive)
service_item.add_capability(ItemCapabilities.CanEditTitle)
service_item.add_capability(ItemCapabilities.RequiresMedia)
@@ -311,37 +238,13 @@
"""
Rebuild the tab in the media manager when changes are made in the settings.
"""
- self.populate_display_types()
+ # self.populate_display_types()
self.on_new_file_masks = translate('MediaPlugin.MediaItem',
'Videos ({video});;Audio ({audio});;{files} '
'(*)').format(video=' '.join(self.media_controller.video_extensions_list),
audio=' '.join(self.media_controller.audio_extensions_list),
files=UiStrings().AllFiles)
- def populate_display_types(self):
- """
- Load the combobox with the enabled media players, allowing user to select a specific player if settings allow.
- """
- # block signals to avoid unnecessary override_player_changed Signals while combo box creation
- self.display_type_combo_box.blockSignals(True)
- self.display_type_combo_box.clear()
- used_players, override_player = get_media_players()
- media_players = self.media_controller.media_players
- current_index = 0
- for player in used_players:
- # load the drop down selection
- self.display_type_combo_box.addItem(media_players[player].original_name)
- if override_player == player:
- current_index = len(self.display_type_combo_box)
- if self.display_type_combo_box.count() > 1:
- self.display_type_combo_box.insertItem(0, self.automatic)
- self.display_type_combo_box.setCurrentIndex(current_index)
- if override_player:
- self.media_widget.show()
- else:
- self.media_widget.hide()
- self.display_type_combo_box.blockSignals(False)
-
def on_delete_click(self):
"""
Remove a media item from the list.
=== modified file 'openlp/plugins/media/mediaplugin.py'
--- openlp/plugins/media/mediaplugin.py 2018-10-30 19:46:55 +0000
+++ openlp/plugins/media/mediaplugin.py 2019-01-27 20:26:59 +0000
@@ -23,14 +23,13 @@
The Media plugin
"""
import logging
-import re
from PyQt5 import QtCore
+from openlp.core.state import State
from openlp.core.api.http import register_endpoint
-from openlp.core.common import check_binary_exists
-from openlp.core.common.applocation import AppLocation
from openlp.core.common.i18n import translate
+from openlp.core.ui.icons import UiIcons
from openlp.core.common.path import Path
from openlp.core.lib import build_icon
from openlp.core.lib.plugin import Plugin, StringContent
@@ -66,6 +65,8 @@
self.dnd_id = 'Media'
register_endpoint(media_endpoint)
register_endpoint(api_media_endpoint)
+ State().add_service(self.name, self.weight, requires='mediacontroller', is_plugin=True)
+ State().update_pre_conditions(self.name, self.check_pre_conditions())
def initialise(self):
"""
@@ -73,19 +74,6 @@
"""
super().initialise()
- def check_pre_conditions(self):
- """
- Check it we have a valid environment.
- :return: true or false
- """
- log.debug('check_installed Mediainfo')
- # Try to find mediainfo in the path
- exists = process_check_binary(Path('mediainfo'))
- # If mediainfo is not in the path, try to find it in the application folder
- if not exists:
- exists = process_check_binary(AppLocation.get_directory(AppLocation.AppDir) / 'mediainfo')
- return exists
-
def app_startup(self):
"""
Override app_startup() in order to do nothing
@@ -143,38 +131,3 @@
log.info('Media Finalising')
self.media_controller.finalise()
Plugin.finalise(self)
-
- def get_display_css(self):
- """
- Add css style sheets to htmlbuilder.
- """
- return self.media_controller.get_media_display_css()
-
- def get_display_javascript(self):
- """
- Add javascript functions to htmlbuilder.
- """
- return self.media_controller.get_media_display_javascript()
-
- def get_display_html(self):
- """
- Add html code to htmlbuilder.
- """
- return self.media_controller.get_media_display_html()
-
-
-def process_check_binary(program_path):
- """
- Function that checks whether a binary MediaInfo is present
-
- :param openlp.core.common.path.Path program_path:The full path to the binary to check.
- :return: If exists or not
- :rtype: bool
- """
- runlog = check_binary_exists(program_path)
- # Analyse the output to see it the program is mediainfo
- for line in runlog.splitlines():
- decoded_line = line.decode()
- if re.search('MediaInfo Command line', decoded_line, re.IGNORECASE):
- return True
- return False
=== modified file 'openlp/plugins/presentations/presentationplugin.py'
--- openlp/plugins/presentations/presentationplugin.py 2018-10-30 19:46:55 +0000
+++ openlp/plugins/presentations/presentationplugin.py 2019-01-27 20:26:59 +0000
@@ -28,6 +28,7 @@
from PyQt5 import QtCore
+from openlp.core.state import State
from openlp.core.api.http import register_endpoint
from openlp.core.common import extension_loader
from openlp.core.common.i18n import translate
@@ -77,6 +78,8 @@
self.icon = build_icon(self.icon_path)
register_endpoint(presentations_endpoint)
register_endpoint(api_presentations_endpoint)
+ State().add_service('presentation', self.weight, is_plugin=True)
+ State().update_pre_conditions('presentation', self.check_pre_conditions())
def create_settings_tab(self, parent):
"""
=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
--- openlp/plugins/songs/lib/mediaitem.py 2018-10-30 19:46:55 +0000
+++ openlp/plugins/songs/lib/mediaitem.py 2019-01-27 20:26:59 +0000
@@ -25,6 +25,7 @@
from PyQt5 import QtCore, QtWidgets
from sqlalchemy.sql import and_, or_
+from openlp.core.state import State
from openlp.core.common.applocation import AppLocation
from openlp.core.common.i18n import UiStrings, get_natural_key, translate
from openlp.core.common.path import copyfile, create_paths
@@ -633,11 +634,16 @@
service_item.xml_version = self.open_lyrics.song_to_xml(song)
# Add the audio file to the service item.
if song.media_files:
- service_item.add_capability(ItemCapabilities.HasBackgroundAudio)
- service_item.background_audio = [m.file_path for m in song.media_files]
- item.metadata.append('<em>{label}:</em> {media}'.
- format(label=translate('SongsPlugin.MediaItem', 'Media'),
- media=service_item.background_audio))
+ if State().check_preconditions('media'):
+ service_item.add_capability(ItemCapabilities.HasBackgroundAudio)
+ total_length = 0
+ for m in song.media_files:
+ total_length += self.media_controller.media_length(m.file_path)
+ service_item.background_audio = [m.file_path for m in song.media_files]
+ service_item.set_media_length(total_length)
+ service_item.metadata.append('<em>{label}:</em> {media}'.
+ format(label=translate('SongsPlugin.MediaItem', 'Media'),
+ media=service_item.background_audio))
return True
def generate_footer(self, item, song):
=== modified file 'openlp/plugins/songs/songsplugin.py'
--- openlp/plugins/songs/songsplugin.py 2018-10-02 04:39:42 +0000
+++ openlp/plugins/songs/songsplugin.py 2019-01-27 20:26:59 +0000
@@ -31,6 +31,7 @@
from PyQt5 import QtCore, QtWidgets
+from openlp.core.state import State
from openlp.core.api.http import register_endpoint
from openlp.core.common.actions import ActionList
from openlp.core.common.i18n import UiStrings, translate
@@ -99,6 +100,8 @@
self.songselect_form = None
register_endpoint(songs_endpoint)
register_endpoint(api_songs_endpoint)
+ State().add_service(self.name, self.weight, is_plugin=True)
+ State().update_pre_conditions(self.name, self.check_pre_conditions())
def check_pre_conditions(self):
"""
=== modified file 'openlp/plugins/songusage/songusageplugin.py'
--- openlp/plugins/songusage/songusageplugin.py 2018-10-30 19:46:55 +0000
+++ openlp/plugins/songusage/songusageplugin.py 2019-01-27 20:26:59 +0000
@@ -25,6 +25,7 @@
from PyQt5 import QtCore, QtWidgets
+from openlp.core.state import State
from openlp.core.common.actions import ActionList
from openlp.core.common.i18n import translate
from openlp.core.common.registry import Registry
@@ -68,6 +69,8 @@
self.weight = -4
self.icon = UiIcons().song_usage
self.song_usage_active = False
+ State().add_service('song_usage', self.weight, is_plugin=True)
+ State().update_pre_conditions('song_usage', self.check_pre_conditions())
def check_pre_conditions(self):
"""
=== modified file 'scripts/check_dependencies.py'
--- scripts/check_dependencies.py 2018-10-30 19:46:55 +0000
+++ scripts/check_dependencies.py 2019-01-27 20:26:59 +0000
@@ -87,7 +87,8 @@
'waitress',
'webob',
'requests',
- 'qtawesome'
+ 'qtawesome',
+ 'pymediainfo'
]
=== modified file 'scripts/jenkins_script.py'
--- scripts/jenkins_script.py 2018-10-02 04:39:42 +0000
+++ scripts/jenkins_script.py 2019-01-27 20:26:59 +0000
@@ -62,7 +62,7 @@
Branch_macOS_Tests = 'Branch-02b-macOS-Tests'
Branch_Build_Source = 'Branch-03a-Build-Source'
Branch_Build_macOS = 'Branch-03b-Build-macOS'
- Branch_Code_Analysis = 'Branch-04a-Code-Analysis'
+ Branch_Code_Analysis = 'Branch-04a-Code-Lint'
Branch_Test_Coverage = 'Branch-04b-Test-Coverage'
Branch_Lint_Check = 'Branch-04c-Lint-Check'
Branch_AppVeyor_Tests = 'Branch-05-AppVeyor-Tests'
@@ -84,8 +84,6 @@
class JenkinsTrigger(object):
"""
A class to trigger builds on Jenkins and print the results.
-
- :param token: The token we need to trigger the build. If you do not have this token, ask in IRC.
"""
def __init__(self, username, password, can_use_colour):
@@ -102,9 +100,12 @@
Get the job info for all the jobs
"""
for job_name in OpenLPJobs.Jobs:
- job_info = self.server.get_job_info(job_name)
- self.jobs[job_name] = job_info
- self.jobs[job_name]['nextBuildUrl'] = '{url}{nextBuildNumber}/'.format(**job_info)
+ try:
+ job_info = self.server.get_job_info(job_name)
+ self.jobs[job_name] = job_info
+ self.jobs[job_name]['nextBuildUrl'] = '{url}{nextBuildNumber}/'.format(**job_info)
+ except Exception:
+ pass
def trigger_build(self):
"""
=== modified file 'tests/functional/openlp_core/api/endpoint/test_controller.py'
--- tests/functional/openlp_core/api/endpoint/test_controller.py 2018-12-01 05:52:49 +0000
+++ tests/functional/openlp_core/api/endpoint/test_controller.py 2019-01-27 20:26:59 +0000
@@ -25,6 +25,7 @@
from PyQt5 import QtCore
+from openlp.core.state import State
# Mock QtWebEngineWidgets
# sys.modules['PyQt5.QtWebEngineWidgets'] = MagicMock()
@@ -92,6 +93,9 @@
# GIVEN: A mocked service with a dummy service item
line = convert_file_service_item(TEST_PATH, 'serviceitem_custom_1.osj')
self.mocked_live_controller.service_item = ServiceItem(None)
+ State().add_service("media", 0)
+ State().update_pre_conditions("media", True)
+ State().flush_preconditions()
self.mocked_live_controller.service_item.set_from_service(line)
# WHEN: I trigger the method
=== modified file 'tests/functional/openlp_core/common/test_registry.py'
--- tests/functional/openlp_core/common/test_registry.py 2017-12-29 09:15:48 +0000
+++ tests/functional/openlp_core/common/test_registry.py 2019-01-27 20:26:59 +0000
@@ -184,4 +184,4 @@
RegistryStub()
# THEN: The bootstrap methods should be registered
- assert len(Registry().functions_list) == 2, 'The bootstrap functions should be in the dict.'
+ assert len(Registry().functions_list) == 3, 'The bootstrap functions should be in the dict.'
=== modified file 'tests/functional/openlp_core/lib/test_mediamanageritem.py'
--- tests/functional/openlp_core/lib/test_mediamanageritem.py 2018-08-25 14:08:19 +0000
+++ tests/functional/openlp_core/lib/test_mediamanageritem.py 2019-01-27 20:26:59 +0000
@@ -52,6 +52,9 @@
mocked_settings.value.return_value = False
MockedSettings.return_value = mocked_settings
mmi = MediaManagerItem(None)
+ mmi.can_preview = True
+ mmi.can_make_live = True
+ mmi.can_add_to_service = True
# WHEN: on_double_clicked() is called
mmi.on_double_clicked()
@@ -73,6 +76,9 @@
assert mmi.has_file_icon is False, 'There should be no file icon by default'
assert mmi.has_delete_icon is True, 'By default a delete icon should be present'
assert mmi.add_to_service_item is False, 'There should be no add_to_service icon by default'
+ assert mmi.can_preview is True, 'There should be a preview icon by default'
+ assert mmi.can_make_live is True, 'There should be a make live by default'
+ assert mmi.can_add_to_service is True, 'There should be a add to service icon by default'
@patch('openlp.core.lib.mediamanageritem.Settings')
@patch('openlp.core.lib.mediamanageritem.MediaManagerItem.on_live_click')
@@ -85,6 +91,9 @@
mocked_settings.value.side_effect = lambda x: x == 'advanced/double click live'
MockedSettings.return_value = mocked_settings
mmi = MediaManagerItem(None)
+ mmi.can_preview = True
+ mmi.can_make_live = True
+ mmi.can_add_to_service = True
# WHEN: on_double_clicked() is called
mmi.on_double_clicked()
@@ -105,6 +114,9 @@
mocked_settings.value.side_effect = lambda x: x == 'advanced/single click preview'
MockedSettings.return_value = mocked_settings
mmi = MediaManagerItem(None)
+ mmi.can_preview = True
+ mmi.can_make_live = True
+ mmi.can_add_to_service = True
# WHEN: on_double_clicked() is called
mmi.on_double_clicked()
=== modified file 'tests/functional/openlp_core/lib/test_pluginmanager.py'
--- tests/functional/openlp_core/lib/test_pluginmanager.py 2018-08-25 14:08:19 +0000
+++ tests/functional/openlp_core/lib/test_pluginmanager.py 2019-01-27 20:26:59 +0000
@@ -25,6 +25,7 @@
from unittest import TestCase
from unittest.mock import MagicMock, patch
+from openlp.core.state import State
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
from openlp.core.lib.plugin import PluginStatus
@@ -46,6 +47,7 @@
self.mocked_main_window.file_export_menu.return_value = None
self.mocked_settings_form = MagicMock()
Registry.create()
+ State().load_settings()
Registry().register('service_list', MagicMock())
Registry().register('main_window', self.mocked_main_window)
Registry().register('settings_form', self.mocked_settings_form)
@@ -57,8 +59,7 @@
# GIVEN: A plugin manager with some mocked out methods
manager = PluginManager()
- with patch.object(manager, 'find_plugins') as mocked_find_plugins, \
- patch.object(manager, 'hook_settings_tabs') as mocked_hook_settings_tabs, \
+ with patch.object(manager, 'hook_settings_tabs') as mocked_hook_settings_tabs, \
patch.object(manager, 'hook_media_manager') as mocked_hook_media_manager, \
patch.object(manager, 'hook_import_menu') as mocked_hook_import_menu, \
patch.object(manager, 'hook_export_menu') as mocked_hook_export_menu, \
@@ -66,9 +67,9 @@
patch.object(manager, 'initialise_plugins') as mocked_initialise_plugins:
# WHEN: bootstrap_initialise() is called
manager.bootstrap_initialise()
+ manager.bootstrap_post_set_up()
# THEN: The hook methods should have been called
- mocked_find_plugins.assert_called_with()
mocked_hook_settings_tabs.assert_called_with()
mocked_hook_media_manager.assert_called_with()
mocked_hook_import_menu.assert_called_with()
@@ -84,7 +85,9 @@
mocked_plugin = MagicMock()
mocked_plugin.status = PluginStatus.Disabled
plugin_manager = PluginManager()
- plugin_manager.plugins = [mocked_plugin]
+ Registry().register('mock_plugin', mocked_plugin)
+ State().add_service("mock", 1, is_plugin=True, status=PluginStatus.Disabled)
+ State().flush_preconditions()
# WHEN: We run hook_media_manager()
plugin_manager.hook_media_manager()
@@ -101,7 +104,9 @@
mocked_plugin = MagicMock()
mocked_plugin.status = PluginStatus.Active
plugin_manager = PluginManager()
- plugin_manager.plugins = [mocked_plugin]
+ Registry().register('mock_plugin', mocked_plugin)
+ State().add_service("mock", 1, is_plugin=True, status=PluginStatus.Active)
+ State().flush_preconditions()
# WHEN: We run hook_media_manager()
plugin_manager.hook_media_manager()
@@ -117,7 +122,9 @@
mocked_plugin = MagicMock()
mocked_plugin.status = PluginStatus.Disabled
plugin_manager = PluginManager()
- plugin_manager.plugins = [mocked_plugin]
+ Registry().register('mock_plugin', mocked_plugin)
+ State().add_service("mock", 1, is_plugin=True, status=PluginStatus.Active)
+ State().flush_preconditions()
# WHEN: We run hook_settings_tabs()
plugin_manager.hook_settings_tabs()
@@ -134,10 +141,12 @@
mocked_plugin = MagicMock()
mocked_plugin.status = PluginStatus.Disabled
plugin_manager = PluginManager()
- plugin_manager.plugins = [mocked_plugin]
+ Registry().register('mock_plugin', mocked_plugin)
mocked_settings_form = MagicMock()
# Replace the autoloaded plugin with the version for testing in real code this would error
mocked_settings_form.plugin_manager = plugin_manager
+ State().add_service("mock", 1, is_plugin=True, status=PluginStatus.Active)
+ State().flush_preconditions()
# WHEN: We run hook_settings_tabs()
plugin_manager.hook_settings_tabs()
@@ -156,10 +165,12 @@
mocked_plugin = MagicMock()
mocked_plugin.status = PluginStatus.Active
plugin_manager = PluginManager()
- plugin_manager.plugins = [mocked_plugin]
+ Registry().register('mock_plugin', mocked_plugin)
mocked_settings_form = MagicMock()
# Replace the autoloaded plugin with the version for testing in real code this would error
mocked_settings_form.plugin_manager = plugin_manager
+ State().add_service("mock", 1, is_plugin=True, status=PluginStatus.Active)
+ State().flush_preconditions()
# WHEN: We run hook_settings_tabs()
plugin_manager.hook_settings_tabs()
@@ -178,7 +189,9 @@
mocked_plugin = MagicMock()
mocked_plugin.status = PluginStatus.Active
plugin_manager = PluginManager()
- plugin_manager.plugins = [mocked_plugin]
+ Registry().register('mock_plugin', mocked_plugin)
+ State().add_service("mock", 1, is_plugin=True, status=PluginStatus.Active)
+ State().flush_preconditions()
# WHEN: We run hook_settings_tabs()
plugin_manager.hook_settings_tabs()
@@ -194,7 +207,9 @@
mocked_plugin = MagicMock()
mocked_plugin.status = PluginStatus.Disabled
plugin_manager = PluginManager()
- plugin_manager.plugins = [mocked_plugin]
+ Registry().register('mock_plugin', mocked_plugin)
+ State().add_service("mock", 1, is_plugin=True, status=PluginStatus.Active)
+ State().flush_preconditions()
# WHEN: We run hook_import_menu()
plugin_manager.hook_import_menu()
@@ -211,7 +226,9 @@
mocked_plugin = MagicMock()
mocked_plugin.status = PluginStatus.Active
plugin_manager = PluginManager()
- plugin_manager.plugins = [mocked_plugin]
+ Registry().register('mock_plugin', mocked_plugin)
+ State().add_service("mock", 1, is_plugin=True, status=PluginStatus.Active)
+ State().flush_preconditions()
# WHEN: We run hook_import_menu()
plugin_manager.hook_import_menu()
@@ -227,7 +244,9 @@
mocked_plugin = MagicMock()
mocked_plugin.status = PluginStatus.Disabled
plugin_manager = PluginManager()
- plugin_manager.plugins = [mocked_plugin]
+ Registry().register('mock_plugin', mocked_plugin)
+ State().add_service("mock", 1, is_plugin=True, status=PluginStatus.Active)
+ State().flush_preconditions()
# WHEN: We run hook_export_menu()
plugin_manager.hook_export_menu()
@@ -244,7 +263,9 @@
mocked_plugin = MagicMock()
mocked_plugin.status = PluginStatus.Active
plugin_manager = PluginManager()
- plugin_manager.plugins = [mocked_plugin]
+ Registry().register('mock_plugin', mocked_plugin)
+ State().add_service("mock", 1, is_plugin=True, status=PluginStatus.Active)
+ State().flush_preconditions()
# WHEN: We run hook_export_menu()
plugin_manager.hook_export_menu()
@@ -260,7 +281,9 @@
mocked_plugin = MagicMock()
mocked_plugin.status = PluginStatus.Disabled
plugin_manager = PluginManager()
- plugin_manager.plugins = [mocked_plugin]
+ Registry().register('mock_plugin', mocked_plugin)
+ State().add_service("mock", 1, is_plugin=True, status=PluginStatus.Active)
+ State().flush_preconditions()
settings = Settings()
# WHEN: We run hook_upgrade_plugin_settings()
@@ -278,7 +301,9 @@
mocked_plugin = MagicMock()
mocked_plugin.status = PluginStatus.Active
plugin_manager = PluginManager()
- plugin_manager.plugins = [mocked_plugin]
+ Registry().register('mock_plugin', mocked_plugin)
+ State().add_service("mock", 1, is_plugin=True, status=PluginStatus.Active)
+ State().flush_preconditions()
settings = Settings()
# WHEN: We run hook_upgrade_plugin_settings()
@@ -295,7 +320,9 @@
mocked_plugin = MagicMock()
mocked_plugin.status = PluginStatus.Disabled
plugin_manager = PluginManager()
- plugin_manager.plugins = [mocked_plugin]
+ Registry().register('mock_plugin', mocked_plugin)
+ State().add_service("mock", 1, is_plugin=True, status=PluginStatus.Active)
+ State().flush_preconditions()
# WHEN: We run hook_tools_menu()
plugin_manager.hook_tools_menu()
@@ -312,7 +339,9 @@
mocked_plugin = MagicMock()
mocked_plugin.status = PluginStatus.Active
plugin_manager = PluginManager()
- plugin_manager.plugins = [mocked_plugin]
+ Registry().register('mock_plugin', mocked_plugin)
+ State().add_service("mock", 1, is_plugin=True, status=PluginStatus.Active)
+ State().flush_preconditions()
# WHEN: We run hook_tools_menu()
plugin_manager.hook_tools_menu()
@@ -329,7 +358,9 @@
mocked_plugin.status = PluginStatus.Disabled
mocked_plugin.is_active.return_value = False
plugin_manager = PluginManager()
- plugin_manager.plugins = [mocked_plugin]
+ Registry().register('mock_plugin', mocked_plugin)
+ State().add_service("mock", 1, is_plugin=True, status=PluginStatus.Active)
+ State().flush_preconditions()
# WHEN: We run initialise_plugins()
plugin_manager.initialise_plugins()
@@ -347,7 +378,9 @@
mocked_plugin.status = PluginStatus.Active
mocked_plugin.is_active.return_value = True
plugin_manager = PluginManager()
- plugin_manager.plugins = [mocked_plugin]
+ Registry().register('mock_plugin', mocked_plugin)
+ State().add_service("mock", 1, is_plugin=True, status=PluginStatus.Active)
+ State().flush_preconditions()
# WHEN: We run initialise_plugins()
plugin_manager.initialise_plugins()
@@ -365,7 +398,9 @@
mocked_plugin.status = PluginStatus.Disabled
mocked_plugin.is_active.return_value = False
plugin_manager = PluginManager()
- plugin_manager.plugins = [mocked_plugin]
+ Registry().register('mock_plugin', mocked_plugin)
+ State().add_service("mock", 1, is_plugin=True, status=PluginStatus.Active)
+ State().flush_preconditions()
# WHEN: We run finalise_plugins()
plugin_manager.finalise_plugins()
@@ -383,7 +418,9 @@
mocked_plugin.status = PluginStatus.Active
mocked_plugin.is_active.return_value = True
plugin_manager = PluginManager()
- plugin_manager.plugins = [mocked_plugin]
+ Registry().register('mock_plugin', mocked_plugin)
+ State().add_service("mock", 1, is_plugin=True, status=PluginStatus.Active)
+ State().flush_preconditions()
# WHEN: We run finalise_plugins()
plugin_manager.finalise_plugins()
@@ -400,7 +437,9 @@
mocked_plugin = MagicMock()
mocked_plugin.name = 'Mocked Plugin'
plugin_manager = PluginManager()
- plugin_manager.plugins = [mocked_plugin]
+ Registry().register('mock_plugin', mocked_plugin)
+ State().add_service("mock", 1, is_plugin=True, status=PluginStatus.Active)
+ State().flush_preconditions()
# WHEN: We run finalise_plugins()
result = plugin_manager.get_plugin_by_name('Missing Plugin')
@@ -416,7 +455,9 @@
mocked_plugin = MagicMock()
mocked_plugin.name = 'Mocked Plugin'
plugin_manager = PluginManager()
- plugin_manager.plugins = [mocked_plugin]
+ Registry().register('mock_plugin', mocked_plugin)
+ State().add_service("mock", 1, is_plugin=True, status=PluginStatus.Active)
+ State().flush_preconditions()
# WHEN: We run finalise_plugins()
result = plugin_manager.get_plugin_by_name('Mocked Plugin')
@@ -433,7 +474,9 @@
mocked_plugin.status = PluginStatus.Disabled
mocked_plugin.is_active.return_value = False
plugin_manager = PluginManager()
- plugin_manager.plugins = [mocked_plugin]
+ Registry().register('mock_plugin', mocked_plugin)
+ State().add_service("mock", 1, is_plugin=True, status=PluginStatus.Active)
+ State().flush_preconditions()
# WHEN: We run finalise_plugins()
plugin_manager.new_service_created()
@@ -452,7 +495,9 @@
mocked_plugin.status = PluginStatus.Active
mocked_plugin.is_active.return_value = True
plugin_manager = PluginManager()
- plugin_manager.plugins = [mocked_plugin]
+ Registry().register('mock_plugin', mocked_plugin)
+ State().add_service("mock", 1, is_plugin=True, status=PluginStatus.Active)
+ State().flush_preconditions()
# WHEN: We run new_service_created()
plugin_manager.new_service_created()
=== modified file 'tests/functional/openlp_core/lib/test_serviceitem.py'
--- tests/functional/openlp_core/lib/test_serviceitem.py 2018-12-01 05:52:49 +0000
+++ tests/functional/openlp_core/lib/test_serviceitem.py 2019-01-27 20:26:59 +0000
@@ -26,6 +26,7 @@
from unittest import TestCase
from unittest.mock import MagicMock, patch
+from openlp.core.state import State
from openlp.core.common import md5_hash
from openlp.core.common.path import Path
from openlp.core.common.registry import Registry
@@ -109,8 +110,11 @@
service_item.add_icon = MagicMock()
FormattingTags.load_tags()
- # WHEN: We add a custom from a saved service
+ # WHEN: We add a custom from a saved serviceand set the media state
line = convert_file_service_item(TEST_PATH, 'serviceitem_custom_1.osj')
+ State().add_service("media", 0)
+ State().update_pre_conditions("media", True)
+ State().flush_preconditions()
service_item.set_from_service(line)
# THEN: We should get back a valid service item
@@ -151,7 +155,8 @@
assert service_item.is_valid is True, 'The new service item should be valid'
assert test_file == service_item.get_rendered_frame(0), 'The first frame should match the path to the image'
assert frame_array == service_item.get_frames()[0], 'The return should match frame array1'
- assert test_file == service_item.get_frame_path(0), 'The frame path should match the full path to the image'
+ assert test_file == str(service_item.get_frame_path(0)), \
+ 'The frame path should match the full path to the image'
assert image_name == service_item.get_frame_title(0), 'The frame title should match the image name'
assert image_name == service_item.get_display_title(), 'The display title should match the first image name'
assert service_item.is_image() is True, 'This service item should be of an "image" type'
@@ -193,12 +198,18 @@
# THEN: We should get back a valid service item
assert service_item.is_valid is True, 'The first service item should be valid'
assert service_item2.is_valid is True, 'The second service item should be valid'
- assert test_file1 == service_item.get_rendered_frame(0), 'The first frame should match the path to the image'
- assert test_file2 == service_item2.get_rendered_frame(0), 'The Second frame should match the path to the image'
- assert frame_array1 == service_item.get_frames()[0], 'The return should match the frame array1'
- assert frame_array2 == service_item2.get_frames()[0], 'The return should match the frame array2'
- assert test_file1 == service_item.get_frame_path(0), 'The frame path should match the full path
Follow ups
