← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~crichter/openlp/bug-936236 into lp:openlp

 

rimach has proposed merging lp:~crichter/openlp/bug-936236 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~crichter/openlp/bug-936236/+merge/96674

- change the layout of the up/down buttons
- fix issue: if choose down button without selecting any item before the settings dialog were broken
-- 
https://code.launchpad.net/~crichter/openlp/bug-936236/+merge/96674
Your team OpenLP Core is requested to review the proposed merge of lp:~crichter/openlp/bug-936236 into lp:openlp.
=== modified file 'openlp/core/ui/media/vlc.py'
--- openlp/core/ui/media/vlc.py	2011-12-08 20:51:44 +0000
+++ openlp/core/ui/media/vlc.py	2012-03-08 22:25:22 +0000
@@ -47,7 +47,7 @@
 from inspect import getargspec
 
 __version__ = "N/A"
-build_date  = "Tue Sep 13 17:50:18 2011"
+build_date  = "Tue Jan 17 12:20:48 2012"
 
 # Internal guard to prevent internal classes to be directly
 # instanciated.
@@ -56,7 +56,7 @@
 def find_lib():
     dll = None
     plugin_path = None
-    if sys.platform.startswith('linux') or sys.platform.startswith('freeBSD'):
+    if sys.platform.startswith('linux'):
         p = find_library('vlc')
         try:
             dll = ctypes.CDLL(p)
@@ -127,6 +127,7 @@
     _Ints = (int, long)
 except NameError:  # no long in Python 3+
     _Ints =  int
+_Seqs = (list, tuple)
 
 # Default instance. It is used to instanciate classes directly in the
 # OO-wrapper.
@@ -140,19 +141,24 @@
         _default_instance = Instance()
     return _default_instance
 
-_Seqs = (list, tuple)
-
 _Cfunctions = {}  # from LibVLC __version__
+_Globals = globals()  # sys.modules[__name__].__dict__
 
 def _Cfunction(name, flags, errcheck, *types):
     """(INTERNAL) New ctypes function binding.
     """
-    if hasattr(dll, name):
+    if hasattr(dll, name) and name in _Globals:
         p = ctypes.CFUNCTYPE(*types)
         f = p((name, dll), flags)
         if errcheck is not None:
             f.errcheck = errcheck
-        _Cfunctions[name] = f
+        # replace the Python function
+        # in this module, but only when
+        # running as python -O or -OO
+        if __debug__:
+            _Cfunctions[name] = f
+        else:
+            _Globals[name] = f
         return f
     raise NameError('no function %r' % (name,))
 
@@ -172,6 +178,18 @@
         return None
     return _Cobject(cls, ctypes.c_void_p(ptr))
 
+class _Cstruct(ctypes.Structure):
+    """(INTERNAL) Base class for ctypes structures.
+    """
+    _fields_ = []  # list of 2-tuples ('name', ctyptes.<type>)
+
+    def __str__(self):
+        l = [' %s:\t%s' % (n, getattr(self, n)) for n, _ in self._fields_]
+        return '\n'.join([self.__class__.__name__] + l)
+
+    def __repr__(self):
+        return '%s.%s' % (self.__class__.__module__, self)
+
 class _Ctype(object):
     """(INTERNAL) Base class for ctypes.
     """
@@ -265,6 +283,7 @@
         271: 'MediaPlayerTitleChanged',
         272: 'MediaPlayerSnapshotTaken',
         273: 'MediaPlayerLengthChanged',
+        274: 'MediaPlayerVout',
         0x200: 'MediaListItemAdded',
         513: 'MediaListWillAddItem',
         514: 'MediaListItemDeleted',
@@ -325,6 +344,7 @@
 EventType.MediaPlayerStopped            = EventType(262)
 EventType.MediaPlayerTimeChanged        = EventType(267)
 EventType.MediaPlayerTitleChanged       = EventType(271)
+EventType.MediaPlayerVout               = EventType(274)
 EventType.MediaStateChanged             = EventType(5)
 EventType.MediaSubItemAdded             = EventType(1)
 EventType.VlmMediaAdded                 = EventType(0x600)
@@ -560,21 +580,18 @@
 
  # From libvlc_structures.h
 
-class AudioOutput(ctypes.Structure):
+class AudioOutput(_Cstruct):
 
     def __str__(self):
         return '%s(%s:%s)' % (self.__class__.__name__, self.name, self.description)
 
-    def __repr__(self):
-        return '%s.%s' % (self.__class__.__module__, self.__str__())
-
 AudioOutput._fields_ = [  # recursive struct
-        ('name',        ctypes.c_char_p),
-        ('description', ctypes.c_char_p),
-        ('next',        ctypes.POINTER(AudioOutput)),
+    ('name',        ctypes.c_char_p),
+    ('description', ctypes.c_char_p),
+    ('next',        ctypes.POINTER(AudioOutput)),
     ]
 
-class LogMessage(ctypes.Structure):
+class LogMessage(_Cstruct):
     _fields_ = [
         ('size',     ctypes.c_uint  ),
         ('severity', ctypes.c_int   ),
@@ -591,16 +608,13 @@
     def __str__(self):
         return '%s(%d:%s): %s' % (self.__class__.__name__, self.severity, self.type, self.message)
 
-    def __repr__(self):
-        return '%s.%s' % (self.__class__.__module__, self.__str__())
-
-class MediaEvent(ctypes.Structure):
+class MediaEvent(_Cstruct):
     _fields_ = [
         ('media_name',    ctypes.c_char_p),
         ('instance_name', ctypes.c_char_p),
     ]
 
-class MediaStats(ctypes.Structure):
+class MediaStats(_Cstruct):
     _fields_ = [
         ('read_bytes',          ctypes.c_int  ),
         ('input_bitrate',       ctypes.c_float),
@@ -619,14 +633,7 @@
         ('send_bitrate',        ctypes.c_float),
     ]
 
-    def __str__(self):
-        l = [' %s:\t%s' % (n, getattr(self, n)) for n, t in self._fields_]
-        return '\n'.join([self.__class__.__name__] + l)
-
-    def __repr__(self):
-        return '%s.%s' % (self.__class__.__module__, self.__str__())
-
-class MediaTrackInfo(ctypes.Structure):
+class MediaTrackInfo(_Cstruct):
     _fields_ = [
         ('codec',              ctypes.c_uint32),
         ('id',                 ctypes.c_int   ),
@@ -637,14 +644,7 @@
         ('rate_or_width',      ctypes.c_uint  ),
     ]
 
-    def __str__(self):
-        l = [" %s:\t%s" % (n, getattr(self, n)) for n, t in self._fields_]
-        return "\n".join([self.__class__.__name__] + l)
-
-    def __repr__(self):
-        return '%s.%s' % (self.__class__.__module__, self.__str__())
-
-class PlaylistItem(ctypes.Structure):
+class PlaylistItem(_Cstruct):
     _fields_ = [
         ('id',   ctypes.c_int   ),
         ('uri',  ctypes.c_char_p),
@@ -654,9 +654,6 @@
     def __str__(self):
         return '%s #%d %s (uri %s)' % (self.__class__.__name__, self.id, self.name, self.uri)
 
-    def __repr__(self):
-        return '%s.%s' % (self.__class__.__module__, self.__str__())
-
 class Position(object):
     """Enum-like, immutable window position constants.
 
@@ -680,7 +677,7 @@
     def __setattr__(self, *unused):  #PYCHOK expected
         raise TypeError('immutable constants')
 
-class Rectangle(ctypes.Structure):
+class Rectangle(_Cstruct):
     _fields_ = [
         ('top',    ctypes.c_int),
         ('left',   ctypes.c_int),
@@ -688,18 +685,15 @@
         ('right',  ctypes.c_int),
     ]
 
-class TrackDescription(ctypes.Structure):
+class TrackDescription(_Cstruct):
 
     def __str__(self):
         return '%s(%d:%s)' % (self.__class__.__name__, self.id, self.name)
 
-    def __repr__(self):
-        return '%s.%s' % (self.__class__.__module__, self.__str__())
-
 TrackDescription._fields_ = [  # recursive struct
-        ('id',   ctypes.c_int   ),
-        ('name', ctypes.c_char_p),
-        ('next', ctypes.POINTER(TrackDescription)),
+    ('id',   ctypes.c_int   ),
+    ('name', ctypes.c_char_p),
+    ('next', ctypes.POINTER(TrackDescription)),
     ]
 
 def track_description_list(head):
@@ -712,7 +706,11 @@
             item = item.contents
             r.append((item.id, item.name))
             item = item.next
-        libvlc_track_description_release(head)
+        try:
+            libvlc_track_description_release(head)
+        except NameError:
+            libvlc_track_description_list_release(head)
+
     return r
 
 class EventUnion(ctypes.Union):
@@ -735,23 +733,24 @@
         ('media_event',  MediaEvent       ),
     ]
 
-class Event(ctypes.Structure):
+class Event(_Cstruct):
     _fields_ = [
         ('type',   EventType      ),
         ('object', ctypes.c_void_p),
         ('u',      EventUnion     ),
     ]
 
-class ModuleDescription(ctypes.Structure):
+class ModuleDescription(_Cstruct):
+
     def __str__(self):
         return '%s %s (%s)' % (self.__class__.__name__, self.shortname, self.name)
 
 ModuleDescription._fields_ = [  # recursive struct
-    ('name', ctypes.c_char_p),
+    ('name',      ctypes.c_char_p),
     ('shortname', ctypes.c_char_p),
-    ('longname', ctypes.c_char_p),
-    ('help', ctypes.c_char_p),
-    ('next', ctypes.POINTER(ModuleDescription)),
+    ('longname',  ctypes.c_char_p),
+    ('help',      ctypes.c_char_p),
+    ('next',      ctypes.POINTER(ModuleDescription)),
     ]
 
 def module_description_list(head):
@@ -2486,6 +2485,25 @@
         '''
         return libvlc_video_set_subtitle_file(self, psz_subtitle)
 
+    def video_get_spu_delay(self):
+        '''Get the current subtitle delay. Positive values means subtitles are being
+        displayed later, negative values earlier.
+        @return: time (in microseconds) the display of subtitles is being delayed.
+        @version: LibVLC 1.2.0 or later.
+        '''
+        return libvlc_video_get_spu_delay(self)
+
+    def video_set_spu_delay(self, i_delay):
+        '''Set the subtitle delay. This affects the timing of when the subtitle will
+        be displayed. Positive values result in subtitles being displayed later,
+        while negative values will result in subtitles being displayed earlier.
+        The subtitle delay will be reset to zero each time the media changes.
+        @param i_delay: time (in microseconds) the display of subtitles should be delayed.
+        @return: 0 on success, -1 on error.
+        @version: LibVLC 1.2.0 or later.
+        '''
+        return libvlc_video_set_spu_delay(self, i_delay)
+
     def video_get_crop_geometry(self):
         '''Get current crop filter geometry.
         @return: the crop filter geometry or NULL if unset.
@@ -2756,9 +2774,6 @@
     f = _Cfunctions.get('libvlc_errmsg', None) or \
         _Cfunction('libvlc_errmsg', (), None,
                     ctypes.c_char_p)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_errmsg
-        libvlc_errmsg = f
     return f()
 
 def libvlc_clearerr():
@@ -2769,9 +2784,6 @@
     f = _Cfunctions.get('libvlc_clearerr', None) or \
         _Cfunction('libvlc_clearerr', (), None,
                     None)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_clearerr
-        libvlc_clearerr = f
     return f()
 
 def libvlc_new(argc, argv):
@@ -2786,9 +2798,6 @@
     f = _Cfunctions.get('libvlc_new', None) or \
         _Cfunction('libvlc_new', ((1,), (1,),), class_result(Instance),
                     ctypes.c_void_p, ctypes.c_int, ListPOINTER(ctypes.c_char_p))
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_new
-        libvlc_new = f
     return f(argc, argv)
 
 def libvlc_release(p_instance):
@@ -2799,9 +2808,6 @@
     f = _Cfunctions.get('libvlc_release', None) or \
         _Cfunction('libvlc_release', ((1,),), None,
                     None, Instance)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_release
-        libvlc_release = f
     return f(p_instance)
 
 def libvlc_retain(p_instance):
@@ -2812,9 +2818,6 @@
     f = _Cfunctions.get('libvlc_retain', None) or \
         _Cfunction('libvlc_retain', ((1,),), None,
                     None, Instance)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_retain
-        libvlc_retain = f
     return f(p_instance)
 
 def libvlc_add_intf(p_instance, name):
@@ -2826,9 +2829,6 @@
     f = _Cfunctions.get('libvlc_add_intf', None) or \
         _Cfunction('libvlc_add_intf', ((1,), (1,),), None,
                     ctypes.c_int, Instance, ctypes.c_char_p)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_add_intf
-        libvlc_add_intf = f
     return f(p_instance, name)
 
 def libvlc_wait(p_instance):
@@ -2839,9 +2839,6 @@
     f = _Cfunctions.get('libvlc_wait', None) or \
         _Cfunction('libvlc_wait', ((1,),), None,
                     None, Instance)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_wait
-        libvlc_wait = f
     return f(p_instance)
 
 def libvlc_set_user_agent(p_instance, name, http):
@@ -2855,9 +2852,6 @@
     f = _Cfunctions.get('libvlc_set_user_agent', None) or \
         _Cfunction('libvlc_set_user_agent', ((1,), (1,), (1,),), None,
                     None, Instance, ctypes.c_char_p, ctypes.c_char_p)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_set_user_agent
-        libvlc_set_user_agent = f
     return f(p_instance, name, http)
 
 def libvlc_get_version():
@@ -2868,9 +2862,6 @@
     f = _Cfunctions.get('libvlc_get_version', None) or \
         _Cfunction('libvlc_get_version', (), None,
                     ctypes.c_char_p)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_get_version
-        libvlc_get_version = f
     return f()
 
 def libvlc_get_compiler():
@@ -2881,9 +2872,6 @@
     f = _Cfunctions.get('libvlc_get_compiler', None) or \
         _Cfunction('libvlc_get_compiler', (), None,
                     ctypes.c_char_p)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_get_compiler
-        libvlc_get_compiler = f
     return f()
 
 def libvlc_get_changeset():
@@ -2894,9 +2882,6 @@
     f = _Cfunctions.get('libvlc_get_changeset', None) or \
         _Cfunction('libvlc_get_changeset', (), None,
                     ctypes.c_char_p)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_get_changeset
-        libvlc_get_changeset = f
     return f()
 
 def libvlc_free(ptr):
@@ -2908,9 +2893,6 @@
     f = _Cfunctions.get('libvlc_free', None) or \
         _Cfunction('libvlc_free', ((1,),), None,
                     None, ctypes.c_void_p)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_free
-        libvlc_free = f
     return f(ptr)
 
 def libvlc_event_attach(p_event_manager, i_event_type, f_callback, user_data):
@@ -2924,9 +2906,6 @@
     f = _Cfunctions.get('libvlc_event_attach', None) or \
         _Cfunction('libvlc_event_attach', ((1,), (1,), (1,), (1,),), None,
                     ctypes.c_int, EventManager, ctypes.c_uint, ctypes.c_void_p, ctypes.c_void_p)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_event_attach
-        libvlc_event_attach = f
     return f(p_event_manager, i_event_type, f_callback, user_data)
 
 def libvlc_event_detach(p_event_manager, i_event_type, f_callback, p_user_data):
@@ -2939,9 +2918,6 @@
     f = _Cfunctions.get('libvlc_event_detach', None) or \
         _Cfunction('libvlc_event_detach', ((1,), (1,), (1,), (1,),), None,
                     None, EventManager, ctypes.c_uint, ctypes.c_void_p, ctypes.c_void_p)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_event_detach
-        libvlc_event_detach = f
     return f(p_event_manager, i_event_type, f_callback, p_user_data)
 
 def libvlc_event_type_name(event_type):
@@ -2951,9 +2927,6 @@
     f = _Cfunctions.get('libvlc_event_type_name', None) or \
         _Cfunction('libvlc_event_type_name', ((1,),), None,
                     ctypes.c_char_p, ctypes.c_uint)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_event_type_name
-        libvlc_event_type_name = f
     return f(event_type)
 
 def libvlc_get_log_verbosity(p_instance):
@@ -2965,9 +2938,6 @@
     f = _Cfunctions.get('libvlc_get_log_verbosity', None) or \
         _Cfunction('libvlc_get_log_verbosity', ((1,),), None,
                     ctypes.c_uint, Instance)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_get_log_verbosity
-        libvlc_get_log_verbosity = f
     return f(p_instance)
 
 def libvlc_set_log_verbosity(p_instance, level):
@@ -2979,9 +2949,6 @@
     f = _Cfunctions.get('libvlc_set_log_verbosity', None) or \
         _Cfunction('libvlc_set_log_verbosity', ((1,), (1,),), None,
                     None, Instance, ctypes.c_uint)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_set_log_verbosity
-        libvlc_set_log_verbosity = f
     return f(p_instance, level)
 
 def libvlc_log_open(p_instance):
@@ -2993,9 +2960,6 @@
     f = _Cfunctions.get('libvlc_log_open', None) or \
         _Cfunction('libvlc_log_open', ((1,),), class_result(Log),
                     ctypes.c_void_p, Instance)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_log_open
-        libvlc_log_open = f
     return f(p_instance)
 
 def libvlc_log_close(p_log):
@@ -3005,9 +2969,6 @@
     f = _Cfunctions.get('libvlc_log_close', None) or \
         _Cfunction('libvlc_log_close', ((1,),), None,
                     None, Log)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_log_close
-        libvlc_log_close = f
     return f(p_log)
 
 def libvlc_log_count(p_log):
@@ -3019,9 +2980,6 @@
     f = _Cfunctions.get('libvlc_log_count', None) or \
         _Cfunction('libvlc_log_count', ((1,),), None,
                     ctypes.c_uint, Log)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_log_count
-        libvlc_log_count = f
     return f(p_log)
 
 def libvlc_log_clear(p_log):
@@ -3032,9 +2990,6 @@
     f = _Cfunctions.get('libvlc_log_clear', None) or \
         _Cfunction('libvlc_log_clear', ((1,),), None,
                     None, Log)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_log_clear
-        libvlc_log_clear = f
     return f(p_log)
 
 def libvlc_log_get_iterator(p_log):
@@ -3046,9 +3001,6 @@
     f = _Cfunctions.get('libvlc_log_get_iterator', None) or \
         _Cfunction('libvlc_log_get_iterator', ((1,),), class_result(LogIterator),
                     ctypes.c_void_p, Log)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_log_get_iterator
-        libvlc_log_get_iterator = f
     return f(p_log)
 
 def libvlc_log_iterator_free(p_iter):
@@ -3058,9 +3010,6 @@
     f = _Cfunctions.get('libvlc_log_iterator_free', None) or \
         _Cfunction('libvlc_log_iterator_free', ((1,),), None,
                     None, LogIterator)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_log_iterator_free
-        libvlc_log_iterator_free = f
     return f(p_iter)
 
 def libvlc_log_iterator_has_next(p_iter):
@@ -3072,9 +3021,6 @@
     f = _Cfunctions.get('libvlc_log_iterator_has_next', None) or \
         _Cfunction('libvlc_log_iterator_has_next', ((1,),), None,
                     ctypes.c_int, LogIterator)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_log_iterator_has_next
-        libvlc_log_iterator_has_next = f
     return f(p_iter)
 
 def libvlc_log_iterator_next(p_iter, p_buffer):
@@ -3087,9 +3033,6 @@
     f = _Cfunctions.get('libvlc_log_iterator_next', None) or \
         _Cfunction('libvlc_log_iterator_next', ((1,), (1,),), None,
                     ctypes.POINTER(LogMessage), LogIterator, ctypes.POINTER(LogMessage))
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_log_iterator_next
-        libvlc_log_iterator_next = f
     return f(p_iter, p_buffer)
 
 def libvlc_module_description_list_release(p_list):
@@ -3099,9 +3042,6 @@
     f = _Cfunctions.get('libvlc_module_description_list_release', None) or \
         _Cfunction('libvlc_module_description_list_release', ((1,),), None,
                     None, ctypes.POINTER(ModuleDescription))
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_module_description_list_release
-        libvlc_module_description_list_release = f
     return f(p_list)
 
 def libvlc_audio_filter_list_get(p_instance):
@@ -3112,9 +3052,6 @@
     f = _Cfunctions.get('libvlc_audio_filter_list_get', None) or \
         _Cfunction('libvlc_audio_filter_list_get', ((1,),), None,
                     ctypes.POINTER(ModuleDescription), Instance)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_audio_filter_list_get
-        libvlc_audio_filter_list_get = f
     return f(p_instance)
 
 def libvlc_video_filter_list_get(p_instance):
@@ -3125,9 +3062,6 @@
     f = _Cfunctions.get('libvlc_video_filter_list_get', None) or \
         _Cfunction('libvlc_video_filter_list_get', ((1,),), None,
                     ctypes.POINTER(ModuleDescription), Instance)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_filter_list_get
-        libvlc_video_filter_list_get = f
     return f(p_instance)
 
 def libvlc_clock():
@@ -3141,9 +3075,6 @@
     f = _Cfunctions.get('libvlc_clock', None) or \
         _Cfunction('libvlc_clock', (), None,
                     ctypes.c_int64)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_clock
-        libvlc_clock = f
     return f()
 
 def libvlc_media_new_location(p_instance, psz_mrl):
@@ -3161,9 +3092,6 @@
     f = _Cfunctions.get('libvlc_media_new_location', None) or \
         _Cfunction('libvlc_media_new_location', ((1,), (1,),), class_result(Media),
                     ctypes.c_void_p, Instance, ctypes.c_char_p)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_new_location
-        libvlc_media_new_location = f
     return f(p_instance, psz_mrl)
 
 def libvlc_media_new_path(p_instance, path):
@@ -3176,9 +3104,6 @@
     f = _Cfunctions.get('libvlc_media_new_path', None) or \
         _Cfunction('libvlc_media_new_path', ((1,), (1,),), class_result(Media),
                     ctypes.c_void_p, Instance, ctypes.c_char_p)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_new_path
-        libvlc_media_new_path = f
     return f(p_instance, path)
 
 def libvlc_media_new_fd(p_instance, fd):
@@ -3203,9 +3128,6 @@
     f = _Cfunctions.get('libvlc_media_new_fd', None) or \
         _Cfunction('libvlc_media_new_fd', ((1,), (1,),), class_result(Media),
                     ctypes.c_void_p, Instance, ctypes.c_int)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_new_fd
-        libvlc_media_new_fd = f
     return f(p_instance, fd)
 
 def libvlc_media_new_as_node(p_instance, psz_name):
@@ -3218,9 +3140,6 @@
     f = _Cfunctions.get('libvlc_media_new_as_node', None) or \
         _Cfunction('libvlc_media_new_as_node', ((1,), (1,),), class_result(Media),
                     ctypes.c_void_p, Instance, ctypes.c_char_p)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_new_as_node
-        libvlc_media_new_as_node = f
     return f(p_instance, psz_name)
 
 def libvlc_media_add_option(p_md, ppsz_options):
@@ -3235,9 +3154,6 @@
     f = _Cfunctions.get('libvlc_media_add_option', None) or \
         _Cfunction('libvlc_media_add_option', ((1,), (1,),), None,
                     None, Media, ctypes.c_char_p)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_add_option
-        libvlc_media_add_option = f
     return f(p_md, ppsz_options)
 
 def libvlc_media_add_option_flag(p_md, ppsz_options, i_flags):
@@ -3253,9 +3169,6 @@
     f = _Cfunctions.get('libvlc_media_add_option_flag', None) or \
         _Cfunction('libvlc_media_add_option_flag', ((1,), (1,), (1,),), None,
                     None, Media, ctypes.c_char_p, ctypes.c_uint)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_add_option_flag
-        libvlc_media_add_option_flag = f
     return f(p_md, ppsz_options, i_flags)
 
 def libvlc_media_retain(p_md):
@@ -3267,9 +3180,6 @@
     f = _Cfunctions.get('libvlc_media_retain', None) or \
         _Cfunction('libvlc_media_retain', ((1,),), None,
                     None, Media)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_retain
-        libvlc_media_retain = f
     return f(p_md)
 
 def libvlc_media_release(p_md):
@@ -3283,9 +3193,6 @@
     f = _Cfunctions.get('libvlc_media_release', None) or \
         _Cfunction('libvlc_media_release', ((1,),), None,
                     None, Media)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_release
-        libvlc_media_release = f
     return f(p_md)
 
 def libvlc_media_get_mrl(p_md):
@@ -3296,9 +3203,6 @@
     f = _Cfunctions.get('libvlc_media_get_mrl', None) or \
         _Cfunction('libvlc_media_get_mrl', ((1,),), string_result,
                     ctypes.c_void_p, Media)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_get_mrl
-        libvlc_media_get_mrl = f
     return f(p_md)
 
 def libvlc_media_duplicate(p_md):
@@ -3308,9 +3212,6 @@
     f = _Cfunctions.get('libvlc_media_duplicate', None) or \
         _Cfunction('libvlc_media_duplicate', ((1,),), class_result(Media),
                     ctypes.c_void_p, Media)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_duplicate
-        libvlc_media_duplicate = f
     return f(p_md)
 
 def libvlc_media_get_meta(p_md, e_meta):
@@ -3329,9 +3230,6 @@
     f = _Cfunctions.get('libvlc_media_get_meta', None) or \
         _Cfunction('libvlc_media_get_meta', ((1,), (1,),), string_result,
                     ctypes.c_void_p, Media, Meta)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_get_meta
-        libvlc_media_get_meta = f
     return f(p_md, e_meta)
 
 def libvlc_media_set_meta(p_md, e_meta, psz_value):
@@ -3344,9 +3242,6 @@
     f = _Cfunctions.get('libvlc_media_set_meta', None) or \
         _Cfunction('libvlc_media_set_meta', ((1,), (1,), (1,),), None,
                     None, Media, Meta, ctypes.c_char_p)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_set_meta
-        libvlc_media_set_meta = f
     return f(p_md, e_meta, psz_value)
 
 def libvlc_media_save_meta(p_md):
@@ -3357,9 +3252,6 @@
     f = _Cfunctions.get('libvlc_media_save_meta', None) or \
         _Cfunction('libvlc_media_save_meta', ((1,),), None,
                     ctypes.c_int, Media)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_save_meta
-        libvlc_media_save_meta = f
     return f(p_md)
 
 def libvlc_media_get_state(p_md):
@@ -3375,9 +3267,6 @@
     f = _Cfunctions.get('libvlc_media_get_state', None) or \
         _Cfunction('libvlc_media_get_state', ((1,),), None,
                     State, Media)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_get_state
-        libvlc_media_get_state = f
     return f(p_md)
 
 def libvlc_media_get_stats(p_md, p_stats):
@@ -3389,9 +3278,6 @@
     f = _Cfunctions.get('libvlc_media_get_stats', None) or \
         _Cfunction('libvlc_media_get_stats', ((1,), (1,),), None,
                     ctypes.c_int, Media, ctypes.POINTER(MediaStats))
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_get_stats
-        libvlc_media_get_stats = f
     return f(p_md, p_stats)
 
 def libvlc_media_event_manager(p_md):
@@ -3403,9 +3289,6 @@
     f = _Cfunctions.get('libvlc_media_event_manager', None) or \
         _Cfunction('libvlc_media_event_manager', ((1,),), class_result(EventManager),
                     ctypes.c_void_p, Media)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_event_manager
-        libvlc_media_event_manager = f
     return f(p_md)
 
 def libvlc_media_get_duration(p_md):
@@ -3416,9 +3299,6 @@
     f = _Cfunctions.get('libvlc_media_get_duration', None) or \
         _Cfunction('libvlc_media_get_duration', ((1,),), None,
                     ctypes.c_longlong, Media)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_get_duration
-        libvlc_media_get_duration = f
     return f(p_md)
 
 def libvlc_media_parse(p_md):
@@ -3433,9 +3313,6 @@
     f = _Cfunctions.get('libvlc_media_parse', None) or \
         _Cfunction('libvlc_media_parse', ((1,),), None,
                     None, Media)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_parse
-        libvlc_media_parse = f
     return f(p_md)
 
 def libvlc_media_parse_async(p_md):
@@ -3454,9 +3331,6 @@
     f = _Cfunctions.get('libvlc_media_parse_async', None) or \
         _Cfunction('libvlc_media_parse_async', ((1,),), None,
                     None, Media)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_parse_async
-        libvlc_media_parse_async = f
     return f(p_md)
 
 def libvlc_media_is_parsed(p_md):
@@ -3468,9 +3342,6 @@
     f = _Cfunctions.get('libvlc_media_is_parsed', None) or \
         _Cfunction('libvlc_media_is_parsed', ((1,),), None,
                     ctypes.c_int, Media)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_is_parsed
-        libvlc_media_is_parsed = f
     return f(p_md)
 
 def libvlc_media_set_user_data(p_md, p_new_user_data):
@@ -3483,9 +3354,6 @@
     f = _Cfunctions.get('libvlc_media_set_user_data', None) or \
         _Cfunction('libvlc_media_set_user_data', ((1,), (1,),), None,
                     None, Media, ctypes.c_void_p)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_set_user_data
-        libvlc_media_set_user_data = f
     return f(p_md, p_new_user_data)
 
 def libvlc_media_get_user_data(p_md):
@@ -3497,9 +3365,6 @@
     f = _Cfunctions.get('libvlc_media_get_user_data', None) or \
         _Cfunction('libvlc_media_get_user_data', ((1,),), None,
                     ctypes.c_void_p, Media)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_get_user_data
-        libvlc_media_get_user_data = f
     return f(p_md)
 
 def libvlc_media_get_tracks_info(p_md):
@@ -3514,9 +3379,6 @@
     f = _Cfunctions.get('libvlc_media_get_tracks_info', None) or \
         _Cfunction('libvlc_media_get_tracks_info', ((1,), (2,),), None,
                     ctypes.c_int, Media, ctypes.POINTER(ctypes.c_void_p))
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_get_tracks_info
-        libvlc_media_get_tracks_info = f
     return f(p_md)
 
 def libvlc_media_discoverer_new_from_name(p_inst, psz_name):
@@ -3528,9 +3390,6 @@
     f = _Cfunctions.get('libvlc_media_discoverer_new_from_name', None) or \
         _Cfunction('libvlc_media_discoverer_new_from_name', ((1,), (1,),), class_result(MediaDiscoverer),
                     ctypes.c_void_p, Instance, ctypes.c_char_p)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_discoverer_new_from_name
-        libvlc_media_discoverer_new_from_name = f
     return f(p_inst, psz_name)
 
 def libvlc_media_discoverer_release(p_mdis):
@@ -3541,9 +3400,6 @@
     f = _Cfunctions.get('libvlc_media_discoverer_release', None) or \
         _Cfunction('libvlc_media_discoverer_release', ((1,),), None,
                     None, MediaDiscoverer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_discoverer_release
-        libvlc_media_discoverer_release = f
     return f(p_mdis)
 
 def libvlc_media_discoverer_localized_name(p_mdis):
@@ -3554,9 +3410,6 @@
     f = _Cfunctions.get('libvlc_media_discoverer_localized_name', None) or \
         _Cfunction('libvlc_media_discoverer_localized_name', ((1,),), string_result,
                     ctypes.c_void_p, MediaDiscoverer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_discoverer_localized_name
-        libvlc_media_discoverer_localized_name = f
     return f(p_mdis)
 
 def libvlc_media_discoverer_media_list(p_mdis):
@@ -3567,9 +3420,6 @@
     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)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_discoverer_media_list
-        libvlc_media_discoverer_media_list = f
     return f(p_mdis)
 
 def libvlc_media_discoverer_event_manager(p_mdis):
@@ -3580,9 +3430,6 @@
     f = _Cfunctions.get('libvlc_media_discoverer_event_manager', None) or \
         _Cfunction('libvlc_media_discoverer_event_manager', ((1,),), class_result(EventManager),
                     ctypes.c_void_p, MediaDiscoverer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_discoverer_event_manager
-        libvlc_media_discoverer_event_manager = f
     return f(p_mdis)
 
 def libvlc_media_discoverer_is_running(p_mdis):
@@ -3593,9 +3440,6 @@
     f = _Cfunctions.get('libvlc_media_discoverer_is_running', None) or \
         _Cfunction('libvlc_media_discoverer_is_running', ((1,),), None,
                     ctypes.c_int, MediaDiscoverer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_discoverer_is_running
-        libvlc_media_discoverer_is_running = f
     return f(p_mdis)
 
 def libvlc_media_library_new(p_instance):
@@ -3606,9 +3450,6 @@
     f = _Cfunctions.get('libvlc_media_library_new', None) or \
         _Cfunction('libvlc_media_library_new', ((1,),), class_result(MediaLibrary),
                     ctypes.c_void_p, Instance)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_library_new
-        libvlc_media_library_new = f
     return f(p_instance)
 
 def libvlc_media_library_release(p_mlib):
@@ -3620,9 +3461,6 @@
     f = _Cfunctions.get('libvlc_media_library_release', None) or \
         _Cfunction('libvlc_media_library_release', ((1,),), None,
                     None, MediaLibrary)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_library_release
-        libvlc_media_library_release = f
     return f(p_mlib)
 
 def libvlc_media_library_retain(p_mlib):
@@ -3634,9 +3472,6 @@
     f = _Cfunctions.get('libvlc_media_library_retain', None) or \
         _Cfunction('libvlc_media_library_retain', ((1,),), None,
                     None, MediaLibrary)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_library_retain
-        libvlc_media_library_retain = f
     return f(p_mlib)
 
 def libvlc_media_library_load(p_mlib):
@@ -3647,9 +3482,6 @@
     f = _Cfunctions.get('libvlc_media_library_load', None) or \
         _Cfunction('libvlc_media_library_load', ((1,),), None,
                     ctypes.c_int, MediaLibrary)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_library_load
-        libvlc_media_library_load = f
     return f(p_mlib)
 
 def libvlc_media_library_media_list(p_mlib):
@@ -3660,9 +3492,6 @@
     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)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_library_media_list
-        libvlc_media_library_media_list = f
     return f(p_mlib)
 
 def libvlc_media_list_new(p_instance):
@@ -3673,9 +3502,6 @@
     f = _Cfunctions.get('libvlc_media_list_new', None) or \
         _Cfunction('libvlc_media_list_new', ((1,),), class_result(MediaList),
                     ctypes.c_void_p, Instance)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_list_new
-        libvlc_media_list_new = f
     return f(p_instance)
 
 def libvlc_media_list_release(p_ml):
@@ -3685,9 +3511,6 @@
     f = _Cfunctions.get('libvlc_media_list_release', None) or \
         _Cfunction('libvlc_media_list_release', ((1,),), None,
                     None, MediaList)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_list_release
-        libvlc_media_list_release = f
     return f(p_ml)
 
 def libvlc_media_list_retain(p_ml):
@@ -3697,9 +3520,6 @@
     f = _Cfunctions.get('libvlc_media_list_retain', None) or \
         _Cfunction('libvlc_media_list_retain', ((1,),), None,
                     None, MediaList)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_list_retain
-        libvlc_media_list_retain = f
     return f(p_ml)
 
 def libvlc_media_list_set_media(p_ml, p_md):
@@ -3712,9 +3532,6 @@
     f = _Cfunctions.get('libvlc_media_list_set_media', None) or \
         _Cfunction('libvlc_media_list_set_media', ((1,), (1,),), None,
                     None, MediaList, Media)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_list_set_media
-        libvlc_media_list_set_media = f
     return f(p_ml, p_md)
 
 def libvlc_media_list_media(p_ml):
@@ -3727,9 +3544,6 @@
     f = _Cfunctions.get('libvlc_media_list_media', None) or \
         _Cfunction('libvlc_media_list_media', ((1,),), class_result(Media),
                     ctypes.c_void_p, MediaList)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_list_media
-        libvlc_media_list_media = f
     return f(p_ml)
 
 def libvlc_media_list_add_media(p_ml, p_md):
@@ -3742,9 +3556,6 @@
     f = _Cfunctions.get('libvlc_media_list_add_media', None) or \
         _Cfunction('libvlc_media_list_add_media', ((1,), (1,),), None,
                     ctypes.c_int, MediaList, Media)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_list_add_media
-        libvlc_media_list_add_media = f
     return f(p_ml, p_md)
 
 def libvlc_media_list_insert_media(p_ml, p_md, i_pos):
@@ -3758,9 +3569,6 @@
     f = _Cfunctions.get('libvlc_media_list_insert_media', None) or \
         _Cfunction('libvlc_media_list_insert_media', ((1,), (1,), (1,),), None,
                     ctypes.c_int, MediaList, Media, ctypes.c_int)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_list_insert_media
-        libvlc_media_list_insert_media = f
     return f(p_ml, p_md, i_pos)
 
 def libvlc_media_list_remove_index(p_ml, i_pos):
@@ -3773,9 +3581,6 @@
     f = _Cfunctions.get('libvlc_media_list_remove_index', None) or \
         _Cfunction('libvlc_media_list_remove_index', ((1,), (1,),), None,
                     ctypes.c_int, MediaList, ctypes.c_int)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_list_remove_index
-        libvlc_media_list_remove_index = f
     return f(p_ml, i_pos)
 
 def libvlc_media_list_count(p_ml):
@@ -3787,9 +3592,6 @@
     f = _Cfunctions.get('libvlc_media_list_count', None) or \
         _Cfunction('libvlc_media_list_count', ((1,),), None,
                     ctypes.c_int, MediaList)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_list_count
-        libvlc_media_list_count = f
     return f(p_ml)
 
 def libvlc_media_list_item_at_index(p_ml, i_pos):
@@ -3802,9 +3604,6 @@
     f = _Cfunctions.get('libvlc_media_list_item_at_index', None) or \
         _Cfunction('libvlc_media_list_item_at_index', ((1,), (1,),), class_result(Media),
                     ctypes.c_void_p, MediaList, ctypes.c_int)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_list_item_at_index
-        libvlc_media_list_item_at_index = f
     return f(p_ml, i_pos)
 
 def libvlc_media_list_index_of_item(p_ml, p_md):
@@ -3818,9 +3617,6 @@
     f = _Cfunctions.get('libvlc_media_list_index_of_item', None) or \
         _Cfunction('libvlc_media_list_index_of_item', ((1,), (1,),), None,
                     ctypes.c_int, MediaList, Media)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_list_index_of_item
-        libvlc_media_list_index_of_item = f
     return f(p_ml, p_md)
 
 def libvlc_media_list_is_readonly(p_ml):
@@ -3831,9 +3627,6 @@
     f = _Cfunctions.get('libvlc_media_list_is_readonly', None) or \
         _Cfunction('libvlc_media_list_is_readonly', ((1,),), None,
                     ctypes.c_int, MediaList)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_list_is_readonly
-        libvlc_media_list_is_readonly = f
     return f(p_ml)
 
 def libvlc_media_list_lock(p_ml):
@@ -3843,9 +3636,6 @@
     f = _Cfunctions.get('libvlc_media_list_lock', None) or \
         _Cfunction('libvlc_media_list_lock', ((1,),), None,
                     None, MediaList)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_list_lock
-        libvlc_media_list_lock = f
     return f(p_ml)
 
 def libvlc_media_list_unlock(p_ml):
@@ -3856,9 +3646,6 @@
     f = _Cfunctions.get('libvlc_media_list_unlock', None) or \
         _Cfunction('libvlc_media_list_unlock', ((1,),), None,
                     None, MediaList)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_list_unlock
-        libvlc_media_list_unlock = f
     return f(p_ml)
 
 def libvlc_media_list_event_manager(p_ml):
@@ -3870,9 +3657,6 @@
     f = _Cfunctions.get('libvlc_media_list_event_manager', None) or \
         _Cfunction('libvlc_media_list_event_manager', ((1,),), class_result(EventManager),
                     ctypes.c_void_p, MediaList)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_list_event_manager
-        libvlc_media_list_event_manager = f
     return f(p_ml)
 
 def libvlc_media_list_player_new(p_instance):
@@ -3883,9 +3667,6 @@
     f = _Cfunctions.get('libvlc_media_list_player_new', None) or \
         _Cfunction('libvlc_media_list_player_new', ((1,),), class_result(MediaListPlayer),
                     ctypes.c_void_p, Instance)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_list_player_new
-        libvlc_media_list_player_new = f
     return f(p_instance)
 
 def libvlc_media_list_player_release(p_mlp):
@@ -3899,9 +3680,6 @@
     f = _Cfunctions.get('libvlc_media_list_player_release', None) or \
         _Cfunction('libvlc_media_list_player_release', ((1,),), None,
                     None, MediaListPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_list_player_release
-        libvlc_media_list_player_release = f
     return f(p_mlp)
 
 def libvlc_media_list_player_retain(p_mlp):
@@ -3912,9 +3690,6 @@
     f = _Cfunctions.get('libvlc_media_list_player_retain', None) or \
         _Cfunction('libvlc_media_list_player_retain', ((1,),), None,
                     None, MediaListPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_list_player_retain
-        libvlc_media_list_player_retain = f
     return f(p_mlp)
 
 def libvlc_media_list_player_event_manager(p_mlp):
@@ -3925,9 +3700,6 @@
     f = _Cfunctions.get('libvlc_media_list_player_event_manager', None) or \
         _Cfunction('libvlc_media_list_player_event_manager', ((1,),), class_result(EventManager),
                     ctypes.c_void_p, MediaListPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_list_player_event_manager
-        libvlc_media_list_player_event_manager = f
     return f(p_mlp)
 
 def libvlc_media_list_player_set_media_player(p_mlp, p_mi):
@@ -3938,9 +3710,6 @@
     f = _Cfunctions.get('libvlc_media_list_player_set_media_player', None) or \
         _Cfunction('libvlc_media_list_player_set_media_player', ((1,), (1,),), None,
                     None, MediaListPlayer, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_list_player_set_media_player
-        libvlc_media_list_player_set_media_player = f
     return f(p_mlp, p_mi)
 
 def libvlc_media_list_player_set_media_list(p_mlp, p_mlist):
@@ -3951,9 +3720,6 @@
     f = _Cfunctions.get('libvlc_media_list_player_set_media_list', None) or \
         _Cfunction('libvlc_media_list_player_set_media_list', ((1,), (1,),), None,
                     None, MediaListPlayer, MediaList)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_list_player_set_media_list
-        libvlc_media_list_player_set_media_list = f
     return f(p_mlp, p_mlist)
 
 def libvlc_media_list_player_play(p_mlp):
@@ -3963,9 +3729,6 @@
     f = _Cfunctions.get('libvlc_media_list_player_play', None) or \
         _Cfunction('libvlc_media_list_player_play', ((1,),), None,
                     None, MediaListPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_list_player_play
-        libvlc_media_list_player_play = f
     return f(p_mlp)
 
 def libvlc_media_list_player_pause(p_mlp):
@@ -3975,9 +3738,6 @@
     f = _Cfunctions.get('libvlc_media_list_player_pause', None) or \
         _Cfunction('libvlc_media_list_player_pause', ((1,),), None,
                     None, MediaListPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_list_player_pause
-        libvlc_media_list_player_pause = f
     return f(p_mlp)
 
 def libvlc_media_list_player_is_playing(p_mlp):
@@ -3988,9 +3748,6 @@
     f = _Cfunctions.get('libvlc_media_list_player_is_playing', None) or \
         _Cfunction('libvlc_media_list_player_is_playing', ((1,),), None,
                     ctypes.c_int, MediaListPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_list_player_is_playing
-        libvlc_media_list_player_is_playing = f
     return f(p_mlp)
 
 def libvlc_media_list_player_get_state(p_mlp):
@@ -4001,9 +3758,6 @@
     f = _Cfunctions.get('libvlc_media_list_player_get_state', None) or \
         _Cfunction('libvlc_media_list_player_get_state', ((1,),), None,
                     State, MediaListPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_list_player_get_state
-        libvlc_media_list_player_get_state = f
     return f(p_mlp)
 
 def libvlc_media_list_player_play_item_at_index(p_mlp, i_index):
@@ -4015,9 +3769,6 @@
     f = _Cfunctions.get('libvlc_media_list_player_play_item_at_index', None) or \
         _Cfunction('libvlc_media_list_player_play_item_at_index', ((1,), (1,),), None,
                     ctypes.c_int, MediaListPlayer, ctypes.c_int)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_list_player_play_item_at_index
-        libvlc_media_list_player_play_item_at_index = f
     return f(p_mlp, i_index)
 
 def libvlc_media_list_player_play_item(p_mlp, p_md):
@@ -4029,9 +3780,6 @@
     f = _Cfunctions.get('libvlc_media_list_player_play_item', None) or \
         _Cfunction('libvlc_media_list_player_play_item', ((1,), (1,),), None,
                     ctypes.c_int, MediaListPlayer, Media)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_list_player_play_item
-        libvlc_media_list_player_play_item = f
     return f(p_mlp, p_md)
 
 def libvlc_media_list_player_stop(p_mlp):
@@ -4041,9 +3789,6 @@
     f = _Cfunctions.get('libvlc_media_list_player_stop', None) or \
         _Cfunction('libvlc_media_list_player_stop', ((1,),), None,
                     None, MediaListPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_list_player_stop
-        libvlc_media_list_player_stop = f
     return f(p_mlp)
 
 def libvlc_media_list_player_next(p_mlp):
@@ -4054,9 +3799,6 @@
     f = _Cfunctions.get('libvlc_media_list_player_next', None) or \
         _Cfunction('libvlc_media_list_player_next', ((1,),), None,
                     ctypes.c_int, MediaListPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_list_player_next
-        libvlc_media_list_player_next = f
     return f(p_mlp)
 
 def libvlc_media_list_player_previous(p_mlp):
@@ -4067,9 +3809,6 @@
     f = _Cfunctions.get('libvlc_media_list_player_previous', None) or \
         _Cfunction('libvlc_media_list_player_previous', ((1,),), None,
                     ctypes.c_int, MediaListPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_list_player_previous
-        libvlc_media_list_player_previous = f
     return f(p_mlp)
 
 def libvlc_media_list_player_set_playback_mode(p_mlp, e_mode):
@@ -4080,9 +3819,6 @@
     f = _Cfunctions.get('libvlc_media_list_player_set_playback_mode', None) or \
         _Cfunction('libvlc_media_list_player_set_playback_mode', ((1,), (1,),), None,
                     None, MediaListPlayer, PlaybackMode)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_list_player_set_playback_mode
-        libvlc_media_list_player_set_playback_mode = f
     return f(p_mlp, e_mode)
 
 def libvlc_media_player_new(p_libvlc_instance):
@@ -4093,9 +3829,6 @@
     f = _Cfunctions.get('libvlc_media_player_new', None) or \
         _Cfunction('libvlc_media_player_new', ((1,),), class_result(MediaPlayer),
                     ctypes.c_void_p, Instance)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_new
-        libvlc_media_player_new = f
     return f(p_libvlc_instance)
 
 def libvlc_media_player_new_from_media(p_md):
@@ -4106,9 +3839,6 @@
     f = _Cfunctions.get('libvlc_media_player_new_from_media', None) or \
         _Cfunction('libvlc_media_player_new_from_media', ((1,),), class_result(MediaPlayer),
                     ctypes.c_void_p, Media)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_new_from_media
-        libvlc_media_player_new_from_media = f
     return f(p_md)
 
 def libvlc_media_player_release(p_mi):
@@ -4122,9 +3852,6 @@
     f = _Cfunctions.get('libvlc_media_player_release', None) or \
         _Cfunction('libvlc_media_player_release', ((1,),), None,
                     None, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_release
-        libvlc_media_player_release = f
     return f(p_mi)
 
 def libvlc_media_player_retain(p_mi):
@@ -4135,9 +3862,6 @@
     f = _Cfunctions.get('libvlc_media_player_retain', None) or \
         _Cfunction('libvlc_media_player_retain', ((1,),), None,
                     None, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_retain
-        libvlc_media_player_retain = f
     return f(p_mi)
 
 def libvlc_media_player_set_media(p_mi, p_md):
@@ -4149,9 +3873,6 @@
     f = _Cfunctions.get('libvlc_media_player_set_media', None) or \
         _Cfunction('libvlc_media_player_set_media', ((1,), (1,),), None,
                     None, MediaPlayer, Media)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_set_media
-        libvlc_media_player_set_media = f
     return f(p_mi, p_md)
 
 def libvlc_media_player_get_media(p_mi):
@@ -4162,9 +3883,6 @@
     f = _Cfunctions.get('libvlc_media_player_get_media', None) or \
         _Cfunction('libvlc_media_player_get_media', ((1,),), class_result(Media),
                     ctypes.c_void_p, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_get_media
-        libvlc_media_player_get_media = f
     return f(p_mi)
 
 def libvlc_media_player_event_manager(p_mi):
@@ -4175,9 +3893,6 @@
     f = _Cfunctions.get('libvlc_media_player_event_manager', None) or \
         _Cfunction('libvlc_media_player_event_manager', ((1,),), class_result(EventManager),
                     ctypes.c_void_p, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_event_manager
-        libvlc_media_player_event_manager = f
     return f(p_mi)
 
 def libvlc_media_player_is_playing(p_mi):
@@ -4188,9 +3903,6 @@
     f = _Cfunctions.get('libvlc_media_player_is_playing', None) or \
         _Cfunction('libvlc_media_player_is_playing', ((1,),), None,
                     ctypes.c_int, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_is_playing
-        libvlc_media_player_is_playing = f
     return f(p_mi)
 
 def libvlc_media_player_play(p_mi):
@@ -4201,9 +3913,6 @@
     f = _Cfunctions.get('libvlc_media_player_play', None) or \
         _Cfunction('libvlc_media_player_play', ((1,),), None,
                     ctypes.c_int, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_play
-        libvlc_media_player_play = f
     return f(p_mi)
 
 def libvlc_media_player_set_pause(mp, do_pause):
@@ -4215,9 +3924,6 @@
     f = _Cfunctions.get('libvlc_media_player_set_pause', None) or \
         _Cfunction('libvlc_media_player_set_pause', ((1,), (1,),), None,
                     None, MediaPlayer, ctypes.c_int)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_set_pause
-        libvlc_media_player_set_pause = f
     return f(mp, do_pause)
 
 def libvlc_media_player_pause(p_mi):
@@ -4227,9 +3933,6 @@
     f = _Cfunctions.get('libvlc_media_player_pause', None) or \
         _Cfunction('libvlc_media_player_pause', ((1,),), None,
                     None, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_pause
-        libvlc_media_player_pause = f
     return f(p_mi)
 
 def libvlc_media_player_stop(p_mi):
@@ -4239,9 +3942,6 @@
     f = _Cfunctions.get('libvlc_media_player_stop', None) or \
         _Cfunction('libvlc_media_player_stop', ((1,),), None,
                     None, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_stop
-        libvlc_media_player_stop = f
     return f(p_mi)
 
 def libvlc_video_set_format(mp, chroma, width, height, pitch):
@@ -4259,9 +3959,6 @@
     f = _Cfunctions.get('libvlc_video_set_format', None) or \
         _Cfunction('libvlc_video_set_format', ((1,), (1,), (1,), (1,), (1,),), None,
                     None, MediaPlayer, ctypes.c_char_p, ctypes.c_uint, ctypes.c_uint, ctypes.c_uint)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_set_format
-        libvlc_video_set_format = f
     return f(mp, chroma, width, height, pitch)
 
 def libvlc_media_player_set_nsobject(p_mi, drawable):
@@ -4293,9 +3990,6 @@
     f = _Cfunctions.get('libvlc_media_player_set_nsobject', None) or \
         _Cfunction('libvlc_media_player_set_nsobject', ((1,), (1,),), None,
                     None, MediaPlayer, ctypes.c_void_p)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_set_nsobject
-        libvlc_media_player_set_nsobject = f
     return f(p_mi, drawable)
 
 def libvlc_media_player_get_nsobject(p_mi):
@@ -4306,9 +4000,6 @@
     f = _Cfunctions.get('libvlc_media_player_get_nsobject', None) or \
         _Cfunction('libvlc_media_player_get_nsobject', ((1,),), None,
                     ctypes.c_void_p, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_get_nsobject
-        libvlc_media_player_get_nsobject = f
     return f(p_mi)
 
 def libvlc_media_player_set_agl(p_mi, drawable):
@@ -4319,9 +4010,6 @@
     f = _Cfunctions.get('libvlc_media_player_set_agl', None) or \
         _Cfunction('libvlc_media_player_set_agl', ((1,), (1,),), None,
                     None, MediaPlayer, ctypes.c_uint32)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_set_agl
-        libvlc_media_player_set_agl = f
     return f(p_mi, drawable)
 
 def libvlc_media_player_get_agl(p_mi):
@@ -4332,9 +4020,6 @@
     f = _Cfunctions.get('libvlc_media_player_get_agl', None) or \
         _Cfunction('libvlc_media_player_get_agl', ((1,),), None,
                     ctypes.c_uint32, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_get_agl
-        libvlc_media_player_get_agl = f
     return f(p_mi)
 
 def libvlc_media_player_set_xwindow(p_mi, drawable):
@@ -4352,9 +4037,6 @@
     f = _Cfunctions.get('libvlc_media_player_set_xwindow', None) or \
         _Cfunction('libvlc_media_player_set_xwindow', ((1,), (1,),), None,
                     None, MediaPlayer, ctypes.c_uint32)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_set_xwindow
-        libvlc_media_player_set_xwindow = f
     return f(p_mi, drawable)
 
 def libvlc_media_player_get_xwindow(p_mi):
@@ -4368,9 +4050,6 @@
     f = _Cfunctions.get('libvlc_media_player_get_xwindow', None) or \
         _Cfunction('libvlc_media_player_get_xwindow', ((1,),), None,
                     ctypes.c_uint32, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_get_xwindow
-        libvlc_media_player_get_xwindow = f
     return f(p_mi)
 
 def libvlc_media_player_set_hwnd(p_mi, drawable):
@@ -4383,9 +4062,6 @@
     f = _Cfunctions.get('libvlc_media_player_set_hwnd', None) or \
         _Cfunction('libvlc_media_player_set_hwnd', ((1,), (1,),), None,
                     None, MediaPlayer, ctypes.c_void_p)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_set_hwnd
-        libvlc_media_player_set_hwnd = f
     return f(p_mi, drawable)
 
 def libvlc_media_player_get_hwnd(p_mi):
@@ -4398,9 +4074,6 @@
     f = _Cfunctions.get('libvlc_media_player_get_hwnd', None) or \
         _Cfunction('libvlc_media_player_get_hwnd', ((1,),), None,
                     ctypes.c_void_p, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_get_hwnd
-        libvlc_media_player_get_hwnd = f
     return f(p_mi)
 
 def libvlc_audio_set_format(mp, format, rate, channels):
@@ -4416,9 +4089,6 @@
     f = _Cfunctions.get('libvlc_audio_set_format', None) or \
         _Cfunction('libvlc_audio_set_format', ((1,), (1,), (1,), (1,),), None,
                     None, MediaPlayer, ctypes.c_char_p, ctypes.c_uint, ctypes.c_uint)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_audio_set_format
-        libvlc_audio_set_format = f
     return f(mp, format, rate, channels)
 
 def libvlc_media_player_get_length(p_mi):
@@ -4429,9 +4099,6 @@
     f = _Cfunctions.get('libvlc_media_player_get_length', None) or \
         _Cfunction('libvlc_media_player_get_length', ((1,),), None,
                     ctypes.c_longlong, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_get_length
-        libvlc_media_player_get_length = f
     return f(p_mi)
 
 def libvlc_media_player_get_time(p_mi):
@@ -4442,9 +4109,6 @@
     f = _Cfunctions.get('libvlc_media_player_get_time', None) or \
         _Cfunction('libvlc_media_player_get_time', ((1,),), None,
                     ctypes.c_longlong, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_get_time
-        libvlc_media_player_get_time = f
     return f(p_mi)
 
 def libvlc_media_player_set_time(p_mi, i_time):
@@ -4456,9 +4120,6 @@
     f = _Cfunctions.get('libvlc_media_player_set_time', None) or \
         _Cfunction('libvlc_media_player_set_time', ((1,), (1,),), None,
                     None, MediaPlayer, ctypes.c_longlong)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_set_time
-        libvlc_media_player_set_time = f
     return f(p_mi, i_time)
 
 def libvlc_media_player_get_position(p_mi):
@@ -4469,9 +4130,6 @@
     f = _Cfunctions.get('libvlc_media_player_get_position', None) or \
         _Cfunction('libvlc_media_player_get_position', ((1,),), None,
                     ctypes.c_float, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_get_position
-        libvlc_media_player_get_position = f
     return f(p_mi)
 
 def libvlc_media_player_set_position(p_mi, f_pos):
@@ -4483,9 +4141,6 @@
     f = _Cfunctions.get('libvlc_media_player_set_position', None) or \
         _Cfunction('libvlc_media_player_set_position', ((1,), (1,),), None,
                     None, MediaPlayer, ctypes.c_float)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_set_position
-        libvlc_media_player_set_position = f
     return f(p_mi, f_pos)
 
 def libvlc_media_player_set_chapter(p_mi, i_chapter):
@@ -4496,9 +4151,6 @@
     f = _Cfunctions.get('libvlc_media_player_set_chapter', None) or \
         _Cfunction('libvlc_media_player_set_chapter', ((1,), (1,),), None,
                     None, MediaPlayer, ctypes.c_int)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_set_chapter
-        libvlc_media_player_set_chapter = f
     return f(p_mi, i_chapter)
 
 def libvlc_media_player_get_chapter(p_mi):
@@ -4509,9 +4161,6 @@
     f = _Cfunctions.get('libvlc_media_player_get_chapter', None) or \
         _Cfunction('libvlc_media_player_get_chapter', ((1,),), None,
                     ctypes.c_int, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_get_chapter
-        libvlc_media_player_get_chapter = f
     return f(p_mi)
 
 def libvlc_media_player_get_chapter_count(p_mi):
@@ -4522,9 +4171,6 @@
     f = _Cfunctions.get('libvlc_media_player_get_chapter_count', None) or \
         _Cfunction('libvlc_media_player_get_chapter_count', ((1,),), None,
                     ctypes.c_int, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_get_chapter_count
-        libvlc_media_player_get_chapter_count = f
     return f(p_mi)
 
 def libvlc_media_player_will_play(p_mi):
@@ -4535,9 +4181,6 @@
     f = _Cfunctions.get('libvlc_media_player_will_play', None) or \
         _Cfunction('libvlc_media_player_will_play', ((1,),), None,
                     ctypes.c_int, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_will_play
-        libvlc_media_player_will_play = f
     return f(p_mi)
 
 def libvlc_media_player_get_chapter_count_for_title(p_mi, i_title):
@@ -4549,9 +4192,6 @@
     f = _Cfunctions.get('libvlc_media_player_get_chapter_count_for_title', None) or \
         _Cfunction('libvlc_media_player_get_chapter_count_for_title', ((1,), (1,),), None,
                     ctypes.c_int, MediaPlayer, ctypes.c_int)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_get_chapter_count_for_title
-        libvlc_media_player_get_chapter_count_for_title = f
     return f(p_mi, i_title)
 
 def libvlc_media_player_set_title(p_mi, i_title):
@@ -4562,9 +4202,6 @@
     f = _Cfunctions.get('libvlc_media_player_set_title', None) or \
         _Cfunction('libvlc_media_player_set_title', ((1,), (1,),), None,
                     None, MediaPlayer, ctypes.c_int)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_set_title
-        libvlc_media_player_set_title = f
     return f(p_mi, i_title)
 
 def libvlc_media_player_get_title(p_mi):
@@ -4575,9 +4212,6 @@
     f = _Cfunctions.get('libvlc_media_player_get_title', None) or \
         _Cfunction('libvlc_media_player_get_title', ((1,),), None,
                     ctypes.c_int, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_get_title
-        libvlc_media_player_get_title = f
     return f(p_mi)
 
 def libvlc_media_player_get_title_count(p_mi):
@@ -4588,9 +4222,6 @@
     f = _Cfunctions.get('libvlc_media_player_get_title_count', None) or \
         _Cfunction('libvlc_media_player_get_title_count', ((1,),), None,
                     ctypes.c_int, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_get_title_count
-        libvlc_media_player_get_title_count = f
     return f(p_mi)
 
 def libvlc_media_player_previous_chapter(p_mi):
@@ -4600,9 +4231,6 @@
     f = _Cfunctions.get('libvlc_media_player_previous_chapter', None) or \
         _Cfunction('libvlc_media_player_previous_chapter', ((1,),), None,
                     None, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_previous_chapter
-        libvlc_media_player_previous_chapter = f
     return f(p_mi)
 
 def libvlc_media_player_next_chapter(p_mi):
@@ -4612,9 +4240,6 @@
     f = _Cfunctions.get('libvlc_media_player_next_chapter', None) or \
         _Cfunction('libvlc_media_player_next_chapter', ((1,),), None,
                     None, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_next_chapter
-        libvlc_media_player_next_chapter = f
     return f(p_mi)
 
 def libvlc_media_player_get_rate(p_mi):
@@ -4627,9 +4252,6 @@
     f = _Cfunctions.get('libvlc_media_player_get_rate', None) or \
         _Cfunction('libvlc_media_player_get_rate', ((1,),), None,
                     ctypes.c_float, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_get_rate
-        libvlc_media_player_get_rate = f
     return f(p_mi)
 
 def libvlc_media_player_set_rate(p_mi, rate):
@@ -4641,9 +4263,6 @@
     f = _Cfunctions.get('libvlc_media_player_set_rate', None) or \
         _Cfunction('libvlc_media_player_set_rate', ((1,), (1,),), None,
                     ctypes.c_int, MediaPlayer, ctypes.c_float)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_set_rate
-        libvlc_media_player_set_rate = f
     return f(p_mi, rate)
 
 def libvlc_media_player_get_state(p_mi):
@@ -4654,9 +4273,6 @@
     f = _Cfunctions.get('libvlc_media_player_get_state', None) or \
         _Cfunction('libvlc_media_player_get_state', ((1,),), None,
                     State, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_get_state
-        libvlc_media_player_get_state = f
     return f(p_mi)
 
 def libvlc_media_player_get_fps(p_mi):
@@ -4667,9 +4283,6 @@
     f = _Cfunctions.get('libvlc_media_player_get_fps', None) or \
         _Cfunction('libvlc_media_player_get_fps', ((1,),), None,
                     ctypes.c_float, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_get_fps
-        libvlc_media_player_get_fps = f
     return f(p_mi)
 
 def libvlc_media_player_has_vout(p_mi):
@@ -4680,9 +4293,6 @@
     f = _Cfunctions.get('libvlc_media_player_has_vout', None) or \
         _Cfunction('libvlc_media_player_has_vout', ((1,),), None,
                     ctypes.c_uint, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_has_vout
-        libvlc_media_player_has_vout = f
     return f(p_mi)
 
 def libvlc_media_player_is_seekable(p_mi):
@@ -4693,9 +4303,6 @@
     f = _Cfunctions.get('libvlc_media_player_is_seekable', None) or \
         _Cfunction('libvlc_media_player_is_seekable', ((1,),), None,
                     ctypes.c_int, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_is_seekable
-        libvlc_media_player_is_seekable = f
     return f(p_mi)
 
 def libvlc_media_player_can_pause(p_mi):
@@ -4706,9 +4313,6 @@
     f = _Cfunctions.get('libvlc_media_player_can_pause', None) or \
         _Cfunction('libvlc_media_player_can_pause', ((1,),), None,
                     ctypes.c_int, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_can_pause
-        libvlc_media_player_can_pause = f
     return f(p_mi)
 
 def libvlc_media_player_next_frame(p_mi):
@@ -4718,9 +4322,6 @@
     f = _Cfunctions.get('libvlc_media_player_next_frame', None) or \
         _Cfunction('libvlc_media_player_next_frame', ((1,),), None,
                     None, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_next_frame
-        libvlc_media_player_next_frame = f
     return f(p_mi)
 
 def libvlc_media_player_navigate(p_mi, navigate):
@@ -4732,21 +4333,23 @@
     f = _Cfunctions.get('libvlc_media_player_navigate', None) or \
         _Cfunction('libvlc_media_player_navigate', ((1,), (1,),), None,
                     None, MediaPlayer, ctypes.c_uint)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_media_player_navigate
-        libvlc_media_player_navigate = f
     return f(p_mi, navigate)
 
-def libvlc_track_description_release(p_track_description):
+def libvlc_track_description_list_release(p_track_description):
     '''Release (free) L{TrackDescription}.
     @param p_track_description: the structure to release.
     '''
+    f = _Cfunctions.get('libvlc_track_description_list_release', None) or \
+        _Cfunction('libvlc_track_description_list_release', ((1,),), None,
+                    None, ctypes.POINTER(TrackDescription))
+    return f(p_track_description)
+
+def libvlc_track_description_release(p_track_description):
+    '''\deprecated Use L{libvlc_track_description_list_release} instead.
+    '''
     f = _Cfunctions.get('libvlc_track_description_release', None) or \
         _Cfunction('libvlc_track_description_release', ((1,),), None,
                     None, ctypes.POINTER(TrackDescription))
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_track_description_release
-        libvlc_track_description_release = f
     return f(p_track_description)
 
 def libvlc_toggle_fullscreen(p_mi):
@@ -4758,9 +4361,6 @@
     f = _Cfunctions.get('libvlc_toggle_fullscreen', None) or \
         _Cfunction('libvlc_toggle_fullscreen', ((1,),), None,
                     None, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_toggle_fullscreen
-        libvlc_toggle_fullscreen = f
     return f(p_mi)
 
 def libvlc_set_fullscreen(p_mi, b_fullscreen):
@@ -4777,9 +4377,6 @@
     f = _Cfunctions.get('libvlc_set_fullscreen', None) or \
         _Cfunction('libvlc_set_fullscreen', ((1,), (1,),), None,
                     None, MediaPlayer, ctypes.c_int)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_set_fullscreen
-        libvlc_set_fullscreen = f
     return f(p_mi, b_fullscreen)
 
 def libvlc_get_fullscreen(p_mi):
@@ -4790,9 +4387,6 @@
     f = _Cfunctions.get('libvlc_get_fullscreen', None) or \
         _Cfunction('libvlc_get_fullscreen', ((1,),), None,
                     ctypes.c_int, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_get_fullscreen
-        libvlc_get_fullscreen = f
     return f(p_mi)
 
 def libvlc_video_set_key_input(p_mi, on):
@@ -4810,9 +4404,6 @@
     f = _Cfunctions.get('libvlc_video_set_key_input', None) or \
         _Cfunction('libvlc_video_set_key_input', ((1,), (1,),), None,
                     None, MediaPlayer, ctypes.c_uint)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_set_key_input
-        libvlc_video_set_key_input = f
     return f(p_mi, on)
 
 def libvlc_video_set_mouse_input(p_mi, on):
@@ -4827,9 +4418,6 @@
     f = _Cfunctions.get('libvlc_video_set_mouse_input', None) or \
         _Cfunction('libvlc_video_set_mouse_input', ((1,), (1,),), None,
                     None, MediaPlayer, ctypes.c_uint)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_set_mouse_input
-        libvlc_video_set_mouse_input = f
     return f(p_mi, on)
 
 def libvlc_video_get_size(p_mi, num):
@@ -4841,9 +4429,6 @@
     f = _Cfunctions.get('libvlc_video_get_size', None) or \
         _Cfunction('libvlc_video_get_size', ((1,), (1,), (2,), (2,),), None,
                     ctypes.c_int, MediaPlayer, ctypes.c_uint, ctypes.POINTER(ctypes.c_uint), ctypes.POINTER(ctypes.c_uint))
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_get_size
-        libvlc_video_get_size = f
     return f(p_mi, num)
 
 def libvlc_video_get_cursor(p_mi, num):
@@ -4865,9 +4450,6 @@
     f = _Cfunctions.get('libvlc_video_get_cursor', None) or \
         _Cfunction('libvlc_video_get_cursor', ((1,), (1,), (2,), (2,),), None,
                     ctypes.c_int, MediaPlayer, ctypes.c_uint, ctypes.POINTER(ctypes.c_int), ctypes.POINTER(ctypes.c_int))
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_get_cursor
-        libvlc_video_get_cursor = f
     return f(p_mi, num)
 
 def libvlc_video_get_scale(p_mi):
@@ -4879,9 +4461,6 @@
     f = _Cfunctions.get('libvlc_video_get_scale', None) or \
         _Cfunction('libvlc_video_get_scale', ((1,),), None,
                     ctypes.c_float, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_get_scale
-        libvlc_video_get_scale = f
     return f(p_mi)
 
 def libvlc_video_set_scale(p_mi, f_factor):
@@ -4896,9 +4475,6 @@
     f = _Cfunctions.get('libvlc_video_set_scale', None) or \
         _Cfunction('libvlc_video_set_scale', ((1,), (1,),), None,
                     None, MediaPlayer, ctypes.c_float)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_set_scale
-        libvlc_video_set_scale = f
     return f(p_mi, f_factor)
 
 def libvlc_video_get_aspect_ratio(p_mi):
@@ -4909,9 +4485,6 @@
     f = _Cfunctions.get('libvlc_video_get_aspect_ratio', None) or \
         _Cfunction('libvlc_video_get_aspect_ratio', ((1,),), string_result,
                     ctypes.c_void_p, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_get_aspect_ratio
-        libvlc_video_get_aspect_ratio = f
     return f(p_mi)
 
 def libvlc_video_set_aspect_ratio(p_mi, psz_aspect):
@@ -4922,9 +4495,6 @@
     f = _Cfunctions.get('libvlc_video_set_aspect_ratio', None) or \
         _Cfunction('libvlc_video_set_aspect_ratio', ((1,), (1,),), None,
                     None, MediaPlayer, ctypes.c_char_p)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_set_aspect_ratio
-        libvlc_video_set_aspect_ratio = f
     return f(p_mi, psz_aspect)
 
 def libvlc_video_get_spu(p_mi):
@@ -4935,9 +4505,6 @@
     f = _Cfunctions.get('libvlc_video_get_spu', None) or \
         _Cfunction('libvlc_video_get_spu', ((1,),), None,
                     ctypes.c_int, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_get_spu
-        libvlc_video_get_spu = f
     return f(p_mi)
 
 def libvlc_video_get_spu_count(p_mi):
@@ -4948,9 +4515,6 @@
     f = _Cfunctions.get('libvlc_video_get_spu_count', None) or \
         _Cfunction('libvlc_video_get_spu_count', ((1,),), None,
                     ctypes.c_int, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_get_spu_count
-        libvlc_video_get_spu_count = f
     return f(p_mi)
 
 def libvlc_video_get_spu_description(p_mi):
@@ -4961,9 +4525,6 @@
     f = _Cfunctions.get('libvlc_video_get_spu_description', None) or \
         _Cfunction('libvlc_video_get_spu_description', ((1,),), None,
                     ctypes.POINTER(TrackDescription), MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_get_spu_description
-        libvlc_video_get_spu_description = f
     return f(p_mi)
 
 def libvlc_video_set_spu(p_mi, i_spu):
@@ -4975,9 +4536,6 @@
     f = _Cfunctions.get('libvlc_video_set_spu', None) or \
         _Cfunction('libvlc_video_set_spu', ((1,), (1,),), None,
                     ctypes.c_int, MediaPlayer, ctypes.c_uint)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_set_spu
-        libvlc_video_set_spu = f
     return f(p_mi, i_spu)
 
 def libvlc_video_set_subtitle_file(p_mi, psz_subtitle):
@@ -4989,11 +4547,35 @@
     f = _Cfunctions.get('libvlc_video_set_subtitle_file', None) or \
         _Cfunction('libvlc_video_set_subtitle_file', ((1,), (1,),), None,
                     ctypes.c_int, MediaPlayer, ctypes.c_char_p)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_set_subtitle_file
-        libvlc_video_set_subtitle_file = f
     return f(p_mi, psz_subtitle)
 
+def libvlc_video_get_spu_delay(p_mi):
+    '''Get the current subtitle delay. Positive values means subtitles are being
+    displayed later, negative values earlier.
+    @param p_mi: media player.
+    @return: time (in microseconds) the display of subtitles is being delayed.
+    @version: LibVLC 1.2.0 or later.
+    '''
+    f = _Cfunctions.get('libvlc_video_get_spu_delay', None) or \
+        _Cfunction('libvlc_video_get_spu_delay', ((1,),), None,
+                    ctypes.c_int64, MediaPlayer)
+    return f(p_mi)
+
+def libvlc_video_set_spu_delay(p_mi, i_delay):
+    '''Set the subtitle delay. This affects the timing of when the subtitle will
+    be displayed. Positive values result in subtitles being displayed later,
+    while negative values will result in subtitles being displayed earlier.
+    The subtitle delay will be reset to zero each time the media changes.
+    @param p_mi: media player.
+    @param i_delay: time (in microseconds) the display of subtitles should be delayed.
+    @return: 0 on success, -1 on error.
+    @version: LibVLC 1.2.0 or later.
+    '''
+    f = _Cfunctions.get('libvlc_video_set_spu_delay', None) or \
+        _Cfunction('libvlc_video_set_spu_delay', ((1,), (1,),), None,
+                    ctypes.c_int, MediaPlayer, ctypes.c_int64)
+    return f(p_mi, i_delay)
+
 def libvlc_video_get_title_description(p_mi):
     '''Get the description of available titles.
     @param p_mi: the media player.
@@ -5002,9 +4584,6 @@
     f = _Cfunctions.get('libvlc_video_get_title_description', None) or \
         _Cfunction('libvlc_video_get_title_description', ((1,),), None,
                     ctypes.POINTER(TrackDescription), MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_get_title_description
-        libvlc_video_get_title_description = f
     return f(p_mi)
 
 def libvlc_video_get_chapter_description(p_mi, i_title):
@@ -5016,9 +4595,6 @@
     f = _Cfunctions.get('libvlc_video_get_chapter_description', None) or \
         _Cfunction('libvlc_video_get_chapter_description', ((1,), (1,),), None,
                     ctypes.POINTER(TrackDescription), MediaPlayer, ctypes.c_int)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_get_chapter_description
-        libvlc_video_get_chapter_description = f
     return f(p_mi, i_title)
 
 def libvlc_video_get_crop_geometry(p_mi):
@@ -5029,9 +4605,6 @@
     f = _Cfunctions.get('libvlc_video_get_crop_geometry', None) or \
         _Cfunction('libvlc_video_get_crop_geometry', ((1,),), string_result,
                     ctypes.c_void_p, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_get_crop_geometry
-        libvlc_video_get_crop_geometry = f
     return f(p_mi)
 
 def libvlc_video_set_crop_geometry(p_mi, psz_geometry):
@@ -5042,9 +4615,6 @@
     f = _Cfunctions.get('libvlc_video_set_crop_geometry', None) or \
         _Cfunction('libvlc_video_set_crop_geometry', ((1,), (1,),), None,
                     None, MediaPlayer, ctypes.c_char_p)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_set_crop_geometry
-        libvlc_video_set_crop_geometry = f
     return f(p_mi, psz_geometry)
 
 def libvlc_video_get_teletext(p_mi):
@@ -5055,9 +4625,6 @@
     f = _Cfunctions.get('libvlc_video_get_teletext', None) or \
         _Cfunction('libvlc_video_get_teletext', ((1,),), None,
                     ctypes.c_int, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_get_teletext
-        libvlc_video_get_teletext = f
     return f(p_mi)
 
 def libvlc_video_set_teletext(p_mi, i_page):
@@ -5068,9 +4635,6 @@
     f = _Cfunctions.get('libvlc_video_set_teletext', None) or \
         _Cfunction('libvlc_video_set_teletext', ((1,), (1,),), None,
                     None, MediaPlayer, ctypes.c_int)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_set_teletext
-        libvlc_video_set_teletext = f
     return f(p_mi, i_page)
 
 def libvlc_toggle_teletext(p_mi):
@@ -5080,9 +4644,6 @@
     f = _Cfunctions.get('libvlc_toggle_teletext', None) or \
         _Cfunction('libvlc_toggle_teletext', ((1,),), None,
                     None, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_toggle_teletext
-        libvlc_toggle_teletext = f
     return f(p_mi)
 
 def libvlc_video_get_track_count(p_mi):
@@ -5093,9 +4654,6 @@
     f = _Cfunctions.get('libvlc_video_get_track_count', None) or \
         _Cfunction('libvlc_video_get_track_count', ((1,),), None,
                     ctypes.c_int, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_get_track_count
-        libvlc_video_get_track_count = f
     return f(p_mi)
 
 def libvlc_video_get_track_description(p_mi):
@@ -5106,9 +4664,6 @@
     f = _Cfunctions.get('libvlc_video_get_track_description', None) or \
         _Cfunction('libvlc_video_get_track_description', ((1,),), None,
                     ctypes.POINTER(TrackDescription), MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_get_track_description
-        libvlc_video_get_track_description = f
     return f(p_mi)
 
 def libvlc_video_get_track(p_mi):
@@ -5119,9 +4674,6 @@
     f = _Cfunctions.get('libvlc_video_get_track', None) or \
         _Cfunction('libvlc_video_get_track', ((1,),), None,
                     ctypes.c_int, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_get_track
-        libvlc_video_get_track = f
     return f(p_mi)
 
 def libvlc_video_set_track(p_mi, i_track):
@@ -5133,9 +4685,6 @@
     f = _Cfunctions.get('libvlc_video_set_track', None) or \
         _Cfunction('libvlc_video_set_track', ((1,), (1,),), None,
                     ctypes.c_int, MediaPlayer, ctypes.c_int)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_set_track
-        libvlc_video_set_track = f
     return f(p_mi, i_track)
 
 def libvlc_video_take_snapshot(p_mi, num, psz_filepath, i_width, i_height):
@@ -5152,9 +4701,6 @@
     f = _Cfunctions.get('libvlc_video_take_snapshot', None) or \
         _Cfunction('libvlc_video_take_snapshot', ((1,), (1,), (1,), (1,), (1,),), None,
                     ctypes.c_int, MediaPlayer, ctypes.c_uint, ctypes.c_char_p, ctypes.c_int, ctypes.c_int)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_take_snapshot
-        libvlc_video_take_snapshot = f
     return f(p_mi, num, psz_filepath, i_width, i_height)
 
 def libvlc_video_set_deinterlace(p_mi, psz_mode):
@@ -5165,9 +4711,6 @@
     f = _Cfunctions.get('libvlc_video_set_deinterlace', None) or \
         _Cfunction('libvlc_video_set_deinterlace', ((1,), (1,),), None,
                     None, MediaPlayer, ctypes.c_char_p)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_set_deinterlace
-        libvlc_video_set_deinterlace = f
     return f(p_mi, psz_mode)
 
 def libvlc_video_get_marquee_int(p_mi, option):
@@ -5178,9 +4721,6 @@
     f = _Cfunctions.get('libvlc_video_get_marquee_int', None) or \
         _Cfunction('libvlc_video_get_marquee_int', ((1,), (1,),), None,
                     ctypes.c_int, MediaPlayer, ctypes.c_uint)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_get_marquee_int
-        libvlc_video_get_marquee_int = f
     return f(p_mi, option)
 
 def libvlc_video_get_marquee_string(p_mi, option):
@@ -5191,9 +4731,6 @@
     f = _Cfunctions.get('libvlc_video_get_marquee_string', None) or \
         _Cfunction('libvlc_video_get_marquee_string', ((1,), (1,),), string_result,
                     ctypes.c_void_p, MediaPlayer, ctypes.c_uint)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_get_marquee_string
-        libvlc_video_get_marquee_string = f
     return f(p_mi, option)
 
 def libvlc_video_set_marquee_int(p_mi, option, i_val):
@@ -5207,9 +4744,6 @@
     f = _Cfunctions.get('libvlc_video_set_marquee_int', None) or \
         _Cfunction('libvlc_video_set_marquee_int', ((1,), (1,), (1,),), None,
                     None, MediaPlayer, ctypes.c_uint, ctypes.c_int)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_set_marquee_int
-        libvlc_video_set_marquee_int = f
     return f(p_mi, option, i_val)
 
 def libvlc_video_set_marquee_string(p_mi, option, psz_text):
@@ -5221,9 +4755,6 @@
     f = _Cfunctions.get('libvlc_video_set_marquee_string', None) or \
         _Cfunction('libvlc_video_set_marquee_string', ((1,), (1,), (1,),), None,
                     None, MediaPlayer, ctypes.c_uint, ctypes.c_char_p)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_set_marquee_string
-        libvlc_video_set_marquee_string = f
     return f(p_mi, option, psz_text)
 
 def libvlc_video_get_logo_int(p_mi, option):
@@ -5234,9 +4765,6 @@
     f = _Cfunctions.get('libvlc_video_get_logo_int', None) or \
         _Cfunction('libvlc_video_get_logo_int', ((1,), (1,),), None,
                     ctypes.c_int, MediaPlayer, ctypes.c_uint)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_get_logo_int
-        libvlc_video_get_logo_int = f
     return f(p_mi, option)
 
 def libvlc_video_set_logo_int(p_mi, option, value):
@@ -5251,9 +4779,6 @@
     f = _Cfunctions.get('libvlc_video_set_logo_int', None) or \
         _Cfunction('libvlc_video_set_logo_int', ((1,), (1,), (1,),), None,
                     None, MediaPlayer, ctypes.c_uint, ctypes.c_int)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_set_logo_int
-        libvlc_video_set_logo_int = f
     return f(p_mi, option, value)
 
 def libvlc_video_set_logo_string(p_mi, option, psz_value):
@@ -5266,9 +4791,6 @@
     f = _Cfunctions.get('libvlc_video_set_logo_string', None) or \
         _Cfunction('libvlc_video_set_logo_string', ((1,), (1,), (1,),), None,
                     None, MediaPlayer, ctypes.c_uint, ctypes.c_char_p)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_set_logo_string
-        libvlc_video_set_logo_string = f
     return f(p_mi, option, psz_value)
 
 def libvlc_video_get_adjust_int(p_mi, option):
@@ -5280,9 +4802,6 @@
     f = _Cfunctions.get('libvlc_video_get_adjust_int', None) or \
         _Cfunction('libvlc_video_get_adjust_int', ((1,), (1,),), None,
                     ctypes.c_int, MediaPlayer, ctypes.c_uint)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_get_adjust_int
-        libvlc_video_get_adjust_int = f
     return f(p_mi, option)
 
 def libvlc_video_set_adjust_int(p_mi, option, value):
@@ -5298,9 +4817,6 @@
     f = _Cfunctions.get('libvlc_video_set_adjust_int', None) or \
         _Cfunction('libvlc_video_set_adjust_int', ((1,), (1,), (1,),), None,
                     None, MediaPlayer, ctypes.c_uint, ctypes.c_int)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_set_adjust_int
-        libvlc_video_set_adjust_int = f
     return f(p_mi, option, value)
 
 def libvlc_video_get_adjust_float(p_mi, option):
@@ -5312,9 +4828,6 @@
     f = _Cfunctions.get('libvlc_video_get_adjust_float', None) or \
         _Cfunction('libvlc_video_get_adjust_float', ((1,), (1,),), None,
                     ctypes.c_float, MediaPlayer, ctypes.c_uint)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_get_adjust_float
-        libvlc_video_get_adjust_float = f
     return f(p_mi, option)
 
 def libvlc_video_set_adjust_float(p_mi, option, value):
@@ -5328,9 +4841,6 @@
     f = _Cfunctions.get('libvlc_video_set_adjust_float', None) or \
         _Cfunction('libvlc_video_set_adjust_float', ((1,), (1,), (1,),), None,
                     None, MediaPlayer, ctypes.c_uint, ctypes.c_float)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_video_set_adjust_float
-        libvlc_video_set_adjust_float = f
     return f(p_mi, option, value)
 
 def libvlc_audio_output_list_get(p_instance):
@@ -5341,9 +4851,6 @@
     f = _Cfunctions.get('libvlc_audio_output_list_get', None) or \
         _Cfunction('libvlc_audio_output_list_get', ((1,),), None,
                     ctypes.POINTER(AudioOutput), Instance)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_audio_output_list_get
-        libvlc_audio_output_list_get = f
     return f(p_instance)
 
 def libvlc_audio_output_list_release(p_list):
@@ -5353,9 +4860,6 @@
     f = _Cfunctions.get('libvlc_audio_output_list_release', None) or \
         _Cfunction('libvlc_audio_output_list_release', ((1,),), None,
                     None, ctypes.POINTER(AudioOutput))
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_audio_output_list_release
-        libvlc_audio_output_list_release = f
     return f(p_list)
 
 def libvlc_audio_output_set(p_mi, psz_name):
@@ -5368,9 +4872,6 @@
     f = _Cfunctions.get('libvlc_audio_output_set', None) or \
         _Cfunction('libvlc_audio_output_set', ((1,), (1,),), None,
                     ctypes.c_int, MediaPlayer, ctypes.c_char_p)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_audio_output_set
-        libvlc_audio_output_set = f
     return f(p_mi, psz_name)
 
 def libvlc_audio_output_device_count(p_instance, psz_audio_output):
@@ -5383,9 +4884,6 @@
     f = _Cfunctions.get('libvlc_audio_output_device_count', None) or \
         _Cfunction('libvlc_audio_output_device_count', ((1,), (1,),), None,
                     ctypes.c_int, Instance, ctypes.c_char_p)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_audio_output_device_count
-        libvlc_audio_output_device_count = f
     return f(p_instance, psz_audio_output)
 
 def libvlc_audio_output_device_longname(p_instance, psz_audio_output, i_device):
@@ -5398,9 +4896,6 @@
     f = _Cfunctions.get('libvlc_audio_output_device_longname', None) or \
         _Cfunction('libvlc_audio_output_device_longname', ((1,), (1,), (1,),), string_result,
                     ctypes.c_void_p, Instance, ctypes.c_char_p, ctypes.c_int)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_audio_output_device_longname
-        libvlc_audio_output_device_longname = f
     return f(p_instance, psz_audio_output, i_device)
 
 def libvlc_audio_output_device_id(p_instance, psz_audio_output, i_device):
@@ -5413,9 +4908,6 @@
     f = _Cfunctions.get('libvlc_audio_output_device_id', None) or \
         _Cfunction('libvlc_audio_output_device_id', ((1,), (1,), (1,),), string_result,
                     ctypes.c_void_p, Instance, ctypes.c_char_p, ctypes.c_int)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_audio_output_device_id
-        libvlc_audio_output_device_id = f
     return f(p_instance, psz_audio_output, i_device)
 
 def libvlc_audio_output_device_set(p_mi, psz_audio_output, psz_device_id):
@@ -5427,9 +4919,6 @@
     f = _Cfunctions.get('libvlc_audio_output_device_set', None) or \
         _Cfunction('libvlc_audio_output_device_set', ((1,), (1,), (1,),), None,
                     None, MediaPlayer, ctypes.c_char_p, ctypes.c_char_p)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_audio_output_device_set
-        libvlc_audio_output_device_set = f
     return f(p_mi, psz_audio_output, psz_device_id)
 
 def libvlc_audio_output_get_device_type(p_mi):
@@ -5441,9 +4930,6 @@
     f = _Cfunctions.get('libvlc_audio_output_get_device_type', None) or \
         _Cfunction('libvlc_audio_output_get_device_type', ((1,),), None,
                     ctypes.c_int, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_audio_output_get_device_type
-        libvlc_audio_output_get_device_type = f
     return f(p_mi)
 
 def libvlc_audio_output_set_device_type(p_mi, device_type):
@@ -5454,9 +4940,6 @@
     f = _Cfunctions.get('libvlc_audio_output_set_device_type', None) or \
         _Cfunction('libvlc_audio_output_set_device_type', ((1,), (1,),), None,
                     None, MediaPlayer, ctypes.c_int)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_audio_output_set_device_type
-        libvlc_audio_output_set_device_type = f
     return f(p_mi, device_type)
 
 def libvlc_audio_toggle_mute(p_mi):
@@ -5466,9 +4949,6 @@
     f = _Cfunctions.get('libvlc_audio_toggle_mute', None) or \
         _Cfunction('libvlc_audio_toggle_mute', ((1,),), None,
                     None, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_audio_toggle_mute
-        libvlc_audio_toggle_mute = f
     return f(p_mi)
 
 def libvlc_audio_get_mute(p_mi):
@@ -5479,9 +4959,6 @@
     f = _Cfunctions.get('libvlc_audio_get_mute', None) or \
         _Cfunction('libvlc_audio_get_mute', ((1,),), None,
                     ctypes.c_int, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_audio_get_mute
-        libvlc_audio_get_mute = f
     return f(p_mi)
 
 def libvlc_audio_set_mute(p_mi, status):
@@ -5492,9 +4969,6 @@
     f = _Cfunctions.get('libvlc_audio_set_mute', None) or \
         _Cfunction('libvlc_audio_set_mute', ((1,), (1,),), None,
                     None, MediaPlayer, ctypes.c_int)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_audio_set_mute
-        libvlc_audio_set_mute = f
     return f(p_mi, status)
 
 def libvlc_audio_get_volume(p_mi):
@@ -5505,9 +4979,6 @@
     f = _Cfunctions.get('libvlc_audio_get_volume', None) or \
         _Cfunction('libvlc_audio_get_volume', ((1,),), None,
                     ctypes.c_int, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_audio_get_volume
-        libvlc_audio_get_volume = f
     return f(p_mi)
 
 def libvlc_audio_set_volume(p_mi, i_volume):
@@ -5519,9 +4990,6 @@
     f = _Cfunctions.get('libvlc_audio_set_volume', None) or \
         _Cfunction('libvlc_audio_set_volume', ((1,), (1,),), None,
                     ctypes.c_int, MediaPlayer, ctypes.c_int)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_audio_set_volume
-        libvlc_audio_set_volume = f
     return f(p_mi, i_volume)
 
 def libvlc_audio_get_track_count(p_mi):
@@ -5532,9 +5000,6 @@
     f = _Cfunctions.get('libvlc_audio_get_track_count', None) or \
         _Cfunction('libvlc_audio_get_track_count', ((1,),), None,
                     ctypes.c_int, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_audio_get_track_count
-        libvlc_audio_get_track_count = f
     return f(p_mi)
 
 def libvlc_audio_get_track_description(p_mi):
@@ -5545,9 +5010,6 @@
     f = _Cfunctions.get('libvlc_audio_get_track_description', None) or \
         _Cfunction('libvlc_audio_get_track_description', ((1,),), None,
                     ctypes.POINTER(TrackDescription), MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_audio_get_track_description
-        libvlc_audio_get_track_description = f
     return f(p_mi)
 
 def libvlc_audio_get_track(p_mi):
@@ -5558,9 +5020,6 @@
     f = _Cfunctions.get('libvlc_audio_get_track', None) or \
         _Cfunction('libvlc_audio_get_track', ((1,),), None,
                     ctypes.c_int, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_audio_get_track
-        libvlc_audio_get_track = f
     return f(p_mi)
 
 def libvlc_audio_set_track(p_mi, i_track):
@@ -5572,9 +5031,6 @@
     f = _Cfunctions.get('libvlc_audio_set_track', None) or \
         _Cfunction('libvlc_audio_set_track', ((1,), (1,),), None,
                     ctypes.c_int, MediaPlayer, ctypes.c_int)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_audio_set_track
-        libvlc_audio_set_track = f
     return f(p_mi, i_track)
 
 def libvlc_audio_get_channel(p_mi):
@@ -5585,9 +5041,6 @@
     f = _Cfunctions.get('libvlc_audio_get_channel', None) or \
         _Cfunction('libvlc_audio_get_channel', ((1,),), None,
                     ctypes.c_int, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_audio_get_channel
-        libvlc_audio_get_channel = f
     return f(p_mi)
 
 def libvlc_audio_set_channel(p_mi, channel):
@@ -5599,9 +5052,6 @@
     f = _Cfunctions.get('libvlc_audio_set_channel', None) or \
         _Cfunction('libvlc_audio_set_channel', ((1,), (1,),), None,
                     ctypes.c_int, MediaPlayer, ctypes.c_int)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_audio_set_channel
-        libvlc_audio_set_channel = f
     return f(p_mi, channel)
 
 def libvlc_audio_get_delay(p_mi):
@@ -5613,9 +5063,6 @@
     f = _Cfunctions.get('libvlc_audio_get_delay', None) or \
         _Cfunction('libvlc_audio_get_delay', ((1,),), None,
                     ctypes.c_int64, MediaPlayer)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_audio_get_delay
-        libvlc_audio_get_delay = f
     return f(p_mi)
 
 def libvlc_audio_set_delay(p_mi, i_delay):
@@ -5628,9 +5075,6 @@
     f = _Cfunctions.get('libvlc_audio_set_delay', None) or \
         _Cfunction('libvlc_audio_set_delay', ((1,), (1,),), None,
                     ctypes.c_int, MediaPlayer, ctypes.c_int64)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_audio_set_delay
-        libvlc_audio_set_delay = f
     return f(p_mi, i_delay)
 
 def libvlc_vlm_release(p_instance):
@@ -5640,9 +5084,6 @@
     f = _Cfunctions.get('libvlc_vlm_release', None) or \
         _Cfunction('libvlc_vlm_release', ((1,),), None,
                     None, Instance)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_vlm_release
-        libvlc_vlm_release = f
     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):
@@ -5660,9 +5101,6 @@
     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)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_vlm_add_broadcast
-        libvlc_vlm_add_broadcast = f
     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):
@@ -5679,9 +5117,6 @@
     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)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_vlm_add_vod
-        libvlc_vlm_add_vod = f
     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):
@@ -5693,9 +5128,6 @@
     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)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_vlm_del_media
-        libvlc_vlm_del_media = f
     return f(p_instance, psz_name)
 
 def libvlc_vlm_set_enabled(p_instance, psz_name, b_enabled):
@@ -5708,9 +5140,6 @@
     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)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_vlm_set_enabled
-        libvlc_vlm_set_enabled = f
     return f(p_instance, psz_name, b_enabled)
 
 def libvlc_vlm_set_output(p_instance, psz_name, psz_output):
@@ -5723,9 +5152,6 @@
     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)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_vlm_set_output
-        libvlc_vlm_set_output = f
     return f(p_instance, psz_name, psz_output)
 
 def libvlc_vlm_set_input(p_instance, psz_name, psz_input):
@@ -5739,9 +5165,6 @@
     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)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_vlm_set_input
-        libvlc_vlm_set_input = f
     return f(p_instance, psz_name, psz_input)
 
 def libvlc_vlm_add_input(p_instance, psz_name, psz_input):
@@ -5754,9 +5177,6 @@
     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)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_vlm_add_input
-        libvlc_vlm_add_input = f
     return f(p_instance, psz_name, psz_input)
 
 def libvlc_vlm_set_loop(p_instance, psz_name, b_loop):
@@ -5769,9 +5189,6 @@
     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)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_vlm_set_loop
-        libvlc_vlm_set_loop = f
     return f(p_instance, psz_name, b_loop)
 
 def libvlc_vlm_set_mux(p_instance, psz_name, psz_mux):
@@ -5784,9 +5201,6 @@
     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)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_vlm_set_mux
-        libvlc_vlm_set_mux = f
     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):
@@ -5805,9 +5219,6 @@
     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)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_vlm_change_media
-        libvlc_vlm_change_media = f
     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):
@@ -5819,9 +5230,6 @@
     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)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_vlm_play_media
-        libvlc_vlm_play_media = f
     return f(p_instance, psz_name)
 
 def libvlc_vlm_stop_media(p_instance, psz_name):
@@ -5833,9 +5241,6 @@
     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)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_vlm_stop_media
-        libvlc_vlm_stop_media = f
     return f(p_instance, psz_name)
 
 def libvlc_vlm_pause_media(p_instance, psz_name):
@@ -5847,9 +5252,6 @@
     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)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_vlm_pause_media
-        libvlc_vlm_pause_media = f
     return f(p_instance, psz_name)
 
 def libvlc_vlm_seek_media(p_instance, psz_name, f_percentage):
@@ -5862,9 +5264,6 @@
     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)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_vlm_seek_media
-        libvlc_vlm_seek_media = f
     return f(p_instance, psz_name, f_percentage)
 
 def libvlc_vlm_show_media(p_instance, psz_name):
@@ -5883,9 +5282,6 @@
     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)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_vlm_show_media
-        libvlc_vlm_show_media = f
     return f(p_instance, psz_name)
 
 def libvlc_vlm_get_media_instance_position(p_instance, psz_name, i_instance):
@@ -5898,9 +5294,6 @@
     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)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_vlm_get_media_instance_position
-        libvlc_vlm_get_media_instance_position = f
     return f(p_instance, psz_name, i_instance)
 
 def libvlc_vlm_get_media_instance_time(p_instance, psz_name, i_instance):
@@ -5913,9 +5306,6 @@
     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)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_vlm_get_media_instance_time
-        libvlc_vlm_get_media_instance_time = f
     return f(p_instance, psz_name, i_instance)
 
 def libvlc_vlm_get_media_instance_length(p_instance, psz_name, i_instance):
@@ -5928,9 +5318,6 @@
     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)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_vlm_get_media_instance_length
-        libvlc_vlm_get_media_instance_length = f
     return f(p_instance, psz_name, i_instance)
 
 def libvlc_vlm_get_media_instance_rate(p_instance, psz_name, i_instance):
@@ -5943,9 +5330,6 @@
     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)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_vlm_get_media_instance_rate
-        libvlc_vlm_get_media_instance_rate = f
     return f(p_instance, psz_name, i_instance)
 
 def libvlc_vlm_get_media_instance_title(p_instance, psz_name, i_instance):
@@ -5959,9 +5343,6 @@
     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)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_vlm_get_media_instance_title
-        libvlc_vlm_get_media_instance_title = f
     return f(p_instance, psz_name, i_instance)
 
 def libvlc_vlm_get_media_instance_chapter(p_instance, psz_name, i_instance):
@@ -5975,9 +5356,6 @@
     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)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_vlm_get_media_instance_chapter
-        libvlc_vlm_get_media_instance_chapter = f
     return f(p_instance, psz_name, i_instance)
 
 def libvlc_vlm_get_media_instance_seekable(p_instance, psz_name, i_instance):
@@ -5991,9 +5369,6 @@
     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)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_vlm_get_media_instance_seekable
-        libvlc_vlm_get_media_instance_seekable = f
     return f(p_instance, psz_name, i_instance)
 
 def libvlc_vlm_get_event_manager(p_instance):
@@ -6005,21 +5380,20 @@
     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)
-    if not __debug__:  # i.e. python -O or -OO
-        global libvlc_vlm_get_event_manager
-        libvlc_vlm_get_event_manager = f
     return f(p_instance)
 
 
-# 6 function(s) blacklisted:
+# 8 function(s) blacklisted:
 #  libvlc_audio_set_callbacks
 #  libvlc_audio_set_format_callbacks
 #  libvlc_audio_set_volume_callback
+#  libvlc_printerr
 #  libvlc_set_exit_handler
 #  libvlc_video_set_callbacks
 #  libvlc_video_set_format_callbacks
+#  libvlc_vprinterr
 
-# 12 function(s) not wrapped as methods:
+# 13 function(s) not wrapped as methods:
 #  libvlc_audio_output_list_release
 #  libvlc_clearerr
 #  libvlc_clock
@@ -6031,6 +5405,7 @@
 #  libvlc_get_version
 #  libvlc_module_description_list_release
 #  libvlc_new
+#  libvlc_track_description_list_release
 #  libvlc_track_description_release
 
 # Start of footer.py #

=== modified file 'openlp/plugins/media/lib/mediatab.py'
--- openlp/plugins/media/lib/mediatab.py	2011-12-31 17:37:56 +0000
+++ openlp/plugins/media/lib/mediatab.py	2012-03-08 22:25:22 +0000
@@ -28,7 +28,7 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import SettingsTab, translate, Receiver
-from openlp.core.lib.ui import UiStrings
+from openlp.core.lib.ui import UiStrings, create_up_down_push_button_set
 
 class MediaTab(SettingsTab):
     """
@@ -57,7 +57,7 @@
         self.leftLayout.addWidget(self.mediaPlayerGroupBox)
         self.playerOrderGroupBox = QtGui.QGroupBox(self.leftColumn)
         self.playerOrderGroupBox.setObjectName(u'playerOrderGroupBox')
-        self.playerOrderLayout = QtGui.QVBoxLayout(self.playerOrderGroupBox)
+        self.playerOrderLayout = QtGui.QHBoxLayout(self.playerOrderGroupBox)
         self.playerOrderLayout.setObjectName(u'playerOrderLayout')
         self.playerOrderlistWidget = QtGui.QListWidget( \
             self.playerOrderGroupBox)
@@ -76,18 +76,15 @@
             QtGui.QAbstractItemView.NoEditTriggers)
         self.playerOrderlistWidget.setObjectName(u'playerOrderlistWidget')
         self.playerOrderLayout.addWidget(self.playerOrderlistWidget)
-        self.orderingButtonsWidget = QtGui.QWidget(self.playerOrderGroupBox)
-        self.orderingButtonsWidget.setObjectName(u'orderingButtonsWidget')
-        self.orderingButtonLayout = QtGui.QHBoxLayout( \
-            self.orderingButtonsWidget)
+        self.orderingButtonLayout = QtGui.QVBoxLayout()
         self.orderingButtonLayout.setObjectName(u'orderingButtonLayout')
-        self.orderingDownButton = QtGui.QPushButton(self.orderingButtonsWidget)
-        self.orderingDownButton.setObjectName(u'orderingDownButton')
+        self.orderingButtonLayout.addStretch(1)
+        self.orderingUpButton, self.orderingDownButton = \
+            create_up_down_push_button_set(self)
+        self.orderingButtonLayout.addWidget(self.orderingUpButton)
         self.orderingButtonLayout.addWidget(self.orderingDownButton)
-        self.orderingUpButton = QtGui.QPushButton(self.playerOrderGroupBox)
-        self.orderingUpButton.setObjectName(u'orderingUpButton')
-        self.orderingButtonLayout.addWidget(self.orderingUpButton)
-        self.playerOrderLayout.addWidget(self.orderingButtonsWidget)
+        self.orderingButtonLayout.addStretch(1)
+        self.playerOrderLayout.addLayout(self.orderingButtonLayout)
         self.leftLayout.addWidget(self.playerOrderGroupBox)
         self.advancedGroupBox = QtGui.QGroupBox(self.leftColumn)
         self.advancedGroupBox.setObjectName(u'advancedGroupBox')
@@ -105,10 +102,6 @@
             QtCore.QObject.connect(checkbox,
                 QtCore.SIGNAL(u'stateChanged(int)'),
                 self.onPlayerCheckBoxChanged)
-        QtCore.QObject.connect(self.orderingUpButton,
-            QtCore.SIGNAL(u'pressed()'), self.onOrderingUpButtonPressed)
-        QtCore.QObject.connect(self.orderingDownButton,
-            QtCore.SIGNAL(u'pressed()'), self.onOrderingDownButtonPressed)
 
     def retranslateUi(self):
         self.mediaPlayerGroupBox.setTitle(
@@ -124,10 +117,6 @@
                     '%s (unavailable)')) % player.name)
         self.playerOrderGroupBox.setTitle(
             translate('MediaPlugin.MediaTab', 'Player Order'))
-        self.orderingDownButton.setText(
-            translate('MediaPlugin.MediaTab', 'Down'))
-        self.orderingUpButton.setText(
-            translate('MediaPlugin.MediaTab', 'Up'))
         self.advancedGroupBox.setTitle(UiStrings().Advanced)
         self.overridePlayerCheckBox.setText(
             translate('MediaPlugin.MediaTab',
@@ -154,21 +143,23 @@
                     self.playerCheckBoxes[u'%s' % player].setEnabled(True)
                 self.playerOrderlistWidget.addItem(player)
 
-    def onOrderingUpButtonPressed(self):
-        currentRow = self.playerOrderlistWidget.currentRow()
-        if currentRow > 0:
-            item = self.playerOrderlistWidget.takeItem(currentRow)
-            self.playerOrderlistWidget.insertItem(currentRow - 1, item)
-            self.playerOrderlistWidget.setCurrentRow(currentRow - 1)
-            self.usedPlayers.move(currentRow, currentRow - 1)
+    def onUpButtonClicked(self):
+        row = self.playerOrderlistWidget.currentRow()
+        if row <= 0:
+            return
+        item = self.playerOrderlistWidget.takeItem(row)
+        self.playerOrderlistWidget.insertItem(row - 1, item)
+        self.playerOrderlistWidget.setCurrentRow(row - 1)
+        self.usedPlayers.move(row, row - 1)
 
-    def onOrderingDownButtonPressed(self):
-        currentRow = self.playerOrderlistWidget.currentRow()
-        if currentRow < self.playerOrderlistWidget.count() - 1:
-            item = self.playerOrderlistWidget.takeItem(currentRow)
-            self.playerOrderlistWidget.insertItem(currentRow + 1, item)
-            self.playerOrderlistWidget.setCurrentRow(currentRow + 1)
-            self.usedPlayers.move(currentRow, currentRow + 1)
+    def onDownButtonClicked(self):
+        row = self.playerOrderlistWidget.currentRow()
+        if row == -1 or row > self.playerOrderlistWidget.count() - 1:
+            return
+        item = self.playerOrderlistWidget.takeItem(row)
+        self.playerOrderlistWidget.insertItem(row + 1, item)
+        self.playerOrderlistWidget.setCurrentRow(row + 1)
+        self.usedPlayers.move(row, row + 1)
 
     def load(self):
         if self.savedUsedPlayers:


Follow ups