[vlc-commits] commit: python: update MediaTrackInfo struct (Olivier Aubert )

[git at videolan.org]

vlc/python | branch: master | Olivier Aubert <olivier.aubert at liris.cnrs.fr> | Tue Apr 20 17:20:37 2010 +0200| [e3555df50cdd8c47c55bf661daebac6d51b48ea2] | committer: Olivier Aubert 

python: update MediaTrackInfo struct

> http://git.videolan.org/gitweb.cgi/vlc/python.git/?a=commit;h=e3555df50cdd8c47c55bf661daebac6d51b48ea2
---

 generate.py |    4 +++-
 header.py   |   13 ++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/generate.py b/generate.py
index 19f780e..6d183c0 100755
--- a/generate.py
+++ b/generate.py
@@ -333,7 +333,7 @@ class PythonGenerator(object):
         'libvlc_track_description_t*': 'TrackDescription',
         'libvlc_audio_output_t*': 'AudioOutput',
         'libvlc_media_stats_t*': 'ctypes.POINTER(MediaStats)',
-        'libvlc_media_es_t**': 'ctypes.POINTER(ctypes.POINTER(MediaES))',
+        'libvlc_media_track_info_t**': 'ctypes.POINTER(ctypes.POINTER(MediaTrackInfo))',
 
         'mediacontrol_Instance*': 'MediaControl',
         'mediacontrol_Exception*': 'MediaControlException',
@@ -351,7 +351,9 @@ class PythonGenerator(object):
         'uint32_t': 'ctypes.c_uint',
         'float': 'ctypes.c_float',
         'unsigned': 'ctypes.c_uint',
+        'unsigned*': 'ctypes.POINTER(ctypes.c_uint)',
         'int': 'ctypes.c_int',
+        'int*': 'ctypes.POINTER(ctypes.c_int)',
         '...': 'FIXMEva_list',
         'libvlc_callback_t': 'ctypes.c_void_p',
         'libvlc_time_t': 'ctypes.c_longlong',
diff --git a/header.py b/header.py
index 12e8e4d..84f7867 100755
--- a/header.py
+++ b/header.py
@@ -171,20 +171,19 @@ class MediaStats(ctypes.Structure):
     def __str__(self):
         return "MediaStats\n%s" % "\n".join( "%s:\t%s" % (n, getattr(self, n)) for n in self._fields_ )
 
-class MediaES(ctypes.Structure):
+class MediaTrackInfo(ctypes.Structure):
     _fields_= [
         ('codec'   , ctypes.c_uint32),
-        ('type'    , EsType),
+        ('id'      , ctypes.c_int),
+        ('type'    , TrackType),
         ('profile' , ctypes.c_int),
         ('level'   , ctypes.c_int),
-        ('channels',  ctypes.c_uint),
-        ('rate'    , ctypes.c_uint),
-        ('height'  , ctypes.c_uint),
-        ('width'   , ctypes.c_uint),
+        ('channels_or_height',  ctypes.c_uint),
+        ('rate_or_width'    , ctypes.c_uint),
         ]
 
     def __str__(self):
-        return "MediaES \n%s" % "\n".join( "%s:\t%s" % (n, getattr(self, n)) for n in self._fields_ )
+        return "MediaTrackInfo \n%s" % "\n".join( "%s:\t%s" % (n, getattr(self, n)) for n in self._fields_ )
 
 class PlaylistItem(ctypes.Structure):
     _fields_= [