X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fbindings%2Fqt4%2Fraopservice.cpp;h=2250e2f286955bb8a96e585faaf16ced2def27e6;hb=d433e0453fd716468d4d13d7acdd6879d6dc4c94;hp=d570b4309630d9331249d5d31d46c57a15ed0f16;hpb=92fcb6ac601a2c034a3ab47209d80b5e137a376c;p=deb_shairplay.git

diff --git a/src/bindings/qt4/raopservice.cpp b/src/bindings/qt4/raopservice.cpp
index d570b43..2250e2f 100644
--- a/src/bindings/qt4/raopservice.cpp
+++ b/src/bindings/qt4/raopservice.cpp
@@ -1,3 +1,26 @@
+/**
+ * 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.
+ */
+
 #include "raopservice.h"
 #include "raopcallbackhandler.h"
 
@@ -49,7 +72,7 @@ audio_init_cb(void *cls, int bits, int channels, int samplerate)
      * outside Qt are not allowed (they have no eventloop) */
     audio_session->cb_handler = new RaopCallbackHandler();
     audio_session->cb_handler->moveToThread(audio_session->cb_thread);
-    audio_session->cb_handler->init((RaopCallbacks *)cls);
+    audio_session->cb_handler->init((RaopAudioHandler *)cls);
 
     QMetaObject::invokeMethod(audio_session->cb_handler, "audioInit",
                               Qt::BlockingQueuedConnection,
@@ -148,7 +171,7 @@ RaopService::~RaopService()
     raop_destroy(m_raop);
 }
 
-bool RaopService::init(int max_clients, RaopCallbacks *callbacks)
+bool RaopService::init(int max_clients, RaopAudioHandler *callbacks)
 {
     raop_callbacks_t raop_cbs;
 
@@ -161,13 +184,23 @@ bool RaopService::init(int max_clients, RaopCallbacks *callbacks)
     raop_cbs.audio_set_metadata = &audio_set_metadata_cb;
     raop_cbs.audio_set_coverart = &audio_set_coverart_cb;
 
-    m_raop = raop_init(max_clients, &raop_cbs, RSA_KEY);
+    m_raop = raop_init(max_clients, &raop_cbs, RSA_KEY, 0);
     if (!m_raop) {
         return false;
     }
     return true;
 }
 
+void RaopService::setLogLevel(int level)
+{
+    Q_UNUSED(level)
+}
+
+void RaopService::setLogHandler(RaopLogHandler *logger)
+{
+    Q_UNUSED(logger)
+}
+
 bool RaopService::isRunning()
 {
     return (raop_is_running(m_raop) != 0);
@@ -183,6 +216,7 @@ bool RaopService::start(quint16 port, const QByteArray & hwaddr)
     return true;
 }
 
+
 void RaopService::stop()
 {
     if (m_raop) {