Make it possible to init shairplay library without using the default loader.

diff --git a/src/bindings/python/Shairplay.py b/src/bindings/python/Shairplay.py
index 3e54d60dccc18976a5e9510ae2b037e6200fcefd..0add4be5f20a8987bea78147b47a6fb0363a9e76 100644 (file)
--- a/src/bindings/python/Shairplay.py
+++ b/src/bindings/python/Shairplay.py
@@ -42,25 +42,7 @@ 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)]
@@ -85,6 +67,26 @@ def LoadShairplay(path):
        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 = """