Merge lp:~trb143/openlp/webengine-migrate-trunk into lp:~openlp-dev/openlp/webengine-migrate

[Tim Bentley]

Fixed trunk merge so now matches that.

[Tomas Groth (tomasgroth)]

review: Approve

=== 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