Add full metadata and coverart support to the library

[deb_shairplay.git] / src / bindings / python / Shairplay.py

diff --git a/src/bindings/python/Shairplay.py b/src/bindings/python/Shairplay.py
index 3e54d60dccc18976a5e9510ae2b037e6200fcefd..04dbb37c4952046e5b978d44810e86cffdaab84a 100644 (file)
--- a/src/bindings/python/Shairplay.py
+++ b/src/bindings/python/Shairplay.py
@@ -42,30 +42,12 @@ class RaopNativeCallbacks(Structure):
                    ("audio_flush",       audio_flush_prototype),
                    ("audio_destroy",     audio_destroy_prototype)]
 
-def LoadShairplay(path):
-       if sys.maxsize < 2**32:
-               libname = "shairplay32"
-       else:
-               libname = "shairplay64"
-
-       if platform.system() == "Windows":
-               libname = libname + ".dll"
-       elif platform.system() == "Darwin":
-               libname = "lib" + libname + ".dylib"
-       else:
-               libname = "lib" + libname + ".so"
-
-       try:
-               fullpath = os.path.join(path, libname)
-               libshairplay = cdll.LoadLibrary(fullpath)
-       except:
-               raise RuntimeError("Couldn't load shairplay library " + libname)
-
+def InitShairplay(libshairplay):
        # Initialize dnssd related functions
        libshairplay.dnssd_init.restype = c_void_p
        libshairplay.dnssd_init.argtypes = [POINTER(c_int)]
        libshairplay.dnssd_register_raop.restype = c_int
-       libshairplay.dnssd_register_raop.argtypes = [c_void_p, c_char_p, c_ushort, POINTER(c_char), c_int]
+       libshairplay.dnssd_register_raop.argtypes = [c_void_p, c_char_p, c_ushort, POINTER(c_char), c_int, c_int]
        libshairplay.dnssd_register_airplay.restype = c_int
        libshairplay.dnssd_register_airplay.argtypes = [c_void_p, c_char_p, c_ushort, POINTER(c_char), c_int]
        libshairplay.dnssd_unregister_raop.restype = None
@@ -78,13 +60,35 @@ def LoadShairplay(path):
        # Initialize raop related functions
        libshairplay.raop_init.restype = c_void_p
        libshairplay.raop_init.argtypes = [POINTER(RaopNativeCallbacks), c_char_p]
+       libshairplay.raop_is_running.restype = c_int
+       libshairplay.raop_is_running.argtypes = [c_void_p]
        libshairplay.raop_start.restype = c_int
-       libshairplay.raop_start.argtypes = [c_void_p, POINTER(c_ushort), POINTER(c_char), c_int]
+       libshairplay.raop_start.argtypes = [c_void_p, POINTER(c_ushort), POINTER(c_char), c_int, c_char_p]
        libshairplay.raop_stop.restype = None
        libshairplay.raop_stop.argtypes = [c_void_p]
        libshairplay.raop_destroy.restype = None
        libshairplay.raop_destroy.argtypes = [c_void_p]
 
+def LoadShairplay(path):
+       if sys.maxsize < 2**32:
+               libname = "shairplay32"
+       else:
+               libname = "shairplay64"
+
+       if platform.system() == "Windows":
+               libname = libname + ".dll"
+       elif platform.system() == "Darwin":
+               libname = "lib" + libname + ".dylib"
+       else:
+               libname = "lib" + libname + ".so"
+
+       try:
+               fullpath = os.path.join(path, libname)
+               libshairplay = cdll.LoadLibrary(fullpath)
+       except:
+               raise RuntimeError("Couldn't load shairplay library " + libname)
+
+       InitShairplay(libshairplay)
        return libshairplay
 
 RSA_KEY = """
@@ -179,11 +183,17 @@ class RaopService:
                        self.libshairplay.raop_destroy(self.instance)
                self.instance = None
 
-       def start(self, port, hwaddrstr):
+       def is_running(self):
+               if self.libshairplay.raop_is_running(self.instance):
+                       return True
+               else:
+                       return False
+
+       def start(self, port, hwaddrstr, password=None):
                port = c_ushort(port)
                hwaddr = create_string_buffer(hwaddrstr, len(hwaddrstr))
 
-               ret = self.libshairplay.raop_start(self.instance, pointer(port), hwaddr, c_int(len(hwaddr)))
+               ret = self.libshairplay.raop_start(self.instance, pointer(port), hwaddr, c_int(len(hwaddr)), password)
                if ret < 0:
                        raise RuntimeError("Starting RAOP instance failed")
                return port.value
@@ -207,9 +217,12 @@ class DnssdService:
                        self.libshairplay.dnssd_destroy(self.instance)
                self.instance = None
 
-       def register_raop(self, name, port, hwaddrstr):
+       def register_raop(self, name, port, hwaddrstr, password=False):
                hwaddr = create_string_buffer(hwaddrstr, len(hwaddrstr))
-               self.libshairplay.dnssd_register_raop(self.instance, name, c_ushort(port), hwaddr, len(hwaddr))
+               use_pw = c_int(0)
+               if password:
+                       use_pw = c_int(1)
+               self.libshairplay.dnssd_register_raop(self.instance, name, c_ushort(port), hwaddr, len(hwaddr), use_pw)
 
        def unregister_raop(self):
                self.libshairplay.dnssd_unregister_raop(self.instance)