vlc/python | branch: master | Olivier Aubert <cont...@olivieraubert.net> | Thu Apr 8 15:05:30 2021 +0200| [0f283c347c64fcdbe9b10926c09fa4c123c282cc] | committer: Olivier Aubert
python: update generated modules > http://git.videolan.org/gitweb.cgi/vlc/python.git/?a=commit;h=0f283c347c64fcdbe9b10926c09fa4c123c282cc --- generated/3.0/setup.py | 4 ++-- generated/3.0/vlc.py | 49 +++++++++++++++++++++++++++++++++++++++++++++---- generated/dev/vlc.py | 49 +++++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 92 insertions(+), 10 deletions(-) diff --git a/generated/3.0/setup.py b/generated/3.0/setup.py index 9e288cb..88d65dc 100644 --- a/generated/3.0/setup.py +++ b/generated/3.0/setup.py @@ -4,7 +4,7 @@ use_setuptools() from setuptools import setup setup(name='python-vlc', - version = '3.0.12116', + version = '3.0.12117', author='Olivier Aubert', author_email='cont...@olivieraubert.net', maintainer='Olivier Aubert', @@ -35,5 +35,5 @@ setup(name='python-vlc', player. Note that it relies on an already present install of VLC. It has been automatically generated from the include files of - vlc 3.0.12, using generator 1.16. + vlc 3.0.12, using generator 1.17. """) diff --git a/generated/3.0/vlc.py b/generated/3.0/vlc.py index b58f4d8..c4f2a76 100644 --- a/generated/3.0/vlc.py +++ b/generated/3.0/vlc.py @@ -52,10 +52,10 @@ from inspect import getargspec, signature import logging logger = logging.getLogger(__name__) -__version__ = "3.0.12116" +__version__ = "3.0.12117" __libvlc_version__ = "3.0.12" -__generator_version__ = "1.16" -build_date = "Thu Apr 8 11:52:07 2021 3.0.12" +__generator_version__ = "1.17" +build_date = "Thu Apr 8 15:05:14 2021 3.0.12" # The libvlc doc states that filenames are expected to be in UTF8, do # not rely on sys.getfilesystemencoding() which will be confused, @@ -409,6 +409,36 @@ else: PyFile_AsFile.restype = FILE_ptr PyFile_AsFile.argtypes = [ctypes.py_object] +def module_description_list(head): + """Convert a ModuleDescription linked list to a Python list (and release the former). + """ + r = [] + if head: + item = head + while item: + item = item.contents + r.append((item.name, item.shortname, item.longname, item.help)) + item = item.next + libvlc_module_description_list_release(head) + return r + +def track_description_list(head): + """Convert a TrackDescription linked list to a Python list (and release the former). + """ + r = [] + if head: + item = head + while item: + item = item.contents + r.append((item.id, item.name)) + item = item.next + try: + libvlc_track_description_release(head) + except NameError: + libvlc_track_description_list_release(head) + + return r + # Generated enum types # class _Enum(ctypes.c_uint): @@ -1175,6 +1205,17 @@ MediaSlave._fields_ = ( ('i_priority', ctypes.c_uint), ) +class MediaDiscovererDescription(ctypes.Structure): + '''Media discoverer description +See libvlc_media_discoverer_list_get(). + ''' + pass +MediaDiscovererDescription._fields_ = ( + ('psz_name', ctypes.c_char_p), + ('psz_longname', ctypes.c_char_p), + ('i_cat', MediaDiscovererCategory), + ) + class TrackDescription(ctypes.Structure): '''Description for video, audio tracks and subtitles. it contains id, name (description string) and pointer to next record. @@ -7983,7 +8024,7 @@ def libvlc_renderer_discoverer_list_get(p_inst, ppp_services): ''' f = _Cfunctions.get('libvlc_renderer_discoverer_list_get', None) or \ _Cfunction('libvlc_renderer_discoverer_list_get', ((1,), (1,),), None, - ctypes.c_size_t, Instance, ctypes.POINTER(ctypes.POINTER(ctypes.POINTER(RDDescription)))) + ctypes.c_size_t, Instance, ctypes.POINTER(ctypes.POINTER(ctypes.POINTER(RdDescription)))) return f(p_inst, ppp_services) def libvlc_renderer_discoverer_list_release(pp_services, i_count): diff --git a/generated/dev/vlc.py b/generated/dev/vlc.py index b760516..7530f90 100644 --- a/generated/dev/vlc.py +++ b/generated/dev/vlc.py @@ -52,10 +52,10 @@ from inspect import getargspec, signature import logging logger = logging.getLogger(__name__) -__version__ = "4.0.0-dev-15177-g3de1584a8d116" +__version__ = "4.0.0-dev-15177-g3de1584a8d117" __libvlc_version__ = "4.0.0-dev-15177-g3de1584a8d" -__generator_version__ = "1.16" -build_date = "Thu Apr 8 11:52:07 2021 4.0.0-dev-15177-g3de1584a8d" +__generator_version__ = "1.17" +build_date = "Thu Apr 8 15:05:14 2021 4.0.0-dev-15177-g3de1584a8d" # The libvlc doc states that filenames are expected to be in UTF8, do # not rely on sys.getfilesystemencoding() which will be confused, @@ -409,6 +409,36 @@ else: PyFile_AsFile.restype = FILE_ptr PyFile_AsFile.argtypes = [ctypes.py_object] +def module_description_list(head): + """Convert a ModuleDescription linked list to a Python list (and release the former). + """ + r = [] + if head: + item = head + while item: + item = item.contents + r.append((item.name, item.shortname, item.longname, item.help)) + item = item.next + libvlc_module_description_list_release(head) + return r + +def track_description_list(head): + """Convert a TrackDescription linked list to a Python list (and release the former). + """ + r = [] + if head: + item = head + while item: + item = item.contents + r.append((item.id, item.name)) + item = item.next + try: + libvlc_track_description_release(head) + except NameError: + libvlc_track_description_list_release(head) + + return r + # Generated enum types # class _Enum(ctypes.c_uint): @@ -1188,6 +1218,17 @@ MediaSlave._fields_ = ( ('i_priority', ctypes.c_uint), ) +class MediaDiscovererDescription(ctypes.Structure): + '''Media discoverer description +See libvlc_media_discoverer_list_get(). + ''' + pass +MediaDiscovererDescription._fields_ = ( + ('psz_name', ctypes.c_char_p), + ('psz_longname', ctypes.c_char_p), + ('i_cat', MediaDiscovererCategory), + ) + class TitleDescription(ctypes.Structure): '''Description for titles. ''' @@ -8213,7 +8254,7 @@ def libvlc_renderer_discoverer_list_get(p_inst, ppp_services): ''' f = _Cfunctions.get('libvlc_renderer_discoverer_list_get', None) or \ _Cfunction('libvlc_renderer_discoverer_list_get', ((1,), (1,),), None, - ctypes.c_size_t, Instance, ctypes.POINTER(ctypes.POINTER(ctypes.POINTER(RDDescription)))) + ctypes.c_size_t, Instance, ctypes.POINTER(ctypes.POINTER(ctypes.POINTER(RdDescription)))) return f(p_inst, ppp_services) def libvlc_renderer_discoverer_list_release(pp_services, i_count): _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits