Merge lp:~trb143/openlp/media_state into lp:openlp

[Tim Bentley]

This is to do a code review and see what mess is left

Refactor Media and add State management. (there is more to do!)

* Add Start of State management with dependency understanding. (works for VLC and PyMediaInfo)!
* refactor plugin manager to use this (part 1)
* move loading of static stuff from mainwindow.
* Only use VLC for media, remove other options (more cleanups to be done later)
* clean up pymediainfo usage
* remove audio and convert to vlc for song audio player
* fix many bugs discovered on my travels.
* upgraded vlc.py

lp:~trb143/openlp/media_state (revision 2914)
https://ci.openlp.io/job/Branch-01-Pull/2675/ [SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2569/ [SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/339/ [SUCCESS]
https://ci.openlp.io/job/Branch-03a-Build-Source/181/ [SUCCESS]
https://ci.openlp.io/job/Branch-03b-Build-macOS/160/ [SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code-Lint/1643/ [SUCCESS]
https://ci.openlp.io/job/Branch-04b-Test-Coverage/1456/ [SUCCESS]
https://ci.openlp.io/job/Branch-05-AppVeyor-Tests/346/ [FAILURE]
Stopping after failure

Failed builds:
 - Branch-05-AppVeyor-Tests #346: https://ci.openlp.io/job/Branch-05-AppVeyor-Tests/346/console

[Raoul Snyman (raoul-snyman)]

Linux tests failed, please see https://ci.openlp.io/job/MP-02-Linux_Tests/65/ for more details

[Raoul Snyman (raoul-snyman)]

Linux tests failed, please see https://ci.openlp.io/job/MP-02-Linux_Tests/66/ for more details

[Raoul Snyman (raoul-snyman)]

Linux tests failed, please see https://ci.openlp.io/job/MP-02-Linux_Tests/67/ for more details

[Raoul Snyman (raoul-snyman)]

Linux tests passed!

[Raoul Snyman (raoul-snyman)]

Linting passed!

[Raoul Snyman (raoul-snyman)]

macOS tests passed!

[Phill (phill-ridout)]

Only got to line 1023, will take another look later, just a few minor issues with doc strings (see inline comments)

[lp:~trb143/openlp/media_state]

2915. By Tim Bentley on 2019-01-08

Fix doc strings

[Phill (phill-ridout)]

I assume the commented out code is a work in progress?

L7027: if statement not needed
L7953: I'm not convinced the user will want to see a dialog box every time the preview, go live, or edit a song that has audio....

Also it looks like you've removed the background audio controls from the live slide controller, but not replaced them with anything?

review: Needs Information

[Phill (phill-ridout)]

L7953: I'm not convinced the user will want to see a dialog box every time the preview, go live, or edit a song that has audio....

Could you comment this out for no, I'mo concerned that this would too easily be overlooked. (Its only going to happen for people who try to load a song with background audio and have the media tab disable / problems with VLC integration.

If you can do that and resub, I'll be happy to approve it!

[lp:~trb143/openlp/media_state]

2916. By Tim Bentley on 2019-01-10

fix code

2917. By Tim Bentley on 2019-01-10

fix code

2918. By Tim Bentley on 2019-01-11

fix

2919. By Tim Bentley on 2019-01-20

settings updates

2920. By Tim Bentley on 2019-01-20

Move settings

2921. By Tim Bentley on 2019-01-20

clean ups and settings

2922. By Tim Bentley on 2019-01-20

More stream stuff

2923. By Tim Bentley on 2019-01-28

Add settings tab

2924. By Tim Bentley on 2019-02-14

Head

2925. By Tim Bentley on 2019-02-14

Head 2

2926. By Tim Bentley on 2019-03-24

Media is now playing again - just

2927. By Tim Bentley on 2019-03-25

head

2928. By Tim Bentley on 2019-03-25

media now works and plays

2929. By Tim Bentley on 2019-03-27

vlc tests pass

2930. By Tim Bentley on 2019-03-27

fix pep8.5

2931. By Tim Bentley on 2019-03-27

fix pep8.5

2932. By Tim Bentley on 2019-04-08

Fixes and handle missing display

2933. By Tim Bentley on 2019-04-09

handle missing live display preserve prview

2934. By Tim Bentley on 2019-04-09

add experimental flag

2935. By Tim Bentley on 2019-04-09

pep8

2936. By Tim Bentley on 2019-04-09

head

Unmerged revisions

=== modified file 'openlp/core/app.py'
--- openlp/core/app.py	2018-10-07 21:40:36 +0000
+++ openlp/core/app.py	2019-01-10 21:21:29 +0000
@@ -35,8 +35,10 @@
 
 from PyQt5 import QtCore, QtWidgets
 
+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 create_paths, copytree
 from openlp.core.common.registry import Registry
@@ -113,8 +115,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()
@@ -132,7 +136,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-06-28 15:37:37 +0000
+++ openlp/core/common/actions.py	2019-01-10 21:21:29 +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-02-03 11:24:39 +0000
+++ openlp/core/common/mixins.py	2019-01-10 21:21:29 +0000
@@ -49,7 +49,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-06 20:49:13 +0000
+++ openlp/core/common/registry.py	2019-01-10 21:21:29 +0000
@@ -203,6 +203,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):
         """
@@ -215,3 +216,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-08-25 14:08:19 +0000
+++ openlp/core/lib/mediamanageritem.py	2019-01-10 21:21:29 +0000
@@ -129,6 +129,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 retranslateUi(self):
         """
@@ -182,11 +185,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()
@@ -210,27 +216,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,
@@ -461,10 +470,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	2017-12-29 09:15:48 +0000
+++ openlp/core/lib/plugin.py	2019-01-10 21:21:29 +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
 
@@ -60,7 +58,7 @@
     VisibleName = 'visible_name'
 
 
-class Plugin(QtCore.QObject, RegistryProperties):
+class Plugin(RegistryBase, RegistryProperties):
     """
     Base class for openlp plugins to inherit from.
 
@@ -325,6 +323,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-08-25 14:08:19 +0000
+++ openlp/core/lib/pluginmanager.py	2019-01-10 21:21:29 +0000
@@ -24,8 +24,12 @@
 """
 import os
 
+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 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
@@ -50,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()
@@ -67,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):
@@ -106,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):
@@ -116,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):
@@ -125,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):
@@ -134,53 +136,73 @@
         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):
         """
         Loop through all the plugins and give them an opportunity to initialise themselves.
         """
-        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():
-                plugin.initialise()
-                self.log_info('Initialisation Complete for {plugin}'.format(plugin=plugin.name))
+        uninitialised_plugins = []
+        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:
+            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-10-27 01:40:20 +0000
+++ openlp/core/lib/serviceitem.py	2019-01-10 21:21:29 +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
@@ -441,7 +442,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
@@ -616,6 +617,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):
@@ -684,7 +689,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(frame['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-10 21:21:29 +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.renderer 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-10 21:21:29 +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-27 01:53:43 +0000
+++ openlp/core/ui/icons.py	2019-01-10 21:21:29 +0000
@@ -78,7 +78,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/maindisplay.py'
--- openlp/core/ui/maindisplay.py	2018-10-27 01:40:20 +0000
+++ openlp/core/ui/maindisplay.py	2019-01-10 21:21:29 +0000
@@ -30,7 +30,7 @@
 import html
 import logging
 
-from PyQt5 import QtCore, QtWidgets, QtWebKit, QtWebKitWidgets, QtGui, QtMultimedia
+from PyQt5 import QtCore, QtWidgets, QtWebKit, QtWebKitWidgets, QtGui
 
 from openlp.core.common import is_macosx, is_win
 from openlp.core.common.applocation import AppLocation
@@ -148,10 +148,6 @@
         self.override = {}
         self.retranslateUi()
         self.media_object = None
-        if self.is_live:
-            self.audio_player = AudioPlayer(self)
-        else:
-            self.audio_player = None
         self.first_time = True
         self.web_loaded = True
         self.setStyleSheet(OPAQUE_STYLESHEET)
@@ -604,106 +600,3 @@
         """
         self.web_view.setGeometry(0, 0, self.width(), self.height() - 1)
         self.web_view.setGeometry(0, 0, self.width(), self.height())
-
-
-class AudioPlayer(LogMixin, QtCore.QObject):
-    """
-    This Class will play audio only allowing components to work with a soundtrack independent of the user interface.
-    """
-    position_changed = QtCore.pyqtSignal(int)
-
-    def __init__(self, parent):
-        """
-        The constructor for the display form.
-
-        :param parent:  The parent widget.
-        """
-        super(AudioPlayer, self).__init__(parent)
-        self.player = QtMultimedia.QMediaPlayer()
-        self.playlist = QtMultimedia.QMediaPlaylist(self.player)
-        self.volume_slider = None
-        self.player.setPlaylist(self.playlist)
-        self.player.positionChanged.connect(self._on_position_changed)
-
-    def __del__(self):
-        """
-        Shutting down so clean up connections
-        """
-        self.stop()
-
-    def _on_position_changed(self, position):
-        """
-        Emit a signal when the position of the media player updates
-        """
-        self.position_changed.emit(position)
-
-    def set_volume_slider(self, slider):
-        """
-        Connect the volume slider to the media player
-        :param slider:
-        """
-        self.volume_slider = slider
-        self.volume_slider.setMinimum(0)
-        self.volume_slider.setMaximum(100)
-        self.volume_slider.setValue(self.player.volume())
-        self.volume_slider.valueChanged.connect(self.set_volume)
-
-    def set_volume(self, volume):
-        """
-        Set the volume of the media player
-
-        :param volume:
-        """
-        self.player.setVolume(volume)
-
-    def reset(self):
-        """
-        Reset the audio player, clearing the playlist and the queue.
-        """
-        self.stop()
-        self.playlist.clear()
-
-    def play(self):
-        """
-        We want to play the file so start it
-        """
-        self.player.play()
-
-    def pause(self):
-        """
-        Pause the Audio
-        """
-        self.player.pause()
-
-    def stop(self):
-        """
-        Stop the Audio and clean up
-        """
-        self.player.stop()
-
-    def add_to_playlist(self, file_names):
-        """
-        Add another file to the playlist.
-
-        :param file_names:  A list with files to be added to the playlist.
-        """
-        if not isinstance(file_names, list):
-            file_names = [file_names]
-        for file_name in file_names:
-            self.playlist.addMedia(QtMultimedia.QMediaContent(QtCore.QUrl.fromLocalFile(str(file_name))))
-
-    def next(self):
-        """
-        Skip forward to the next track in the list
-        """
-        self.playlist.next()
-
-    def go_to(self, index):
-        """
-        Go to a particular track in the list
-
-        :param index: The track to go to
-        """
-        self.playlist.setCurrentIndex(index)
-        if self.player.state() == QtMultimedia.QMediaPlayer.PlayingState:
-            self.player.play()

=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py	2018-10-27 01:53:43 +0000
+++ openlp/core/ui/mainwindow.py	2019-01-10 21:21:29 +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 is_win, is_macosx, add_actions
@@ -41,11 +42,8 @@
 from openlp.core.common.path import Path, copyfile, create_paths
 from openlp.core.common.registry import Registry
 from openlp.core.common.settings import Settings
-from openlp.core.display.renderer import Renderer
 from openlp.core.display.screens import ScreenList
-from openlp.core.lib.imagemanager import ImageManager
 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.shortcutlistform import ShortcutListForm
@@ -54,10 +52,8 @@
 from openlp.core.ui.servicemanager import ServiceManager
 from openlp.core.ui.aboutform import AboutForm
 from openlp.core.ui.pluginform import PluginForm
-from openlp.core.ui.slidecontroller import LiveController, PreviewController
 from openlp.core.ui.settingsform import SettingsForm
 from openlp.core.ui.firsttimeform import FirstTimeForm
-from openlp.core.ui.media.mediacontroller import MediaController
 from openlp.core.ui.printserviceform import PrintServiceForm
 from openlp.core.ui.style import PROGRESSBAR_STYLE, get_library_stylesheet
 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.setupUi(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()
@@ -887,7 +865,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-10 21:21:29 +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-08-25 14:08:19 +0000
+++ openlp/core/ui/media/mediacontroller.py	2019-01-10 21:21:29 +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 MediaState, MediaInfo, MediaType, get_media_players, set_media_players, \
-    parse_optical_path
+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
 
 log = logging.getLogger(__name__)
@@ -62,7 +66,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):
         """
@@ -77,7 +80,6 @@
     def mousePressEvent(self, event):
         """
         Mouse Press event no new functionality
-
         :param event: The triggering event
         """
         QtWidgets.QSlider.mousePressEvent(self, event)
@@ -110,7 +112,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
@@ -134,70 +138,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
 
@@ -235,36 +209,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.
@@ -280,7 +224,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',
@@ -344,16 +288,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):
         """
@@ -366,8 +306,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):
@@ -388,16 +327,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
@@ -410,7 +352,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:
@@ -430,7 +372,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'),
@@ -461,19 +403,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):
         """
@@ -492,7 +436,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
@@ -507,86 +451,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-10 21:21:29 +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-08-25 14:08:19 +0000
+++ openlp/core/ui/media/playertab.py	2019-01-10 21:21:29 +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
 
 
@@ -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-27 01:40:20 +0000
+++ openlp/core/ui/media/vendor/mediainfoWrapper.py	1970-01-01 00:00:00 +0000
@@ -1,128 +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	2017-12-28 08:27:44 +0000
+++ openlp/core/ui/media/vendor/vlc.py	2019-01-10 21:21:29 +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,15 +41,21 @@
 """
 
 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,
@@ -104,7 +111,19 @@
 
 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:
@@ -112,7 +131,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
@@ -131,10 +151,14 @@
             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
@@ -142,11 +166,11 @@
                 p = os.getcwd()
                 os.chdir(plugin_path)
                  # if chdir failed, this will raise an exception
-                dll = ctypes.CDLL('libvlc.dll')
+                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)
@@ -154,13 +178,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:
@@ -292,6 +323,8 @@
     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):
@@ -393,6 +426,37 @@
 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.
     '''
@@ -424,10 +488,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',
@@ -437,6 +512,8 @@
         1026: 'MediaListPlayerStopped',
         0x500: 'MediaDiscovererStarted',
         1281: 'MediaDiscovererEnded',
+        1282: 'RendererDiscovererItemAdded',
+        1283: 'RendererDiscovererItemDeleted',
         0x600: 'VlmMediaAdded',
         1537: 'VlmMediaRemoved',
         1538: 'VlmMediaChanged',
@@ -453,6 +530,7 @@
 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)
@@ -466,13 +544,21 @@
 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)
@@ -485,10 +571,14 @@
 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)
@@ -528,15 +618,21 @@
         20: 'Episode',
         21: 'ShowName',
         22: 'Actors',
+        23: 'AlbumArtist',
+        24: 'DiscNumber',
+        25: 'DiscTotal',
     }
 Meta.Actors      = Meta(22)
 Meta.Album       = Meta(4)
+Meta.AlbumArtist = Meta(23)
 Meta.Artist      = Meta(1)
 Meta.ArtworkURL  = Meta(15)
 Meta.Copyright   = Meta(3)
 Meta.Date        = Meta(8)
 Meta.Description = Meta(6)
 Meta.Director    = Meta(18)
+Meta.DiscNumber  = Meta(24)
+Meta.DiscTotal   = Meta(25)
 Meta.EncodedBy   = Meta(14)
 Meta.Episode     = Meta(20)
 Meta.Genre       = Meta(2)
@@ -558,7 +654,7 @@
 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_ = {
@@ -594,17 +690,102 @@
 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)
+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.
@@ -641,10 +822,12 @@
         2: 'down',
         3: 'left',
         4: 'right',
+        5: 'popup',
     }
 NavigateMode.activate = NavigateMode(0)
 NavigateMode.down     = NavigateMode(2)
 NavigateMode.left     = NavigateMode(3)
+NavigateMode.popup    = NavigateMode(5)
 NavigateMode.right    = NavigateMode(4)
 NavigateMode.up       = NavigateMode(1)
 
@@ -674,6 +857,23 @@
 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}.
     '''
@@ -756,276 +956,366 @@
 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.
+    @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
+        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))
+    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]
+        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))
+    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
+        @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))
+    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 #
@@ -1277,21 +1567,54 @@
     ]
 
 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.
 
@@ -1397,14 +1720,22 @@
             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 ]
         return libvlc_new(len(args), args)
@@ -1547,16 +1878,18 @@
 
     
     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.
@@ -1564,7 +1897,7 @@
         @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):
@@ -1575,65 +1908,30 @@
         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):
@@ -1643,30 +1941,6 @@
         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}.
         '''
@@ -1899,9 +2173,234 @@
         '''
         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.
@@ -1945,8 +2444,15 @@
         """
         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
 
 
     
@@ -1984,7 +2490,7 @@
 
     
     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.
         '''
@@ -2017,11 +2523,8 @@
     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.
@@ -2046,12 +2549,10 @@
 
     
     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)
@@ -2089,55 +2590,162 @@
         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):
@@ -2155,6 +2763,25 @@
         '''
         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.
@@ -2162,26 +2789,12 @@
         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.
@@ -2189,6 +2802,24 @@
         '''
         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
     '''
@@ -2229,7 +2860,7 @@
 
 class MediaList(_Ctype):
     '''Create a new MediaList instance.
-    
+
     Usage: MediaList(list_of_MRLs)
 
     See vlc.Instance.media_list_new documentation for details.
@@ -2249,10 +2880,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.
@@ -2435,6 +3066,13 @@
         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.
@@ -2454,6 +3092,14 @@
         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.
@@ -2463,7 +3109,7 @@
     
     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)
 
@@ -2529,7 +3175,7 @@
     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:]
@@ -2595,19 +3241,31 @@
         '''
         titleDescription_pp = ctypes.POINTER(TitleDescription)()
         n = libvlc_media_player_get_full_title_descriptions(self, ctypes.byref(titleDescription_pp))
-        info = ctypes.cast(ctypes.titleDescription_pp, ctypes.POINTER(ctypes.POINTER(TitleDescription) * n))
-        return info
+        info = ctypes.cast(titleDescription_pp, ctypes.POINTER(ctypes.POINTER(TitleDescription) * n))
+        try:
+            contents = info.contents
+        except ValueError:
+            # Media not parsed, no info.
+            return None
+        descr = ( contents[i].contents for i in range(len(contents)) )
+        return descr
 
     def get_full_chapter_descriptions(self, i_chapters_of_title):
         '''Get the full description of available chapters.
-        @param index: of the title to query for chapters.
-        @return: the chapter list
+        @param i_chapters_of_title: index of the title to query for chapters (uses current title if set to -1).
+        @return: the chapters list
         @version: LibVLC 3.0.0 and later.
         '''
         chapterDescription_pp = ctypes.POINTER(ChapterDescription)()
         n = libvlc_media_player_get_full_chapter_descriptions(self, ctypes.byref(chapterDescription_pp))
-        info = ctypes.cast(ctypes.chapterDescription_pp, ctypes.POINTER(ctypes.POINTER(ChapterDescription) * n))
-        return info
+        info = ctypes.cast(chapterDescription_pp, ctypes.POINTER(ctypes.POINTER(ChapterDescription) * n))
+        try:
+            contents = info.contents
+        except ValueError:
+            # Media not parsed, no info.
+            return None
+        descr = ( contents[i].contents for i in range(len(contents)) )
+        return descr
 
     def video_get_size(self, num=0):
         """Get the video size in pixels as 2-tuple (width, height).
@@ -2626,13 +3284,13 @@
         Specify where the media player should render its video
         output. If LibVLC was built without Win32/Win64 API output
         support, then this has no effects.
-           
+
         @param drawable: windows handle of the drawable.
         """
         if not isinstance(drawable, ctypes.c_void_p):
             drawable = ctypes.c_void_p(int(drawable))
         libvlc_media_player_set_hwnd(self, drawable)
-            
+
     def video_get_width(self, num=0):
         """Get the width of a video in pixels.
 
@@ -2673,6 +3331,45 @@
 
 
     
+    def get_fps(self):
+        '''Get movie fps rate
+        This function is provided for backward compatibility. It cannot deal with
+        multiple video tracks. In LibVLC versions prior to 3.0, it would also fail
+        if the file format did not convey the frame rate explicitly.
+        \deprecated Consider using L{media_tracks_get}() instead.
+        @return: frames per second (fps) for this playing movie, or 0 if unspecified.
+        '''
+        return libvlc_media_player_get_fps(self)
+
+    
+    def set_agl(self, drawable):
+        '''\deprecated Use L{set_nsobject}() instead.
+        '''
+        return libvlc_media_player_set_agl(self, drawable)
+
+    
+    def get_agl(self):
+        '''\deprecated Use L{get_nsobject}() instead.
+        '''
+        return libvlc_media_player_get_agl(self)
+
+    
+    def video_set_subtitle_file(self, psz_subtitle):
+        '''Set new video subtitle file.
+        \deprecated Use L{add_slave}() instead.
+        @param psz_subtitle: new video subtitle file.
+        @return: the success status (boolean).
+        '''
+        return libvlc_video_set_subtitle_file(self, str_to_bytes(psz_subtitle))
+
+    
+    def toggle_teletext(self):
+        '''Toggle teletext transparent status on video output.
+        \deprecated use L{video_set_teletext}() instead.
+        '''
+        return libvlc_toggle_teletext(self)
+
+    
     def release(self):
         '''Release a media_player after use
         Decrement the reference count of a media player object. If the
@@ -2746,11 +3443,43 @@
         return libvlc_media_player_stop(self)
 
     
+    def set_renderer(self, p_item):
+        '''Set a renderer to the media player
+        @note: must be called before the first call of L{play}() to
+        take effect.
+        See L{renderer_discoverer_new}.
+        @param p_item: an item discovered by L{renderer_discoverer_start}().
+        @return: 0 on success, -1 on error.
+        @version: LibVLC 3.0.0 or later.
+        '''
+        return libvlc_media_player_set_renderer(self, p_item)
+
+    
     def video_set_callbacks(self, lock, unlock, display, opaque):
         '''Set callbacks and private data to render decoded video to a custom area
         in memory.
         Use L{video_set_format}() or L{video_set_format_callbacks}()
         to configure the decoded format.
+        @warning: Rendering video into custom memory buffers is considerably less
+        efficient than rendering in a custom window as normal.
+        For optimal perfomances, VLC media player renders into a custom window, and
+        does not use this function and associated callbacks. It is B{highly
+        recommended} that other LibVLC-based application do likewise.
+        To embed video in a window, use libvlc_media_player_set_xid() or equivalent
+        depending on the operating system.
+        If window embedding does not fit the application use case, then a custom
+        LibVLC video output display plugin is required to maintain optimal video
+        rendering performances.
+        The following limitations affect performance:
+        - Hardware video decoding acceleration will either be disabled completely,
+          or require (relatively slow) copy from video/DSP memory to main memory.
+        - Sub-pictures (subtitles, on-screen display, etc.) must be blent into the
+          main picture by the CPU instead of the GPU.
+        - Depending on the video format, pixel format conversion, picture scaling,
+          cropping and/or picture re-orientation, must be performed by the CPU
+          instead of the GPU.
+        - Memory copying is required between LibVLC reference picture buffers and
+          application buffers (between lock and unlock callbacks).
         @param lock: callback to lock video memory (must not be None).
         @param unlock: callback to unlock video memory (or None if not needed).
         @param display: callback to display video (or None if not needed).
@@ -2789,16 +3518,16 @@
         Use the vout called "macosx".
         The drawable is an NSObject that follow the VLCOpenGLVideoViewEmbedding
         protocol:
-        @begincode
+        @code.m
         \@protocol VLCOpenGLVideoViewEmbedding <NSObject>
         - (void)addVoutSubview:(NSView *)view;
         - (void)removeVoutSubview:(NSView *)view;
         \@end
         @endcode
         Or it can be an NSView object.
-        If you want to use it along with Qt4 see the QMacCocoaViewContainer. Then
+        If you want to use it along with Qt see the QMacCocoaViewContainer. Then
         the following code should work:
-        @begincode
+        @code.mm
         
             NSView *video = [[NSView alloc] init];
             QMacCocoaViewContainer *container = new QMacCocoaViewContainer(video, parent);
@@ -2819,30 +3548,25 @@
         return libvlc_media_player_get_nsobject(self)
 
     
-    def set_agl(self, drawable):
-        '''Set the agl handler where the media player should render its video output.
-        @param drawable: the agl handler.
-        '''
-        return libvlc_media_player_set_agl(self, drawable)
-
-    
-    def get_agl(self):
-        '''Get the agl handler previously set with L{set_agl}().
-        @return: the agl handler or 0 if none where set.
-        '''
-        return libvlc_media_player_get_agl(self)
-
-    
     def set_xwindow(self, drawable):
         '''Set an X Window System drawable where the media player should render its
-        video output. If LibVLC was built without X11 output support, then this has
-        no effects.
-        The specified identifier must correspond to an existing Input/Output class
-        X11 window. Pixmaps are B{not} supported. The caller shall ensure that
-        the X11 server is the same as the one the VLC instance has been configured
-        with. This function must be called before video playback is started;
-        otherwise it will only take effect after playback stop and restart.
-        @param drawable: the ID of the X window.
+        video output. The call takes effect when the playback starts. If it is
+        already started, it might need to be stopped before changes apply.
+        If LibVLC was built without X11 output support, then this function has no
+        effects.
+        By default, LibVLC will capture input events on the video rendering area.
+        Use L{video_set_mouse_input}() and L{video_set_key_input}() to
+        disable that and deliver events to the parent window / to the application
+        instead. By design, the X11 protocol delivers input events to only one
+        recipient.
+        @warning
+        The application must call the XInitThreads() function from Xlib before
+        L{new}(), and before any call to XOpenDisplay() directly or via any
+        other library. Failure to call XInitThreads() will seriously impede LibVLC
+        performance. Calling XOpenDisplay() before XInitThreads() will eventually
+        crash the process. That is a limitation of Xlib.
+        @param drawable: X11 window ID @note The specified identifier must correspond to an existing Input/Output class X11 window. Pixmaps are B{not} currently supported. The default X11 server is assumed, i.e. that specified in the DISPLAY environment variable. @warning LibVLC can deal with invalid X11 handle errors, however some display drivers (EGL, GLX, VA and/or VDPAU) can unfortunately not. Thus the window handle must remain valid until playback is stopped, otherwise the process may abort or crash.
+        @bug No more than one window handle per media player instance can be specified. If the media has multiple simultaneously active video tracks, extra tracks will be rendered into external windows beyond the control of the application.
         '''
         return libvlc_media_player_set_xwindow(self, drawable)
 
@@ -2866,10 +3590,29 @@
         return libvlc_media_player_get_hwnd(self)
 
     
+    def set_android_context(self, p_awindow_handler):
+        '''Set the android context.
+        @param p_awindow_handler: org.videolan.libvlc.AWindow jobject owned by the org.videolan.libvlc.MediaPlayer class from the libvlc-android project.
+        @version: LibVLC 3.0.0 and later.
+        '''
+        return libvlc_media_player_set_android_context(self, p_awindow_handler)
+
+    
+    def set_evas_object(self, p_evas_object):
+        '''Set the EFL Evas Object.
+        @param p_evas_object: a valid EFL Evas Object (Evas_Object).
+        @return: -1 if an error was detected, 0 otherwise.
+        @version: LibVLC 3.0.0 and later.
+        '''
+        return libvlc_media_player_set_evas_object(self, p_evas_object)
+
+    
     def audio_set_callbacks(self, play, pause, resume, flush, drain, opaque):
-        '''Set callbacks and private data for decoded audio.
+        '''Sets callbacks and private data for decoded audio.
         Use L{audio_set_format}() or L{audio_set_format_callbacks}()
         to configure the decoded audio format.
+        @note: The audio callbacks override any other audio output mechanism.
+        If the callbacks are set, LibVLC will B{not} output audio in any way.
         @param play: callback to play audio samples (must not be None).
         @param pause: callback to pause playback (or None to ignore).
         @param resume: callback to resume playback (or None to ignore).
@@ -2893,8 +3636,8 @@
 
     
     def audio_set_format_callbacks(self, setup, cleanup):
-        '''Set decoded audio format. This only works in combination with
-        L{audio_set_callbacks}().
+        '''Sets decoded audio format via callbacks.
+        This only works in combination with L{audio_set_callbacks}().
         @param setup: callback to select the audio format (cannot be None).
         @param cleanup: callback to release any allocated resources (or None).
         @version: LibVLC 2.0.0 or later.
@@ -2903,7 +3646,7 @@
 
     
     def audio_set_format(self, format, rate, channels):
-        '''Set decoded audio format.
+        '''Sets a fixed decoded audio format.
         This only works in combination with L{audio_set_callbacks}(),
         and is mutually exclusive with L{audio_set_format_callbacks}().
         @param format: a four-characters string identifying the sample format (e.g. "S16N" or "FL32").
@@ -3040,18 +3783,11 @@
     
     def get_state(self):
         '''Get current movie state.
-        @return: the current state of the media player (playing, paused, ...) See libvlc_state_t.
+        @return: the current state of the media player (playing, paused, ...) See L{State}.
         '''
         return libvlc_media_player_get_state(self)
 
     
-    def get_fps(self):
-        '''Get movie fps rate.
-        @return: frames per second (fps) for this playing movie, or 0 if unspecified.
-        '''
-        return libvlc_media_player_get_fps(self)
-
-    
     def has_vout(self):
         '''How many video outputs does this media player have?
         @return: the number of video outputs.
@@ -3104,6 +3840,19 @@
         return libvlc_media_player_set_video_title_display(self, position, timeout)
 
     
+    def add_slave(self, i_type, psz_uri, b_select):
+        '''Add a slave to the current media player.
+        @note: If the player is playing, the slave will be added directly. This call
+        will also update the slave list of the attached L{Media}.
+        @param i_type: subtitle or audio.
+        @param psz_uri: Uri of the slave (should contain a valid scheme).
+        @param b_select: True if this slave should be selected when it's loaded.
+        @return: 0 on success, -1 on error.
+        @version: LibVLC 3.0.0 and later. See L{media_slaves_add}.
+        '''
+        return libvlc_media_player_add_slave(self, i_type, str_to_bytes(psz_uri), b_select)
+
+    
     def toggle_fullscreen(self):
         '''Toggle fullscreen status on non-embedded video outputs.
         @warning: The same limitations applies to this function
@@ -3190,6 +3939,17 @@
         return libvlc_video_set_aspect_ratio(self, str_to_bytes(psz_aspect))
 
     
+    def video_update_viewpoint(self, p_viewpoint, b_absolute):
+        '''Update the video viewpoint information.
+        @note: It is safe to call this function before the media player is started.
+        @param p_viewpoint: video viewpoint allocated via L{video_new_viewpoint}().
+        @param b_absolute: if true replace the old viewpoint with the new one. If false, increase/decrease it.
+        @return: -1 in case of error, 0 otherwise @note the values are set asynchronously, it will be used by the next frame displayed.
+        @version: LibVLC 3.0.0 and later.
+        '''
+        return libvlc_video_update_viewpoint(self, p_viewpoint, b_absolute)
+
+    
     def video_get_spu(self):
         '''Get current video subtitle.
         @return: the video subtitle selected, or -1 if none.
@@ -3212,14 +3972,6 @@
         return libvlc_video_set_spu(self, i_spu)
 
     
-    def video_set_subtitle_file(self, psz_subtitle):
-        '''Set new video subtitle file.
-        @param psz_subtitle: new video subtitle file.
-        @return: the success status (boolean).
-        '''
-        return libvlc_video_set_subtitle_file(self, str_to_bytes(psz_subtitle))
-
-    
     def video_get_spu_delay(self):
         '''Get the current subtitle delay. Positive values means subtitles are being
         displayed later, negative values earlier.
@@ -3256,7 +4008,9 @@
 
     
     def video_get_teletext(self):
-        '''Get current teletext page requested.
+        '''Get current teletext page requested or 0 if it's disabled.
+        Teletext is disabled by default, call L{video_set_teletext}() to enable
+        it.
         @return: the current teletext page requested.
         '''
         return libvlc_video_get_teletext(self)
@@ -3264,17 +4018,12 @@
     
     def video_set_teletext(self, i_page):
         '''Set new teletext page to retrieve.
-        @param i_page: teletex page number requested.
+        This function can also be used to send a teletext key.
+        @param i_page: teletex page number requested. This value can be 0 to disable teletext, a number in the range ]0;1000[ to show the requested page, or a \ref L{TeletextKey}. 100 is the default teletext page.
         '''
         return libvlc_video_set_teletext(self, i_page)
 
     
-    def toggle_teletext(self):
-        '''Toggle teletext transparent status on video output.
-        '''
-        return libvlc_toggle_teletext(self)
-
-    
     def video_get_track_count(self):
         '''Get number of available video tracks.
         @return: the number of available video tracks (int).
@@ -3302,7 +4051,7 @@
         If i_width AND i_height is 0, original size is used.
         If i_width XOR i_height is 0, original aspect-ratio is preserved.
         @param num: number of video output (typically 0 for the first/only one).
-        @param psz_filepath: the path where to save the screenshot to.
+        @param psz_filepath: the path of a file or a folder to save the screenshot into.
         @param i_width: the snapshot's width.
         @param i_height: the snapshot's height.
         @return: 0 on success, -1 if the video was not found.
@@ -3351,7 +4100,7 @@
     
     def video_get_logo_int(self, option):
         '''Get integer logo option.
-        @param option: logo option to get, values of libvlc_video_logo_option_t.
+        @param option: logo option to get, values of L{VideoLogoOption}.
         '''
         return libvlc_video_get_logo_int(self, option)
 
@@ -3361,7 +4110,7 @@
         are ignored.
         Passing libvlc_logo_enable as option value has the side effect of
         starting (arg !0) or stopping (arg 0) the logo filter.
-        @param option: logo option to set, values of libvlc_video_logo_option_t.
+        @param option: logo option to set, values of L{VideoLogoOption}.
         @param value: logo option value.
         '''
         return libvlc_video_set_logo_int(self, option, value)
@@ -3370,7 +4119,7 @@
     def video_set_logo_string(self, option, psz_value):
         '''Set logo option as string. Options that take a different type value
         are ignored.
-        @param option: logo option to set, values of libvlc_video_logo_option_t.
+        @param option: logo option to set, values of L{VideoLogoOption}.
         @param psz_value: logo option value.
         '''
         return libvlc_video_set_logo_string(self, option, str_to_bytes(psz_value))
@@ -3378,7 +4127,7 @@
     
     def video_get_adjust_int(self, option):
         '''Get integer adjust option.
-        @param option: adjust option to get, values of libvlc_video_adjust_option_t.
+        @param option: adjust option to get, values of L{VideoAdjustOption}.
         @version: LibVLC 1.1.1 and later.
         '''
         return libvlc_video_get_adjust_int(self, option)
@@ -3389,7 +4138,7 @@
         are ignored.
         Passing libvlc_adjust_enable as option value has the side effect of
         starting (arg !0) or stopping (arg 0) the adjust filter.
-        @param option: adust option to set, values of libvlc_video_adjust_option_t.
+        @param option: adust option to set, values of L{VideoAdjustOption}.
         @param value: adjust option value.
         @version: LibVLC 1.1.1 and later.
         '''
@@ -3398,7 +4147,7 @@
     
     def video_get_adjust_float(self, option):
         '''Get float adjust option.
-        @param option: adjust option to get, values of libvlc_video_adjust_option_t.
+        @param option: adjust option to get, values of L{VideoAdjustOption}.
         @version: LibVLC 1.1.1 and later.
         '''
         return libvlc_video_get_adjust_float(self, option)
@@ -3407,7 +4156,7 @@
     def video_set_adjust_float(self, option, value):
         '''Set adjust option as float. Options that take a different type value
         are ignored.
-        @param option: adust option to set, values of libvlc_video_adjust_option_t.
+        @param option: adust option to set, values of L{VideoAdjustOption}.
         @param value: adjust option value.
         @version: LibVLC 1.1.1 and later.
         '''
@@ -3419,7 +4168,7 @@
         @note: Any change will take be effect only after playback is stopped and
         restarted. Audio output cannot be changed while playing.
         @param psz_name: name of audio output, use psz_name of See L{AudioOutput}.
-        @return: 0 if function succeded, -1 on error.
+        @return: 0 if function succeeded, -1 on error.
         '''
         return libvlc_audio_output_set(self, str_to_bytes(psz_name))
 
@@ -3433,7 +4182,7 @@
         @warning: Some audio output devices in the list might not actually work in
         some circumstances. By default, it is recommended to not specify any
         explicit audio device.
-        @return: A None-terminated linked list of potential audio output devices. It must be freed it with L{audio_output_device_list_release}().
+        @return: A None-terminated linked list of potential audio output devices. It must be freed with L{audio_output_device_list_release}().
         @version: LibVLC 2.2.0 or later.
         '''
         return libvlc_audio_output_device_enum(self)
@@ -3467,6 +4216,24 @@
         return libvlc_audio_output_device_set(self, str_to_bytes(module), str_to_bytes(device_id))
 
     
+    def audio_output_device_get(self):
+        '''Get the current audio output device identifier.
+        This complements L{audio_output_device_set}().
+        @warning: The initial value for the current audio output device identifier
+        may not be set or may be some unknown value. A LibVLC application should
+        compare this value against the known device identifiers (e.g. those that
+        were previously retrieved by a call to L{audio_output_device_enum} or
+        L{audio_output_device_list_get}) to find the current audio output device.
+        It is possible that the selected audio output device changes (an external
+        change) without a call to L{audio_output_device_set}. That may make this
+        method unsuitable to use if a LibVLC application is attempting to track
+        dynamic audio device changes as they happen.
+        @return: the current audio output device identifier None if no device is selected or in case of error (the result must be released with free() or L{free}()).
+        @version: LibVLC 3.0.0 or later.
+        '''
+        return libvlc_audio_output_device_get(self)
+
+    
     def audio_toggle_mute(self):
         '''Toggle mute status.
         '''
@@ -3526,14 +4293,14 @@
     
     def audio_get_channel(self):
         '''Get current audio channel.
-        @return: the audio channel See libvlc_audio_output_channel_t.
+        @return: the audio channel See L{AudioOutputChannel}.
         '''
         return libvlc_audio_get_channel(self)
 
     
     def audio_set_channel(self, channel):
         '''Set current audio channel.
-        @param channel: the audio channel, See libvlc_audio_output_channel_t.
+        @param channel: the audio channel, See L{AudioOutputChannel}.
         @return: 0 on success, -1 on error.
         '''
         return libvlc_audio_set_channel(self, channel)
@@ -3578,21 +4345,25 @@
         '''
         return libvlc_media_player_set_equalizer(self, p_equalizer)
 
+    
+    def get_role(self):
+        '''Gets the media role.
+        @return: the media player role (\ref libvlc_media_player_role_t).
+        @version: LibVLC 3.0.0 and later.
+        '''
+        return libvlc_media_player_get_role(self)
+
+    
+    def set_role(self, role):
+        '''Sets the media role.
+        @param role: the media player role (\ref libvlc_media_player_role_t).
+        @return: 0 on success, -1 on error.
+        '''
+        return libvlc_media_player_set_role(self, role)
+
 
  # LibVLC __version__ functions #
 
-def libvlc_errmsg():
-    '''A human-readable error message for the last LibVLC error in the calling
-    thread. The resulting string is valid until another error occurs (at least
-    until the next LibVLC call).
-    @warning
-    This will be None if there was no error.
-    '''
-    f = _Cfunctions.get('libvlc_errmsg', None) or \
-        _Cfunction('libvlc_errmsg', (), None,
-                    ctypes.c_char_p)
-    return f()
-
 def libvlc_clearerr():
     '''Clears the LibVLC error status for the current thread. This is optional.
     By default, the error status is automatically overridden when a new error
@@ -3619,6 +4390,34 @@
     '''Create and initialize a libvlc instance.
     This functions accept a list of "command line" arguments similar to the
     main(). These arguments affect the LibVLC instance default configuration.
+    @note
+    LibVLC may create threads. Therefore, any thread-unsafe process
+    initialization must be performed before calling L{libvlc_new}(). In particular
+    and where applicable:
+    - setlocale() and textdomain(),
+    - setenv(), unsetenv() and putenv(),
+    - with the X11 display system, XInitThreads()
+      (see also L{libvlc_media_player_set_xwindow}()) and
+    - on Microsoft Windows, SetErrorMode().
+    - sigprocmask() shall never be invoked; pthread_sigmask() can be used.
+    On POSIX systems, the SIGCHLD signal B{must not} be ignored, i.e. the
+    signal handler must set to SIG_DFL or a function pointer, not SIG_IGN.
+    Also while LibVLC is active, the wait() function shall not be called, and
+    any call to waitpid() shall use a strictly positive value for the first
+    parameter (i.e. the PID). Failure to follow those rules may lead to a
+    deadlock or a busy loop.
+    Also on POSIX systems, it is recommended that the SIGPIPE signal be blocked,
+    even if it is not, in principles, necessary, e.g.:
+    @code
+    @endcode
+    On Microsoft Windows Vista/2008, the process error mode
+    SEM_FAILCRITICALERRORS flag B{must} be set before using LibVLC.
+    On later versions, that is optional and unnecessary.
+    Also on Microsoft Windows (Vista and any later version), setting the default
+    DLL directories to SYSTEM32 exclusively is strongly recommended for
+    security reasons:
+    @code
+    @endcode.
     @param argc: the number of arguments (should be 0).
     @param argv: list of arguments (should be None).
     @return: the libvlc instance or None in case of error.
@@ -3763,8 +4562,11 @@
     return f(event_type)
 
 def libvlc_log_get_context(ctx):
-    '''Gets debugging information about a log message: the name of the VLC module
-    emitting the message and the message location within the source code.
+    '''Gets log message debug infos.
+    This function retrieves self-debug information about a log message:
+    - the name of the VLC module emitting the message,
+    - the name of the source code module (i.e. file) and
+    - the line number within the source code module.
     The returned module name and file name will be None if unknown.
     The returned line number will similarly be zero if unknown.
     @param ctx: message context (as passed to the @ref libvlc_log_cb callback).
@@ -3777,10 +4579,12 @@
     return f(ctx)
 
 def libvlc_log_get_object(ctx, id):
-    '''Gets VLC object information about a log message: the type name of the VLC
-    object emitting the message, the object header if any and a temporaly-unique
-    object identifier. This information is mainly meant for B{manual}
-    troubleshooting.
+    '''Gets log message info.
+    This function retrieves meta-information about a log message:
+    - the type name of the VLC object emitting the message,
+    - the object header if any, and
+    - a temporaly-unique object identifier.
+    This information is mainly meant for B{manual} troubleshooting.
     The returned type name may be "generic" if unknown, but it cannot be None.
     The returned header will be None if unset; in current versions, the header
     is used to distinguish for VLM inputs.
@@ -3796,10 +4600,12 @@
     return f(ctx, id)
 
 def libvlc_log_unset(p_instance):
-    '''Unsets the logging callback for a LibVLC instance. This is rarely needed:
-    the callback is implicitly unset when the instance is destroyed.
-    This function will wait for any pending callbacks invocation to complete
-    (causing a deadlock if called from within the callback).
+    '''Unsets the logging callback.
+    This function deregisters the logging callback for a LibVLC instance.
+    This is rarely needed as the callback is implicitly unset when the instance
+    is destroyed.
+    @note: This function will wait for any pending callbacks invocation to
+    complete (causing a deadlock if called from within the callback).
     @param p_instance: libvlc instance.
     @version: LibVLC 2.1.0 or later.
     '''
@@ -3808,7 +4614,7 @@
                     None, Instance)
     return f(p_instance)
 
-def libvlc_log_set(cb, data, p_instance):
+def libvlc_log_set(p_instance, cb, data):
     '''Sets the logging callback for a LibVLC instance.
     This function is thread-safe: it will wait for any pending callbacks
     invocation to complete.
@@ -3820,7 +4626,7 @@
     f = _Cfunctions.get('libvlc_log_set', None) or \
         _Cfunction('libvlc_log_set', ((1,), (1,), (1,),), None,
                     None, Instance, LogCb, ctypes.c_void_p)
-    return f(cb, data, p_instance)
+    return f(p_instance, cb, data)
 
 def libvlc_log_set_file(p_instance, stream):
     '''Sets up logging to a file.
@@ -3875,6 +4681,522 @@
                     ctypes.c_int64)
     return f()
 
+def libvlc_media_discoverer_new(p_inst, psz_name):
+    '''Create a media discoverer object by name.
+    After this object is created, you should attach to media_list events in
+    order to be notified of new items discovered.
+    You need to call L{libvlc_media_discoverer_start}() in order to start the
+    discovery.
+    See L{libvlc_media_discoverer_media_list}
+    See L{libvlc_media_discoverer_event_manager}
+    See L{libvlc_media_discoverer_start}.
+    @param p_inst: libvlc instance.
+    @param psz_name: service name; use L{libvlc_media_discoverer_list_get}() to get a list of the discoverer names available in this libVLC instance.
+    @return: media discover object or None in case of error.
+    @version: LibVLC 3.0.0 or later.
+    '''
+    f = _Cfunctions.get('libvlc_media_discoverer_new', None) or \
+        _Cfunction('libvlc_media_discoverer_new', ((1,), (1,),), class_result(MediaDiscoverer),
+                    ctypes.c_void_p, Instance, ctypes.c_char_p)
+    return f(p_inst, psz_name)
+
+def libvlc_media_discoverer_start(p_mdis):
+    '''Start media discovery.
+    To stop it, call L{libvlc_media_discoverer_stop}() or
+    L{libvlc_media_discoverer_list_release}() directly.
+    See L{libvlc_media_discoverer_stop}.
+    @param p_mdis: media discover object.
+    @return: -1 in case of error, 0 otherwise.
+    @version: LibVLC 3.0.0 or later.
+    '''
+    f = _Cfunctions.get('libvlc_media_discoverer_start', None) or \
+        _Cfunction('libvlc_media_discoverer_start', ((1,),), None,
+                    ctypes.c_int, MediaDiscoverer)
+    return f(p_mdis)
+
+def libvlc_media_discoverer_stop(p_mdis):
+    '''Stop media discovery.
+    See L{libvlc_media_discoverer_start}.
+    @param p_mdis: media discover object.
+    @version: LibVLC 3.0.0 or later.
+    '''
+    f = _Cfunctions.get('libvlc_media_discoverer_stop', None) or \
+        _Cfunction('libvlc_media_discoverer_stop', ((1,),), None,
+                    None, MediaDiscoverer)
+    return f(p_mdis)
+
+def libvlc_media_discoverer_release(p_mdis):
+    '''Release media discover object. If the reference count reaches 0, then
+    the object will be released.
+    @param p_mdis: media service discover object.
+    '''
+    f = _Cfunctions.get('libvlc_media_discoverer_release', None) or \
+        _Cfunction('libvlc_media_discoverer_release', ((1,),), None,
+                    None, MediaDiscoverer)
+    return f(p_mdis)
+
+def libvlc_media_discoverer_media_list(p_mdis):
+    '''Get media service discover media list.
+    @param p_mdis: media service discover object.
+    @return: list of media items.
+    '''
+    f = _Cfunctions.get('libvlc_media_discoverer_media_list', None) or \
+        _Cfunction('libvlc_media_discoverer_media_list', ((1,),), class_result(MediaList),
+                    ctypes.c_void_p, MediaDiscoverer)
+    return f(p_mdis)
+
+def libvlc_media_discoverer_is_running(p_mdis):
+    '''Query if media service discover object is running.
+    @param p_mdis: media service discover object.
+    @return: true if running, false if not \libvlc_return_bool.
+    '''
+    f = _Cfunctions.get('libvlc_media_discoverer_is_running', None) or \
+        _Cfunction('libvlc_media_discoverer_is_running', ((1,),), None,
+                    ctypes.c_int, MediaDiscoverer)
+    return f(p_mdis)
+
+def libvlc_media_discoverer_list_get(p_inst, i_cat, ppp_services):
+    '''Get media discoverer services by category.
+    @param p_inst: libvlc instance.
+    @param i_cat: category of services to fetch.
+    @param ppp_services: address to store an allocated array of media discoverer services (must be freed with L{libvlc_media_discoverer_list_release}() by the caller) [OUT].
+    @return: the number of media discoverer services (0 on error).
+    @version: LibVLC 3.0.0 and later.
+    '''
+    f = _Cfunctions.get('libvlc_media_discoverer_list_get', None) or \
+        _Cfunction('libvlc_media_discoverer_list_get', ((1,), (1,), (1,),), None,
+                    ctypes.c_size_t, Instance, MediaDiscovererCategory, ctypes.POINTER(ctypes.POINTER(MediaDiscovererDescription)))
+    return f(p_inst, i_cat, ppp_services)
+
+def libvlc_media_discoverer_list_release(pp_services, i_count):
+    '''Release an array of media discoverer services.
+    @param pp_services: array to release.
+    @param i_count: number of elements in the array.
+    @version: LibVLC 3.0.0 and later. See L{libvlc_media_discoverer_list_get}().
+    '''
+    f = _Cfunctions.get('libvlc_media_discoverer_list_release', None) or \
+        _Cfunction('libvlc_media_discoverer_list_release', ((1,), (1,),), None,
+                    None, ctypes.POINTER(MediaDiscovererDescription), ctypes.c_size_t)
+    return f(pp_services, i_count)
+
+def libvlc_dialog_set_context(p_id, p_context):
+    '''Associate an opaque pointer with the dialog id.
+    @version: LibVLC 3.0.0 and later.
+    '''
+    f = _Cfunctions.get('libvlc_dialog_set_context', None) or \
+        _Cfunction('libvlc_dialog_set_context', ((1,), (1,),), None,
+                    None, ctypes.c_void_p, ctypes.c_void_p)
+    return f(p_id, p_context)
+
+def libvlc_dialog_get_context(p_id):
+    '''Return the opaque pointer associated with the dialog id.
+    @version: LibVLC 3.0.0 and later.
+    '''
+    f = _Cfunctions.get('libvlc_dialog_get_context', None) or \
+        _Cfunction('libvlc_dialog_get_context', ((1,),), None,
+                    ctypes.c_void_p, ctypes.c_void_p)
+    return f(p_id)
+
+def libvlc_dialog_post_login(p_id, psz_username, psz_password, b_store):
+    '''Post a login answer
+    After this call, p_id won't be valid anymore
+    See libvlc_dialog_cbs.pf_display_login.
+    @param p_id: id of the dialog.
+    @param psz_username: valid and non empty string.
+    @param psz_password: valid string (can be empty).
+    @param b_store: if true, store the credentials.
+    @return: 0 on success, or -1 on error.
+    @version: LibVLC 3.0.0 and later.
+    '''
+    f = _Cfunctions.get('libvlc_dialog_post_login', None) or \
+        _Cfunction('libvlc_dialog_post_login', ((1,), (1,), (1,), (1,),), None,
+                    ctypes.c_int, ctypes.c_void_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_bool)
+    return f(p_id, psz_username, psz_password, b_store)
+
+def libvlc_dialog_post_action(p_id, i_action):
+    '''Post a question answer
+    After this call, p_id won't be valid anymore
+    See libvlc_dialog_cbs.pf_display_question.
+    @param p_id: id of the dialog.
+    @param i_action: 1 for action1, 2 for action2.
+    @return: 0 on success, or -1 on error.
+    @version: LibVLC 3.0.0 and later.
+    '''
+    f = _Cfunctions.get('libvlc_dialog_post_action', None) or \
+        _Cfunction('libvlc_dialog_post_action', ((1,), (1,),), None,
+                    ctypes.c_int, ctypes.c_void_p, ctypes.c_int)
+    return f(p_id, i_action)
+
+def libvlc_dialog_dismiss(p_id):
+    '''Dismiss a dialog
+    After this call, p_id won't be valid anymore
+    See libvlc_dialog_cbs.pf_cancel.
+    @param p_id: id of the dialog.
+    @return: 0 on success, or -1 on error.
+    @version: LibVLC 3.0.0 and later.
+    '''
+    f = _Cfunctions.get('libvlc_dialog_dismiss', None) or \
+        _Cfunction('libvlc_dialog_dismiss', ((1,),), None,
+                    ctypes.c_int, ctypes.c_void_p)
+    return f(p_id)
+
+def libvlc_media_library_new(p_instance):
+    '''Create an new Media Library object.
+    @param p_instance: the libvlc instance.
+    @return: a new object or None on error.
+    '''
+    f = _Cfunctions.get('libvlc_media_library_new', None) or \
+        _Cfunction('libvlc_media_library_new', ((1,),), class_result(MediaLibrary),
+                    ctypes.c_void_p, Instance)
+    return f(p_instance)
+
+def libvlc_media_library_release(p_mlib):
+    '''Release media library object. This functions decrements the
+    reference count of the media library object. If it reaches 0,
+    then the object will be released.
+    @param p_mlib: media library object.
+    '''
+    f = _Cfunctions.get('libvlc_media_library_release', None) or \
+        _Cfunction('libvlc_media_library_release', ((1,),), None,
+                    None, MediaLibrary)
+    return f(p_mlib)
+
+def libvlc_media_library_retain(p_mlib):
+    '''Retain a reference to a media library object. This function will
+    increment the reference counting for this object. Use
+    L{libvlc_media_library_release}() to decrement the reference count.
+    @param p_mlib: media library object.
+    '''
+    f = _Cfunctions.get('libvlc_media_library_retain', None) or \
+        _Cfunction('libvlc_media_library_retain', ((1,),), None,
+                    None, MediaLibrary)
+    return f(p_mlib)
+
+def libvlc_media_library_load(p_mlib):
+    '''Load media library.
+    @param p_mlib: media library object.
+    @return: 0 on success, -1 on error.
+    '''
+    f = _Cfunctions.get('libvlc_media_library_load', None) or \
+        _Cfunction('libvlc_media_library_load', ((1,),), None,
+                    ctypes.c_int, MediaLibrary)
+    return f(p_mlib)
+
+def libvlc_media_library_media_list(p_mlib):
+    '''Get media library subitems.
+    @param p_mlib: media library object.
+    @return: media list subitems.
+    '''
+    f = _Cfunctions.get('libvlc_media_library_media_list', None) or \
+        _Cfunction('libvlc_media_library_media_list', ((1,),), class_result(MediaList),
+                    ctypes.c_void_p, MediaLibrary)
+    return f(p_mlib)
+
+def libvlc_vlm_release(p_instance):
+    '''Release the vlm instance related to the given L{Instance}.
+    @param p_instance: the instance.
+    '''
+    f = _Cfunctions.get('libvlc_vlm_release', None) or \
+        _Cfunction('libvlc_vlm_release', ((1,),), None,
+                    None, Instance)
+    return f(p_instance)
+
+def libvlc_vlm_add_broadcast(p_instance, psz_name, psz_input, psz_output, i_options, ppsz_options, b_enabled, b_loop):
+    '''Add a broadcast, with one input.
+    @param p_instance: the instance.
+    @param psz_name: the name of the new broadcast.
+    @param psz_input: the input MRL.
+    @param psz_output: the output MRL (the parameter to the "sout" variable).
+    @param i_options: number of additional options.
+    @param ppsz_options: additional options.
+    @param b_enabled: boolean for enabling the new broadcast.
+    @param b_loop: Should this broadcast be played in loop ?
+    @return: 0 on success, -1 on error.
+    '''
+    f = _Cfunctions.get('libvlc_vlm_add_broadcast', None) or \
+        _Cfunction('libvlc_vlm_add_broadcast', ((1,), (1,), (1,), (1,), (1,), (1,), (1,), (1,),), None,
+                    ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_int, ListPOINTER(ctypes.c_char_p), ctypes.c_int, ctypes.c_int)
+    return f(p_instance, psz_name, psz_input, psz_output, i_options, ppsz_options, b_enabled, b_loop)
+
+def libvlc_vlm_add_vod(p_instance, psz_name, psz_input, i_options, ppsz_options, b_enabled, psz_mux):
+    '''Add a vod, with one input.
+    @param p_instance: the instance.
+    @param psz_name: the name of the new vod media.
+    @param psz_input: the input MRL.
+    @param i_options: number of additional options.
+    @param ppsz_options: additional options.
+    @param b_enabled: boolean for enabling the new vod.
+    @param psz_mux: the muxer of the vod media.
+    @return: 0 on success, -1 on error.
+    '''
+    f = _Cfunctions.get('libvlc_vlm_add_vod', None) or \
+        _Cfunction('libvlc_vlm_add_vod', ((1,), (1,), (1,), (1,), (1,), (1,), (1,),), None,
+                    ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_int, ListPOINTER(ctypes.c_char_p), ctypes.c_int, ctypes.c_char_p)
+    return f(p_instance, psz_name, psz_input, i_options, ppsz_options, b_enabled, psz_mux)
+
+def libvlc_vlm_del_media(p_instance, psz_name):
+    '''Delete a media (VOD or broadcast).
+    @param p_instance: the instance.
+    @param psz_name: the media to delete.
+    @return: 0 on success, -1 on error.
+    '''
+    f = _Cfunctions.get('libvlc_vlm_del_media', None) or \
+        _Cfunction('libvlc_vlm_del_media', ((1,), (1,),), None,
+                    ctypes.c_int, Instance, ctypes.c_char_p)
+    return f(p_instance, psz_name)
+
+def libvlc_vlm_set_enabled(p_instance, psz_name, b_enabled):
+    '''Enable or disable a media (VOD or broadcast).
+    @param p_instance: the instance.
+    @param psz_name: the media to work on.
+    @param b_enabled: the new status.
+    @return: 0 on success, -1 on error.
+    '''
+    f = _Cfunctions.get('libvlc_vlm_set_enabled', None) or \
+        _Cfunction('libvlc_vlm_set_enabled', ((1,), (1,), (1,),), None,
+                    ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_int)
+    return f(p_instance, psz_name, b_enabled)
+
+def libvlc_vlm_set_output(p_instance, psz_name, psz_output):
+    '''Set the output for a media.
+    @param p_instance: the instance.
+    @param psz_name: the media to work on.
+    @param psz_output: the output MRL (the parameter to the "sout" variable).
+    @return: 0 on success, -1 on error.
+    '''
+    f = _Cfunctions.get('libvlc_vlm_set_output', None) or \
+        _Cfunction('libvlc_vlm_set_output', ((1,), (1,), (1,),), None,
+                    ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_char_p)
+    return f(p_instance, psz_name, psz_output)
+
+def libvlc_vlm_set_input(p_instance, psz_name, psz_input):
+    '''Set a media's input MRL. This will delete all existing inputs and
+    add the specified one.
+    @param p_instance: the instance.
+    @param psz_name: the media to work on.
+    @param psz_input: the input MRL.
+    @return: 0 on success, -1 on error.
+    '''
+    f = _Cfunctions.get('libvlc_vlm_set_input', None) or \
+        _Cfunction('libvlc_vlm_set_input', ((1,), (1,), (1,),), None,
+                    ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_char_p)
+    return f(p_instance, psz_name, psz_input)
+
+def libvlc_vlm_add_input(p_instance, psz_name, psz_input):
+    '''Add a media's input MRL. This will add the specified one.
+    @param p_instance: the instance.
+    @param psz_name: the media to work on.
+    @param psz_input: the input MRL.
+    @return: 0 on success, -1 on error.
+    '''
+    f = _Cfunctions.get('libvlc_vlm_add_input', None) or \
+        _Cfunction('libvlc_vlm_add_input', ((1,), (1,), (1,),), None,
+                    ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_char_p)
+    return f(p_instance, psz_name, psz_input)
+
+def libvlc_vlm_set_loop(p_instance, psz_name, b_loop):
+    '''Set a media's loop status.
+    @param p_instance: the instance.
+    @param psz_name: the media to work on.
+    @param b_loop: the new status.
+    @return: 0 on success, -1 on error.
+    '''
+    f = _Cfunctions.get('libvlc_vlm_set_loop', None) or \
+        _Cfunction('libvlc_vlm_set_loop', ((1,), (1,), (1,),), None,
+                    ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_int)
+    return f(p_instance, psz_name, b_loop)
+
+def libvlc_vlm_set_mux(p_instance, psz_name, psz_mux):
+    '''Set a media's vod muxer.
+    @param p_instance: the instance.
+    @param psz_name: the media to work on.
+    @param psz_mux: the new muxer.
+    @return: 0 on success, -1 on error.
+    '''
+    f = _Cfunctions.get('libvlc_vlm_set_mux', None) or \
+        _Cfunction('libvlc_vlm_set_mux', ((1,), (1,), (1,),), None,
+                    ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_char_p)
+    return f(p_instance, psz_name, psz_mux)
+
+def libvlc_vlm_change_media(p_instance, psz_name, psz_input, psz_output, i_options, ppsz_options, b_enabled, b_loop):
+    '''Edit the parameters of a media. This will delete all existing inputs and
+    add the specified one.
+    @param p_instance: the instance.
+    @param psz_name: the name of the new broadcast.
+    @param psz_input: the input MRL.
+    @param psz_output: the output MRL (the parameter to the "sout" variable).
+    @param i_options: number of additional options.
+    @param ppsz_options: additional options.
+    @param b_enabled: boolean for enabling the new broadcast.
+    @param b_loop: Should this broadcast be played in loop ?
+    @return: 0 on success, -1 on error.
+    '''
+    f = _Cfunctions.get('libvlc_vlm_change_media', None) or \
+        _Cfunction('libvlc_vlm_change_media', ((1,), (1,), (1,), (1,), (1,), (1,), (1,), (1,),), None,
+                    ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_int, ListPOINTER(ctypes.c_char_p), ctypes.c_int, ctypes.c_int)
+    return f(p_instance, psz_name, psz_input, psz_output, i_options, ppsz_options, b_enabled, b_loop)
+
+def libvlc_vlm_play_media(p_instance, psz_name):
+    '''Play the named broadcast.
+    @param p_instance: the instance.
+    @param psz_name: the name of the broadcast.
+    @return: 0 on success, -1 on error.
+    '''
+    f = _Cfunctions.get('libvlc_vlm_play_media', None) or \
+        _Cfunction('libvlc_vlm_play_media', ((1,), (1,),), None,
+                    ctypes.c_int, Instance, ctypes.c_char_p)
+    return f(p_instance, psz_name)
+
+def libvlc_vlm_stop_media(p_instance, psz_name):
+    '''Stop the named broadcast.
+    @param p_instance: the instance.
+    @param psz_name: the name of the broadcast.
+    @return: 0 on success, -1 on error.
+    '''
+    f = _Cfunctions.get('libvlc_vlm_stop_media', None) or \
+        _Cfunction('libvlc_vlm_stop_media', ((1,), (1,),), None,
+                    ctypes.c_int, Instance, ctypes.c_char_p)
+    return f(p_instance, psz_name)
+
+def libvlc_vlm_pause_media(p_instance, psz_name):
+    '''Pause the named broadcast.
+    @param p_instance: the instance.
+    @param psz_name: the name of the broadcast.
+    @return: 0 on success, -1 on error.
+    '''
+    f = _Cfunctions.get('libvlc_vlm_pause_media', None) or \
+        _Cfunction('libvlc_vlm_pause_media', ((1,), (1,),), None,
+                    ctypes.c_int, Instance, ctypes.c_char_p)
+    return f(p_instance, psz_name)
+
+def libvlc_vlm_seek_media(p_instance, psz_name, f_percentage):
+    '''Seek in the named broadcast.
+    @param p_instance: the instance.
+    @param psz_name: the name of the broadcast.
+    @param f_percentage: the percentage to seek to.
+    @return: 0 on success, -1 on error.
+    '''
+    f = _Cfunctions.get('libvlc_vlm_seek_media', None) or \
+        _Cfunction('libvlc_vlm_seek_media', ((1,), (1,), (1,),), None,
+                    ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_float)
+    return f(p_instance, psz_name, f_percentage)
+
+def libvlc_vlm_show_media(p_instance, psz_name):
+    '''Return information about the named media as a JSON
+    string representation.
+    This function is mainly intended for debugging use,
+    if you want programmatic access to the state of
+    a vlm_media_instance_t, please use the corresponding
+    libvlc_vlm_get_media_instance_xxx -functions.
+    Currently there are no such functions available for
+    vlm_media_t though.
+    @param p_instance: the instance.
+    @param psz_name: the name of the media, if the name is an empty string, all media is described.
+    @return: string with information about named media, or None on error.
+    '''
+    f = _Cfunctions.get('libvlc_vlm_show_media', None) or \
+        _Cfunction('libvlc_vlm_show_media', ((1,), (1,),), string_result,
+                    ctypes.c_void_p, Instance, ctypes.c_char_p)
+    return f(p_instance, psz_name)
+
+def libvlc_vlm_get_media_instance_position(p_instance, psz_name, i_instance):
+    '''Get vlm_media instance position by name or instance id.
+    @param p_instance: a libvlc instance.
+    @param psz_name: name of vlm media instance.
+    @param i_instance: instance id.
+    @return: position as float or -1. on error.
+    '''
+    f = _Cfunctions.get('libvlc_vlm_get_media_instance_position', None) or \
+        _Cfunction('libvlc_vlm_get_media_instance_position', ((1,), (1,), (1,),), None,
+                    ctypes.c_float, Instance, ctypes.c_char_p, ctypes.c_int)
+    return f(p_instance, psz_name, i_instance)
+
+def libvlc_vlm_get_media_instance_time(p_instance, psz_name, i_instance):
+    '''Get vlm_media instance time by name or instance id.
+    @param p_instance: a libvlc instance.
+    @param psz_name: name of vlm media instance.
+    @param i_instance: instance id.
+    @return: time as integer or -1 on error.
+    '''
+    f = _Cfunctions.get('libvlc_vlm_get_media_instance_time', None) or \
+        _Cfunction('libvlc_vlm_get_media_instance_time', ((1,), (1,), (1,),), None,
+                    ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_int)
+    return f(p_instance, psz_name, i_instance)
+
+def libvlc_vlm_get_media_instance_length(p_instance, psz_name, i_instance):
+    '''Get vlm_media instance length by name or instance id.
+    @param p_instance: a libvlc instance.
+    @param psz_name: name of vlm media instance.
+    @param i_instance: instance id.
+    @return: length of media item or -1 on error.
+    '''
+    f = _Cfunctions.get('libvlc_vlm_get_media_instance_length', None) or \
+        _Cfunction('libvlc_vlm_get_media_instance_length', ((1,), (1,), (1,),), None,
+                    ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_int)
+    return f(p_instance, psz_name, i_instance)
+
+def libvlc_vlm_get_media_instance_rate(p_instance, psz_name, i_instance):
+    '''Get vlm_media instance playback rate by name or instance id.
+    @param p_instance: a libvlc instance.
+    @param psz_name: name of vlm media instance.
+    @param i_instance: instance id.
+    @return: playback rate or -1 on error.
+    '''
+    f = _Cfunctions.get('libvlc_vlm_get_media_instance_rate', None) or \
+        _Cfunction('libvlc_vlm_get_media_instance_rate', ((1,), (1,), (1,),), None,
+                    ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_int)
+    return f(p_instance, psz_name, i_instance)
+
+def libvlc_vlm_get_media_instance_title(p_instance, psz_name, i_instance):
+    '''Get vlm_media instance title number by name or instance id.
+    @param p_instance: a libvlc instance.
+    @param psz_name: name of vlm media instance.
+    @param i_instance: instance id.
+    @return: title as number or -1 on error.
+    @bug: will always return 0.
+    '''
+    f = _Cfunctions.get('libvlc_vlm_get_media_instance_title', None) or \
+        _Cfunction('libvlc_vlm_get_media_instance_title', ((1,), (1,), (1,),), None,
+                    ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_int)
+    return f(p_instance, psz_name, i_instance)
+
+def libvlc_vlm_get_media_instance_chapter(p_instance, psz_name, i_instance):
+    '''Get vlm_media instance chapter number by name or instance id.
+    @param p_instance: a libvlc instance.
+    @param psz_name: name of vlm media instance.
+    @param i_instance: instance id.
+    @return: chapter as number or -1 on error.
+    @bug: will always return 0.
+    '''
+    f = _Cfunctions.get('libvlc_vlm_get_media_instance_chapter', None) or \
+        _Cfunction('libvlc_vlm_get_media_instance_chapter', ((1,), (1,), (1,),), None,
+                    ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_int)
+    return f(p_instance, psz_name, i_instance)
+
+def libvlc_vlm_get_media_instance_seekable(p_instance, psz_name, i_instance):
+    '''Is libvlc instance seekable ?
+    @param p_instance: a libvlc instance.
+    @param psz_name: name of vlm media instance.
+    @param i_instance: instance id.
+    @return: 1 if seekable, 0 if not, -1 if media does not exist.
+    @bug: will always return 0.
+    '''
+    f = _Cfunctions.get('libvlc_vlm_get_media_instance_seekable', None) or \
+        _Cfunction('libvlc_vlm_get_media_instance_seekable', ((1,), (1,), (1,),), None,
+                    ctypes.c_int, Instance, ctypes.c_char_p, ctypes.c_int)
+    return f(p_instance, psz_name, i_instance)
+
+def libvlc_vlm_get_event_manager(p_instance):
+    '''Get libvlc_event_manager from a vlm media.
+    The p_event_manager is immutable, so you don't have to hold the lock.
+    @param p_instance: a libvlc instance.
+    @return: libvlc_event_manager.
+    '''
+    f = _Cfunctions.get('libvlc_vlm_get_event_manager', None) or \
+        _Cfunction('libvlc_vlm_get_event_manager', ((1,),), class_result(EventManager),
+                    ctypes.c_void_p, Instance)
+    return f(p_instance)
+
 def libvlc_media_new_location(p_instance, psz_mrl):
     '''Create a media with a certain given media resource location,
     for instance a valid URL.
@@ -3928,6 +5250,22 @@
                     ctypes.c_void_p, Instance, ctypes.c_int)
     return f(p_instance, fd)
 
+def libvlc_media_new_callbacks(instance, open_cb, read_cb, seek_cb, close_cb, opaque):
+    '''Create a media with custom callbacks to read the data from.
+    @param instance: LibVLC instance.
+    @param open_cb: callback to open the custom bitstream input media.
+    @param read_cb: callback to read data (must not be None).
+    @param seek_cb: callback to seek, or None if seeking is not supported.
+    @param close_cb: callback to close the media, or None if unnecessary.
+    @param opaque: data pointer for the open callback.
+    @return: the newly created media or None on error @note If open_cb is None, the opaque pointer will be passed to read_cb, seek_cb and close_cb, and the stream size will be treated as unknown. @note The callbacks may be called asynchronously (from another thread). A single stream instance need not be reentrant. However the open_cb needs to be reentrant if the media is used by multiple player instances. @warning The callbacks may be used until all or any player instances that were supplied the media item are stopped. See L{libvlc_media_release}.
+    @version: LibVLC 3.0.0 and later.
+    '''
+    f = _Cfunctions.get('libvlc_media_new_callbacks', None) or \
+        _Cfunction('libvlc_media_new_callbacks', ((1,), (1,), (1,), (1,), (1,), (1,),), class_result(Media),
+                    ctypes.c_void_p, Instance, MediaOpenCb, MediaReadCb, MediaSeekCb, MediaCloseCb, ctypes.c_void_p)
+    return f(instance, open_cb, read_cb, seek_cb, close_cb, opaque)
+
 def libvlc_media_new_as_node(p_instance, psz_name):
     '''Create a media as an empty node with a given name.
     See L{libvlc_media_release}.
@@ -3980,7 +5318,7 @@
     return f(p_md, psz_options, i_flags)
 
 def libvlc_media_retain(p_md):
-    '''Retain a reference to a media descriptor object (libvlc_media_t). Use
+    '''Retain a reference to a media descriptor object (L{Media}). Use
     L{libvlc_media_release}() to decrement the reference count of a
     media descriptor object.
     @param p_md: the media descriptor.
@@ -4025,11 +5363,8 @@
 def libvlc_media_get_meta(p_md, e_meta):
     '''Read the meta of the media.
     If the media has not yet been parsed this will return None.
-    This methods automatically calls L{libvlc_media_parse_async}(), so after calling
-    it you may receive a libvlc_MediaMetaChanged event. If you prefer a synchronous
-    version ensure that you call L{libvlc_media_parse}() before get_meta().
     See L{libvlc_media_parse}
-    See L{libvlc_media_parse_async}
+    See L{libvlc_media_parse_with_options}
     See libvlc_MediaMetaChanged.
     @param p_md: the media descriptor.
     @param e_meta: the meta to read.
@@ -4063,12 +5398,10 @@
     return f(p_md)
 
 def libvlc_media_get_state(p_md):
-    '''Get current state of media descriptor object. Possible media states
-    are defined in libvlc_structures.c ( libvlc_NothingSpecial=0,
-    libvlc_Opening, libvlc_Buffering, libvlc_Playing, libvlc_Paused,
-    libvlc_Stopped, libvlc_Ended,
-    libvlc_Error).
-    See libvlc_state_t.
+    '''Get current state of media descriptor object. Possible media states are
+    libvlc_NothingSpecial=0, libvlc_Opening, libvlc_Playing, libvlc_Paused,
+    libvlc_Stopped, libvlc_Ended, libvlc_Error.
+    See L{State}.
     @param p_md: a media descriptor object.
     @return: state of media descriptor object.
     '''
@@ -4121,47 +5454,57 @@
                     ctypes.c_longlong, Media)
     return f(p_md)
 
-def libvlc_media_parse(p_md):
-    '''Parse a media.
-    This fetches (local) meta data and tracks information.
-    The method is synchronous.
-    See L{libvlc_media_parse_async}
-    See L{libvlc_media_get_meta}
-    See libvlc_media_get_tracks_info.
-    @param p_md: media descriptor object.
-    '''
-    f = _Cfunctions.get('libvlc_media_parse', None) or \
-        _Cfunction('libvlc_media_parse', ((1,),), None,
-                    None, Media)
-    return f(p_md)
-
-def libvlc_media_parse_async(p_md):
-    '''Parse a media.
-    This fetches (local) meta data and tracks information.
-    The method is the asynchronous of L{libvlc_media_parse}().
+def libvlc_media_parse_with_options(p_md, parse_flag, timeout):
+    '''Parse the media asynchronously with options.
+    This fetches (local or network) art, meta data and/or tracks information.
+    This method is the extended version of L{libvlc_media_parse_with_options}().
     To track when this is over you can listen to libvlc_MediaParsedChanged
-    event. However if the media was already parsed you will not receive this
-    event.
-    See L{libvlc_media_parse}
+    event. However if this functions returns an error, you will not receive any
+    events.
+    It uses a flag to specify parse options (see L{MediaParseFlag}). All
+    these flags can be combined. By default, media is parsed if it's a local
+    file.
+    @note: Parsing can be aborted with L{libvlc_media_parse_stop}().
     See libvlc_MediaParsedChanged
     See L{libvlc_media_get_meta}
-    See libvlc_media_get_tracks_info.
-    @param p_md: media descriptor object.
-    '''
-    f = _Cfunctions.get('libvlc_media_parse_async', None) or \
-        _Cfunction('libvlc_media_parse_async', ((1,),), None,
+    See L{libvlc_media_tracks_get}
+    See L{libvlc_media_get_parsed_status}
+    See L{MediaParseFlag}.
+    @param p_md: media descriptor object.
+    @param parse_flag: parse options:
+    @param timeout: maximum time allowed to preparse the media. If -1, the default "preparse-timeout" option will be used as a timeout. If 0, it will wait indefinitely. If > 0, the timeout will be used (in milliseconds).
+    @return: -1 in case of error, 0 otherwise.
+    @version: LibVLC 3.0.0 or later.
+    '''
+    f = _Cfunctions.get('libvlc_media_parse_with_options', None) or \
+        _Cfunction('libvlc_media_parse_with_options', ((1,), (1,), (1,),), None,
+                    ctypes.c_int, Media, MediaParseFlag, ctypes.c_int)
+    return f(p_md, parse_flag, timeout)
+
+def libvlc_media_parse_stop(p_md):
+    '''Stop the parsing of the media
+    When the media parsing is stopped, the libvlc_MediaParsedChanged event will
+    be sent with the libvlc_media_parsed_status_timeout status.
+    See L{libvlc_media_parse_with_options}.
+    @param p_md: media descriptor object.
+    @version: LibVLC 3.0.0 or later.
+    '''
+    f = _Cfunctions.get('libvlc_media_parse_stop', None) or \
+        _Cfunction('libvlc_media_parse_stop', ((1,),), None,
                     None, Media)
     return f(p_md)
 
-def libvlc_media_is_parsed(p_md):
+def libvlc_media_get_parsed_status(p_md):
     '''Get Parsed status for media descriptor object.
-    See libvlc_MediaParsedChanged.
+    See libvlc_MediaParsedChanged
+    See L{MediaParsedStatus}.
     @param p_md: media descriptor object.
-    @return: true if media object has been parsed otherwise it returns false \libvlc_return_bool.
+    @return: a value of the L{MediaParsedStatus} enum.
+    @version: LibVLC 3.0.0 or later.
     '''
-    f = _Cfunctions.get('libvlc_media_is_parsed', None) or \
-        _Cfunction('libvlc_media_is_parsed', ((1,),), None,
-                    ctypes.c_int, Media)
+    f = _Cfunctions.get('libvlc_media_get_parsed_status', None) or \
+        _Cfunction('libvlc_media_get_parsed_status', ((1,),), None,
+                    MediaParsedStatus, Media)
     return f(p_md)
 
 def libvlc_media_set_user_data(p_md, p_new_user_data):
@@ -4202,6 +5545,18 @@
                     ctypes.c_uint, Media, ctypes.POINTER(ctypes.POINTER(MediaTrack)))
     return f(p_md, tracks)
 
+def libvlc_media_get_codec_description(i_type, i_codec):
+    '''Get codec description from media elementary stream.
+    @param i_type: i_type from L{MediaTrack}.
+    @param i_codec: i_codec or i_original_fourcc from L{MediaTrack}.
+    @return: codec description.
+    @version: LibVLC 3.0.0 and later. See L{MediaTrack}.
+    '''
+    f = _Cfunctions.get('libvlc_media_get_codec_description', None) or \
+        _Cfunction('libvlc_media_get_codec_description', ((1,), (1,),), None,
+                    ctypes.c_char_p, TrackType, ctypes.c_uint32)
+    return f(i_type, i_codec)
+
 def libvlc_media_tracks_release(p_tracks, i_count):
     '''Release media descriptor's elementary streams description array.
     @param p_tracks: tracks info array to release.
@@ -4213,118 +5568,232 @@
                     None, ctypes.POINTER(MediaTrack), ctypes.c_uint)
     return f(p_tracks, i_count)
 
-def libvlc_media_discoverer_new_from_name(p_inst, psz_name):
-    '''Discover media service by name.
+def libvlc_media_get_type(p_md):
+    '''Get the media type of the media descriptor object.
+    @param p_md: media descriptor object.
+    @return: media type.
+    @version: LibVLC 3.0.0 and later. See L{MediaType}.
+    '''
+    f = _Cfunctions.get('libvlc_media_get_type', None) or \
+        _Cfunction('libvlc_media_get_type', ((1,),), None,
+                    MediaType, Media)
+    return f(p_md)
+
+def libvlc_media_slaves_add(p_md, i_type, i_priority, psz_uri):
+    '''Add a slave to the current media.
+    A slave is an external input source that may contains an additional subtitle
+    track (like a .srt) or an additional audio track (like a .ac3).
+    @note: This function must be called before the media is parsed (via
+    L{libvlc_media_parse_with_options}()) or before the media is played (via
+    L{libvlc_media_player_play}()).
+    @param p_md: media descriptor object.
+    @param i_type: subtitle or audio.
+    @param i_priority: from 0 (low priority) to 4 (high priority).
+    @param psz_uri: Uri of the slave (should contain a valid scheme).
+    @return: 0 on success, -1 on error.
+    @version: LibVLC 3.0.0 and later.
+    '''
+    f = _Cfunctions.get('libvlc_media_slaves_add', None) or \
+        _Cfunction('libvlc_media_slaves_add', ((1,), (1,), (1,), (1,),), None,
+                    ctypes.c_int, Media, MediaSlaveType, ctypes.c_int, ctypes.c_char_p)
+    return f(p_md, i_type, i_priority, psz_uri)
+
+def libvlc_media_slaves_clear(p_md):
+    '''Clear all slaves previously added by L{libvlc_media_slaves_add}() or
+    internally.
+    @param p_md: media descriptor object.
+    @version: LibVLC 3.0.0 and later.
+    '''
+    f = _Cfunctions.get('libvlc_media_slaves_clear', None) or \
+        _Cfunction('libvlc_media_slaves_clear', ((1,),), None,
+                    None, Media)
+    return f(p_md)
+
+def libvlc_media_slaves_get(p_md, ppp_slaves):
+    '''Get a media descriptor's slave list
+    The list will contain slaves parsed by VLC or previously added by
+    L{libvlc_media_slaves_add}(). The typical use case of this function is to save
+    a list of slave in a database for a later use.
+    @param p_md: media descriptor object.
+    @param ppp_slaves: address to store an allocated array of slaves (must be freed with L{libvlc_media_slaves_release}()) [OUT].
+    @return: the number of slaves (zero on error).
+    @version: LibVLC 3.0.0 and later. See L{libvlc_media_slaves_add}.
+    '''
+    f = _Cfunctions.get('libvlc_media_slaves_get', None) or \
+        _Cfunction('libvlc_media_slaves_get', ((1,), (1,),), None,
+                    ctypes.c_int, Media, ctypes.POINTER(ctypes.POINTER(MediaSlave)))
+    return f(p_md, ppp_slaves)
+
+def libvlc_media_slaves_release(pp_slaves, i_count):
+    '''Release a media descriptor's slave list.
+    @param pp_slaves: slave array to release.
+    @param i_count: number of elements in the array.
+    @version: LibVLC 3.0.0 and later.
+    '''
+    f = _Cfunctions.get('libvlc_media_slaves_release', None) or \
+        _Cfunction('libvlc_media_slaves_release', ((1,), (1,),), None,
+                    None, ctypes.POINTER(MediaSlave), ctypes.c_int)
+    return f(pp_slaves, i_count)
+
+def libvlc_renderer_item_hold(p_item):
+    '''Hold a renderer item, i.e. creates a new reference
+    This functions need to called from the libvlc_RendererDiscovererItemAdded
+    callback if the libvlc user wants to use this item after. (for display or
+    for passing it to the mediaplayer for example).
+    @return: the current item.
+    @version: LibVLC 3.0.0 or later.
+    '''
+    f = _Cfunctions.get('libvlc_renderer_item_hold', None) or \
+        _Cfunction('libvlc_renderer_item_hold', ((1,),), None,
+                    ctypes.c_void_p, ctypes.c_void_p)
+    return f(p_item)
+
+def libvlc_renderer_item_release(p_item):
+    '''Releases a renderer item, i.e. decrements its reference counter.
+    @version: LibVLC 3.0.0 or later.
+    '''
+    f = _Cfunctions.get('libvlc_renderer_item_release', None) or \
+        _Cfunction('libvlc_renderer_item_release', ((1,),), None,
+                    None, ctypes.c_void_p)
+    return f(p_item)
+
+def libvlc_renderer_item_name(p_item):
+    '''Get the human readable name of a renderer item.
+    @return: the name of the item (can't be None, must *not* be freed).
+    @version: LibVLC 3.0.0 or later.
+    '''
+    f = _Cfunctions.get('libvlc_renderer_item_name', None) or \
+        _Cfunction('libvlc_renderer_item_name', ((1,),), None,
+                    ctypes.c_char_p, ctypes.c_void_p)
+    return f(p_item)
+
+def libvlc_renderer_item_type(p_item):
+    '''Get the type (not translated) of a renderer item. For now, the type can only
+    be "chromecast" ("upnp", "airplay" may come later).
+    @return: the type of the item (can't be None, must *not* be freed).
+    @version: LibVLC 3.0.0 or later.
+    '''
+    f = _Cfunctions.get('libvlc_renderer_item_type', None) or \
+        _Cfunction('libvlc_renderer_item_type', ((1,),), None,
+                    ctypes.c_char_p, ctypes.c_void_p)
+    return f(p_item)
+
+def libvlc_renderer_item_icon_uri(p_item):
+    '''Get the icon uri of a renderer item.
+    @return: the uri of the item's icon (can be None, must *not* be freed).
+    @version: LibVLC 3.0.0 or later.
+    '''
+    f = _Cfunctions.get('libvlc_renderer_item_icon_uri', None) or \
+        _Cfunction('libvlc_renderer_item_icon_uri', ((1,),), None,
+                    ctypes.c_char_p, ctypes.c_void_p)
+    return f(p_item)
+
+def libvlc_renderer_item_flags(p_item):
+    '''Get the flags of a renderer item
+    See LIBVLC_RENDERER_CAN_AUDIO
+    See LIBVLC_RENDERER_CAN_VIDEO.
+    @return: bitwise flag: capabilities of the renderer, see.
+    @version: LibVLC 3.0.0 or later.
+    '''
+    f = _Cfunctions.get('libvlc_renderer_item_flags', None) or \
+        _Cfunction('libvlc_renderer_item_flags', ((1,),), None,
+                    ctypes.c_int, ctypes.c_void_p)
+    return f(p_item)
+
+def libvlc_renderer_discoverer_new(p_inst, psz_name):
+    '''Create a renderer discoverer object by name
+    After this object is created, you should attach to events in order to be
+    notified of the discoverer events.
+    You need to call L{libvlc_renderer_discoverer_start}() in order to start the
+    discovery.
+    See L{libvlc_renderer_discoverer_event_manager}()
+    See L{libvlc_renderer_discoverer_start}().
     @param p_inst: libvlc instance.
-    @param psz_name: service name.
+    @param psz_name: service name; use L{libvlc_renderer_discoverer_list_get}() to get a list of the discoverer names available in this libVLC instance.
     @return: media discover object or None in case of error.
+    @version: LibVLC 3.0.0 or later.
     '''
-    f = _Cfunctions.get('libvlc_media_discoverer_new_from_name', None) or \
-        _Cfunction('libvlc_media_discoverer_new_from_name', ((1,), (1,),), class_result(MediaDiscoverer),
+    f = _Cfunctions.get('libvlc_renderer_discoverer_new', None) or \
+        _Cfunction('libvlc_renderer_discoverer_new', ((1,), (1,),), None,
                     ctypes.c_void_p, Instance, ctypes.c_char_p)
     return f(p_inst, psz_name)
 
-def libvlc_media_discoverer_release(p_mdis):
-    '''Release media discover object. If the reference count reaches 0, then
-    the object will be released.
-    @param p_mdis: media service discover object.
-    '''
-    f = _Cfunctions.get('libvlc_media_discoverer_release', None) or \
-        _Cfunction('libvlc_media_discoverer_release', ((1,),), None,
-                    None, MediaDiscoverer)
-    return f(p_mdis)
-
-def libvlc_media_discoverer_localized_name(p_mdis):
-    '''Get media service discover object its localized name.
-    @param p_mdis: media discover object.
-    @return: localized name.
-    '''
-    f = _Cfunctions.get('libvlc_media_discoverer_localized_name', None) or \
-        _Cfunction('libvlc_media_discoverer_localized_name', ((1,),), string_result,
-                    ctypes.c_void_p, MediaDiscoverer)
-    return f(p_mdis)
-
-def libvlc_media_discoverer_media_list(p_mdis):
-    '''Get media service discover media list.
-    @param p_mdis: media service discover object.
-    @return: list of media items.