repositories
/
deb_shairplay.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
402dfbb
)
Add log methods to Qt4 API, not implemented yet
author
Juho Vähä-Herttua
<juhovh@iki.fi>
Thu, 31 May 2012 19:01:41 +0000
(22:01 +0300)
committer
Juho Vähä-Herttua
<juhovh@iki.fi>
Thu, 31 May 2012 19:01:41 +0000
(22:01 +0300)
AirTV-Qt/audiocallbacks.cpp
patch
|
blob
|
blame
|
history
AirTV-Qt/audiocallbacks.h
patch
|
blob
|
blame
|
history
src/bindings/qt4/raopcallbackhandler.cpp
patch
|
blob
|
blame
|
history
src/bindings/qt4/raopcallbackhandler.h
patch
|
blob
|
blame
|
history
src/bindings/qt4/raopcallbacks.h
patch
|
blob
|
blame
|
history
src/bindings/qt4/raopservice.cpp
patch
|
blob
|
blame
|
history
src/bindings/qt4/raopservice.h
patch
|
blob
|
blame
|
history
diff --git
a/AirTV-Qt/audiocallbacks.cpp
b/AirTV-Qt/audiocallbacks.cpp
index 5a6d2a87e50e123dfc84c3b844046571e0da1be0..206b3481421992e412f5ca4da91a53e6927275d0 100644
(file)
--- a/
AirTV-Qt/audiocallbacks.cpp
+++ b/
AirTV-Qt/audiocallbacks.cpp
@@
-15,7
+15,7
@@
#include "audiocallbacks.h"
AudioCallbacks::AudioCallbacks(QObject *parent) :
#include "audiocallbacks.h"
AudioCallbacks::AudioCallbacks(QObject *parent) :
- Raop
Callbacks
(parent)
+ Raop
AudioHandler
(parent)
{
}
{
}
diff --git
a/AirTV-Qt/audiocallbacks.h
b/AirTV-Qt/audiocallbacks.h
index af1daea3809c82c96778c851e0df2f1ed1a556c4..aa5389a7bb2a7513dfcc2924510dd3d8019ecbc4 100644
(file)
--- a/
AirTV-Qt/audiocallbacks.h
+++ b/
AirTV-Qt/audiocallbacks.h
@@
-19,7
+19,7
@@
#include "audiooutput.h"
#include "audiooutput.h"
-class AudioCallbacks : public Raop
Callbacks
+class AudioCallbacks : public Raop
AudioHandler
{
Q_OBJECT
public:
{
Q_OBJECT
public:
diff --git
a/src/bindings/qt4/raopcallbackhandler.cpp
b/src/bindings/qt4/raopcallbackhandler.cpp
index 60a44a7879d1328f12ebdd5f2046de56632b9d3d..8e18053134a1c2e0e78bdc91e3094bb921248e61 100644
(file)
--- a/
src/bindings/qt4/raopcallbackhandler.cpp
+++ b/
src/bindings/qt4/raopcallbackhandler.cpp
@@
-28,7
+28,7
@@
RaopCallbackHandler::RaopCallbackHandler(QObject *parent) :
{
}
{
}
-void RaopCallbackHandler::init(Raop
Callbacks
*callbacks)
+void RaopCallbackHandler::init(Raop
AudioHandler
*callbacks)
{
m_callbacks = callbacks;
}
{
m_callbacks = callbacks;
}
diff --git
a/src/bindings/qt4/raopcallbackhandler.h
b/src/bindings/qt4/raopcallbackhandler.h
index 33c18704fe204abab298a5cbdbf6b6d952bd1276..8ba3918abac415fe8a5375fe579406fceedafe57 100644
(file)
--- a/
src/bindings/qt4/raopcallbackhandler.h
+++ b/
src/bindings/qt4/raopcallbackhandler.h
@@
-33,10
+33,10
@@
class RaopCallbackHandler : public QObject
Q_OBJECT
public:
explicit RaopCallbackHandler(QObject *parent = 0);
Q_OBJECT
public:
explicit RaopCallbackHandler(QObject *parent = 0);
- void init(Raop
Callbacks
*callbacks);
+ void init(Raop
AudioHandler
*callbacks);
private:
private:
- Raop
Callbacks
* m_callbacks;
+ Raop
AudioHandler
* m_callbacks;
signals:
signals:
diff --git
a/src/bindings/qt4/raopcallbacks.h
b/src/bindings/qt4/raopcallbacks.h
index 2c4bf9a2c06877b577652cfb014388ccf16e58f2..2ad71042247988a6b9ab0d9740db609107ed5ec0 100644
(file)
--- a/
src/bindings/qt4/raopcallbacks.h
+++ b/
src/bindings/qt4/raopcallbacks.h
@@
-26,11
+26,20
@@
#include <QObject>
#include <QObject>
-class Raop
Callbacks
: public QObject
+class Raop
LogHandler
: public QObject
{
Q_OBJECT
public:
{
Q_OBJECT
public:
- explicit RaopCallbacks(QObject *parent = 0) : QObject(parent) {}
+ explicit RaopLogHandler(QObject *parent = 0) : QObject(parent) {}
+
+ virtual void logCallback(int level, const char *msg) = 0;
+};
+
+class RaopAudioHandler : public QObject
+{
+ Q_OBJECT
+public:
+ explicit RaopAudioHandler(QObject *parent = 0) : QObject(parent) {}
virtual void *audioInit(int bits, int channels, int samplerate) = 0;
virtual void audioProcess(void *session, const QByteArray & buffer) = 0;
virtual void *audioInit(int bits, int channels, int samplerate) = 0;
virtual void audioProcess(void *session, const QByteArray & buffer) = 0;
@@
-40,11
+49,6
@@
public:
virtual void audioSetVolume(void *session, float volume) { Q_UNUSED(session) Q_UNUSED(volume) }
virtual void audioSetMetadata(void *session, const QByteArray & buffer) { Q_UNUSED(session) Q_UNUSED(buffer) }
virtual void audioSetCoverart(void *session, const QByteArray & buffer) { Q_UNUSED(session) Q_UNUSED(buffer) }
virtual void audioSetVolume(void *session, float volume) { Q_UNUSED(session) Q_UNUSED(volume) }
virtual void audioSetMetadata(void *session, const QByteArray & buffer) { Q_UNUSED(session) Q_UNUSED(buffer) }
virtual void audioSetCoverart(void *session, const QByteArray & buffer) { Q_UNUSED(session) Q_UNUSED(buffer) }
-
-signals:
-
-public slots:
-
};
#endif // RAOPCALLBACKS_H
};
#endif // RAOPCALLBACKS_H
diff --git
a/src/bindings/qt4/raopservice.cpp
b/src/bindings/qt4/raopservice.cpp
index f34008a8fe36c115c96b1ea8b6768c80b71881ac..2250e2f286955bb8a96e585faaf16ced2def27e6 100644
(file)
--- a/
src/bindings/qt4/raopservice.cpp
+++ b/
src/bindings/qt4/raopservice.cpp
@@
-72,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);
* 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((Raop
Callbacks
*)cls);
+ audio_session->cb_handler->init((Raop
AudioHandler
*)cls);
QMetaObject::invokeMethod(audio_session->cb_handler, "audioInit",
Qt::BlockingQueuedConnection,
QMetaObject::invokeMethod(audio_session->cb_handler, "audioInit",
Qt::BlockingQueuedConnection,
@@
-171,7
+171,7
@@
RaopService::~RaopService()
raop_destroy(m_raop);
}
raop_destroy(m_raop);
}
-bool RaopService::init(int max_clients, Raop
Callbacks
*callbacks)
+bool RaopService::init(int max_clients, Raop
AudioHandler
*callbacks)
{
raop_callbacks_t raop_cbs;
{
raop_callbacks_t raop_cbs;
@@
-191,6
+191,16
@@
bool RaopService::init(int max_clients, RaopCallbacks *callbacks)
return true;
}
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);
bool RaopService::isRunning()
{
return (raop_is_running(m_raop) != 0);
@@
-206,6
+216,7
@@
bool RaopService::start(quint16 port, const QByteArray & hwaddr)
return true;
}
return true;
}
+
void RaopService::stop()
{
if (m_raop) {
void RaopService::stop()
{
if (m_raop) {
diff --git
a/src/bindings/qt4/raopservice.h
b/src/bindings/qt4/raopservice.h
index 389e8366965866b89b03a13164d301eeb0914097..23ce1123c04300866026717fdfe8b37849c08a1b 100644
(file)
--- a/
src/bindings/qt4/raopservice.h
+++ b/
src/bindings/qt4/raopservice.h
@@
-37,7
+37,9
@@
public:
explicit RaopService(QObject *parent = 0);
~RaopService();
explicit RaopService(QObject *parent = 0);
~RaopService();
- bool init(int max_clients, RaopCallbacks *callbacks);
+ bool init(int max_clients, RaopAudioHandler *callbacks);
+ void setLogLevel(int level);
+ void setLogHandler(RaopLogHandler *logger);
bool start(quint16 port, const QByteArray & hwaddr);
bool isRunning();
void stop();
bool start(quint16 port, const QByteArray & hwaddr);
bool isRunning();
void stop();