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

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

diff --git a/src/bindings/python/Shairplay.py b/src/bindings/python/Shairplay.py
index 35142f196a39d5bcc69ae125018b95fe06a3e6b7..0add4be5f20a8987bea78147b47a6fb0363a9e76 100644 (file)
--- a/src/bindings/python/Shairplay.py
+++ b/src/bindings/python/Shairplay.py
@@ -1,15 +1,25 @@
+# coding=utf-8
 '''
-       Copyright (C) 2012  Juho Vähä-Herttua
-
-       This library is free software; you can redistribute it and/or
-       modify it under the terms of the GNU Lesser General Public
-       License as published by the Free Software Foundation; either
-       version 2.1 of the License, or (at your option) any later version.
-
-       This library is distributed in the hope that it will be useful,
-       but WITHOUT ANY WARRANTY; without even the implied warranty of
-       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-       Lesser General Public License for more details.
+Copyright (C) 2012  Juho Vähä-Herttua
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 '''
 
 import os
@@ -32,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)]
@@ -75,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 = """
@@ -122,7 +134,8 @@ class RaopCallbacks:
 class RaopService:
        def audio_init_cb(self, cls, bits, channels, samplerate):
                session = self.callbacks.audio_init(bits, channels, samplerate)
-               return py_object(session)
+               self.sessions.append(session)
+               return session
 
        def audio_set_volume_cb(self, cls, sessionptr, volume):
                session = cast(sessionptr, py_object).value
@@ -140,11 +153,14 @@ class RaopService:
        def audio_destroy_cb(self, cls, sessionptr):
                session = cast(sessionptr, py_object).value
                self.callbacks.audio_destroy(session)
+               if session in self.sessions:
+                       self.sessions.remove(session)
 
 
        def __init__(self, libshairplay, callbacks):
                self.libshairplay = libshairplay
                self.callbacks = callbacks
+               self.sessions = []
                self.instance = None
 
                # We need to hold a reference to native_callbacks