python-ctypes: improve win32 initialization (contrib from <mmuellen@gmx.de>)

[vlc] / bindings / python-ctypes / header.py

diff --git a/bindings/python-ctypes/header.py b/bindings/python-ctypes/header.py
index 046aedc68643f4f381ffdfb239f8c170333505de..4f4c870ade32bebe6f3215c1745387a7bffc5056 100755 (executable)
--- a/bindings/python-ctypes/header.py
+++ b/bindings/python-ctypes/header.py
@@ -46,11 +46,26 @@ elif sys.platform == 'win32':
     plugin_path=None
     path=ctypes.util.find_library('libvlc.dll')
     if path is None:
-        # Try a standard location.
-        p='c:\\Program Files\\VideoLAN\\VLC\\libvlc.dll'
-        if os.path.exists(p):
-            plugin_path=os.path.dirname(p)
-            os.chdir(plugin_path)
+        # Try to use registry settings
+        import _winreg
+        plugin_path_found = None
+        subkey, name = 'Software\\VideoLAN\\VLC','InstallDir'
+        for hkey in _winreg.HKEY_LOCAL_MACHINE, _winreg.HKEY_CURRENT_USER:
+            try:
+                reg = _winreg.OpenKey(hkey, subkey)
+                plugin_path_found, type_id = _winreg.QueryValueEx(reg, name)
+                _winreg.CloseKey(reg)
+                break
+            except _winreg.error:
+                pass
+        if plugin_path_found:
+            plugin_path = plugin_path_found
+        else:
+            # Try a standard location.
+            p='c:\\Program Files\\VideoLAN\\VLC\\libvlc.dll'
+            if os.path.exists(p):
+                plugin_path=os.path.dirname(p)
+        os.chdir(plugin_path)
         # If chdir failed, this will not work and raise an exception
         path='libvlc.dll'
     else:
@@ -70,8 +85,15 @@ class ListPOINTER(object):
         if isinstance(param, (list,tuple)):
             return (self.etype * len(param))(*param)
 
+class LibVLCException(Exception):
+    """Python exception raised by libvlc methods.
+    """
+    pass
+
 # From libvlc_structures.h
 class VLCException(ctypes.Structure):
+    """libvlc exception.
+    """
     _fields_= [
                 ('raised', ctypes.c_int),
                 ('code', ctypes.c_int),
@@ -90,6 +112,9 @@ class PlaylistItem(ctypes.Structure):
                 ('name', ctypes.c_char_p),
                 ]
 
+    def __str__(self):
+        return "PlaylistItem #%d %s (%uri)" % (self.id, self.name, self.uri)
+
 class LogMessage(ctypes.Structure):
     _fields_= [
                 ('size', ctypes.c_uint),
@@ -101,15 +126,22 @@ class LogMessage(ctypes.Structure):
                 ]
 
     def __str__(self):
-        print "vlc.LogMessage(%d:%s): %s" % (self.severity, self.type, self.message)
+        return "vlc.LogMessage(%d:%s): %s" % (self.severity, self.type, self.message)
 
 class MediaControlPosition(ctypes.Structure):
     _fields_= [
-                ('origin', ctypes.c_ushort),
-                ('key', ctypes.c_ushort),
+                ('origin', ctypes.c_int),
+                ('key', ctypes.c_int),
                 ('value', ctypes.c_longlong),
                 ]
 
+    def __str__(self):
+        return "MediaControlPosition %ld (%s, %s)" % (
+            self.value,
+            str(PositionOrigin(self.origin)),
+            str(PositionKey(self.key))
+            )
+
     @staticmethod
     def from_param(arg):
         if isinstance(arg, (int, long)):
@@ -120,15 +152,6 @@ class MediaControlPosition(ctypes.Structure):
         else:
             return arg
 
-class MediaControlPositionOrigin(ctypes.c_uint):
-    enum=(
-        'AbsolutePosition',
-        'RelativePosition',
-        'ModuloPosition',
-        )
-    def __repr__(self):
-        return self.enum[self.value]
-
 class MediaControlException(ctypes.Structure):
     _fields_= [
                 ('code', ctypes.c_int),
@@ -142,20 +165,35 @@ class MediaControlException(ctypes.Structure):
 
 class MediaControlStreamInformation(ctypes.Structure):
     _fields_= [
-                ('code', ctypes.c_int),
-                ('message', ctypes.c_char_p),
+                ('status', ctypes.c_int),
+                ('url', ctypes.c_char_p),
+                ('position', ctypes.c_longlong),
+                ('length', ctypes.c_longlong),
                 ]
 
+    def __str__(self):
+        return "%s (%s) : %ld / %ld" % (self.url,
+                                        str(PlayerStatus(self.status)),
+                                        self.position,
+                                        self.length)
+
 class RGBPicture(ctypes.Structure):
     _fields_= [
                 ('width', ctypes.c_int),
                 ('height', ctypes.c_int),
                 ('type', ctypes.c_uint32),
-                ('date', ctypes.c_longlong),
+                ('date', ctypes.c_ulonglong),
                 ('size', ctypes.c_int),
-                ('data', ctypes.c_char_p),
+                ('data_pointer', ctypes.c_void_p),
                 ]
 
+    @property
+    def data(self):
+        return ctypes.string_at(self.data_pointer, self.size)
+
+    def __str__(self):
+        return "RGBPicture (%d, %d) - %ld ms - %d bytes" % (self.width, self.height, self.date, self.size)
+
     def free(self):
         mediacontrol_RGBPicture__free(self)
 
@@ -163,10 +201,10 @@ def check_vlc_exception(result, func, args):
     """Error checking method for functions using an exception in/out parameter.
     """
     ex=args[-1]
-    # Take into account both VLCException and MediacontrolException
+    # Take into account both VLCException and MediacontrolException:
     c=getattr(ex, 'raised', getattr(ex, 'code', 0))
     if c:
-        raise Exception(args[-1].message)
+        raise LibVLCException(args[-1].message)
     return result
 
 ### End of header.py ###