X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2FShairplay.py;h=1396524c0852074ae01e244dc84366187855eb6d;hb=23ab90afeb29b103194a86d963be6f26af880d9c;hp=0add4be5f20a8987bea78147b47a6fb0363a9e76;hpb=c1b1e2c3963a5b51ed4a81b4c8e960cde4385d9f;p=deb_shairplay.git diff --git a/src/bindings/python/Shairplay.py b/src/bindings/python/Shairplay.py index 0add4be..1396524 100644 --- a/src/bindings/python/Shairplay.py +++ b/src/bindings/python/Shairplay.py @@ -28,26 +28,31 @@ import platform from ctypes import * -audio_init_prototype = CFUNCTYPE(py_object, c_void_p, c_int, c_int, c_int) -audio_set_volume_prototype = CFUNCTYPE(None, c_void_p, c_void_p, c_float) -audio_process_prototype = CFUNCTYPE(None, c_void_p, c_void_p, c_void_p, c_int) -audio_flush_prototype = CFUNCTYPE(None, c_void_p, c_void_p) -audio_destroy_prototype = CFUNCTYPE(None, c_void_p, c_void_p) +audio_init_prototype = CFUNCTYPE(py_object, c_void_p, c_int, c_int, c_int) +audio_process_prototype = CFUNCTYPE(None, c_void_p, c_void_p, c_void_p, c_int) +audio_destroy_prototype = CFUNCTYPE(None, c_void_p, c_void_p) + +audio_flush_prototype = CFUNCTYPE(None, c_void_p, c_void_p) +audio_set_volume_prototype = CFUNCTYPE(None, c_void_p, c_void_p, c_float) +audio_set_metadata_prototype = CFUNCTYPE(None, c_void_p, c_void_p, c_void_p, c_int) +audio_set_coverart_prototype = CFUNCTYPE(None, c_void_p, c_void_p, c_void_p, c_int) class RaopNativeCallbacks(Structure): - _fields_ = [("cls", py_object), - ("audio_init", audio_init_prototype), - ("audio_set_volume", audio_set_volume_prototype), - ("audio_process", audio_process_prototype), - ("audio_flush", audio_flush_prototype), - ("audio_destroy", audio_destroy_prototype)] + _fields_ = [("cls", py_object), + ("audio_init", audio_init_prototype), + ("audio_process", audio_process_prototype), + ("audio_destroy", audio_destroy_prototype), + ("audio_flush", audio_flush_prototype), + ("audio_set_volume", audio_set_volume_prototype), + ("audio_set_metadata", audio_set_metadata_prototype), + ("audio_set_coverart", audio_set_coverart_prototype)] 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 @@ -59,9 +64,11 @@ def InitShairplay(libshairplay): # Initialize raop related functions libshairplay.raop_init.restype = c_void_p - libshairplay.raop_init.argtypes = [POINTER(RaopNativeCallbacks), c_char_p] + libshairplay.raop_init.argtypes = [c_int, 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 @@ -119,16 +126,22 @@ class RaopCallbacks: def audio_init(self, bits, channels, samplerate): raise NotImplementedError() - def audio_set_volume(self, session, volume): - pass - def audio_process(self, session, buffer): raise NotImplementedError() + def audio_destroy(self, session): + raise NotImplementedError() + + def audio_set_volume(self, session, volume): + pass + def audio_flush(self, session): pass - def audio_destroy(self, session): + def audio_set_metadata(self, session, buffer): + pass + + def audio_set_coverart(self, session, buffer): pass class RaopService: @@ -137,27 +150,37 @@ class RaopService: self.sessions.append(session) return session - def audio_set_volume_cb(self, cls, sessionptr, volume): - session = cast(sessionptr, py_object).value - self.callbacks.audio_set_volume(session, volume) - def audio_process_cb(self, cls, sessionptr, buffer, buflen): session = cast(sessionptr, py_object).value strbuffer = string_at(buffer, buflen) self.callbacks.audio_process(session, strbuffer) - def audio_flush_cb(self, cls, sessionptr): - session = cast(sessionptr, py_object).value - self.callbacks.audio_flush(session) - 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 audio_flush_cb(self, cls, sessionptr): + session = cast(sessionptr, py_object).value + self.callbacks.audio_flush(session) + + def audio_set_volume_cb(self, cls, sessionptr, volume): + session = cast(sessionptr, py_object).value + self.callbacks.audio_set_volume(session, volume) + + def audio_set_metadata_cb(self, cls, sessionptr, buffer, buflen): + session = cast(sessionptr, py_object).value + strbuffer = string_at(buffer, buflen) + self.callbacks.audio_set_metadata(session, strbuffer) + + def audio_set_coverart_cb(self, cls, sessionptr, buffer, buflen): + session = cast(sessionptr, py_object).value + strbuffer = string_at(buffer, buflen) + self.callbacks.audio_set_coverart(session, strbuffer) + - def __init__(self, libshairplay, callbacks): + def __init__(self, libshairplay, max_clients, callbacks): self.libshairplay = libshairplay self.callbacks = callbacks self.sessions = [] @@ -166,13 +189,15 @@ class RaopService: # We need to hold a reference to native_callbacks self.native_callbacks = RaopNativeCallbacks() self.native_callbacks.audio_init = audio_init_prototype(self.audio_init_cb) - self.native_callbacks.audio_set_volume = audio_set_volume_prototype(self.audio_set_volume_cb) self.native_callbacks.audio_process = audio_process_prototype(self.audio_process_cb) - self.native_callbacks.audio_flush = audio_flush_prototype(self.audio_flush_cb) self.native_callbacks.audio_destroy = audio_destroy_prototype(self.audio_destroy_cb) + self.native_callbacks.audio_flush = audio_flush_prototype(self.audio_flush_cb) + self.native_callbacks.audio_set_volume = audio_set_volume_prototype(self.audio_set_volume_cb) + self.native_callbacks.audio_set_metadata = audio_set_metadata_prototype(self.audio_set_metadata_cb) + self.native_callbacks.audio_set_coverart = audio_set_coverart_prototype(self.audio_set_coverart_cb) # Initialize the raop instance with our callbacks - self.instance = self.libshairplay.raop_init(pointer(self.native_callbacks), RSA_KEY) + self.instance = self.libshairplay.raop_init(max_clients, pointer(self.native_callbacks), RSA_KEY) if self.instance == None: raise RuntimeError("Initializing library failed") @@ -181,11 +206,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 @@ -209,9 +240,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)