X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2FShairplay.py;h=04dbb37c4952046e5b978d44810e86cffdaab84a;hb=2528f9b052f25e89171307ab3e0b9503b8905ae6;hp=35142f196a39d5bcc69ae125018b95fe06a3e6b7;hpb=094e4ad1b97bd31f9e56192f0d2e365c251dc92e;p=deb_shairplay.git diff --git a/src/bindings/python/Shairplay.py b/src/bindings/python/Shairplay.py index 35142f1..04dbb37 100644 --- 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,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 @@ -68,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 = """ @@ -122,7 +136,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 +155,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 @@ -165,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 @@ -193,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)