Relicense bindings as MIT License

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

diff --git a/src/bindings/python/Shairplay.py b/src/bindings/python/Shairplay.py
index 020eb8fb6d33d013a0bad6abdca43b5eed9534a7..3e54d60dccc18976a5e9510ae2b037e6200fcefd 100644 (file)
--- a/src/bindings/python/Shairplay.py
+++ b/src/bindings/python/Shairplay.py
@@ -1,3 +1,27 @@
+# coding=utf-8
+'''
+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
 import sys
 import platform
@@ -39,11 +63,11 @@ def LoadShairplay(path):
 
        # Initialize dnssd related functions
        libshairplay.dnssd_init.restype = c_void_p
-       libshairplay.dnssd_init.argtypes = [POINTER(c_char), c_int, POINTER(c_int)]
+       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]
+       libshairplay.dnssd_register_raop.argtypes = [c_void_p, c_char_p, c_ushort, POINTER(c_char), c_int]
        libshairplay.dnssd_register_airplay.restype = c_int
-       libshairplay.dnssd_register_airplay.argtypes = [c_void_p, c_char_p, c_ushort]
+       libshairplay.dnssd_register_airplay.argtypes = [c_void_p, c_char_p, c_ushort, POINTER(c_char), c_int]
        libshairplay.dnssd_unregister_raop.restype = None
        libshairplay.dnssd_unregister_raop.argtypes = [c_void_p]
        libshairplay.dnssd_unregister_airplay.restype = None
@@ -108,7 +132,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
@@ -126,11 +151,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
@@ -168,10 +196,9 @@ class DnssdService:
                self.libshairplay = libshairplay
                self.instance = None
 
-               hwaddr = (c_char * 6)()
                error = c_int(0)
 
-               self.instance = self.libshairplay.dnssd_init(hwaddr, c_int(len(hwaddr)), pointer(error))
+               self.instance = self.libshairplay.dnssd_init(pointer(error))
                if self.instance == None:
                        raise RuntimeError("Initializing library failed: " + str(error.value))
 
@@ -180,14 +207,16 @@ class DnssdService:
                        self.libshairplay.dnssd_destroy(self.instance)
                self.instance = None
 
-       def register_raop(self, name, port):
-               self.libshairplay.dnssd_register_raop(self.instance, name, c_ushort(port))
+       def register_raop(self, name, port, hwaddrstr):
+               hwaddr = create_string_buffer(hwaddrstr, len(hwaddrstr))
+               self.libshairplay.dnssd_register_raop(self.instance, name, c_ushort(port), hwaddr, len(hwaddr))
 
        def unregister_raop(self):
                self.libshairplay.dnssd_unregister_raop(self.instance)
 
-       def register_airplay(self, name, port):
-               self.libshairplay.dnssd_register_airplay(self.instance, name, c_ushort(port))
+       def register_airplay(self, name, port, hwaddrstr):
+               hwaddr = create_string_buffer(hwaddrstr, len(hwaddrstr))
+               self.libshairplay.dnssd_register_airplay(self.instance, name, c_ushort(port), hwaddr, len(hwaddr))
 
        def unregister_airplay(self):
                self.libshairplay.dnssd_unregister_airplay(self.instance)