repositories
/
deb_shairplay.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c1b1e2c
)
Update AirTV-Qt project to work with the latest library version.
author
Juho Vähä-Herttua
<juhovh@iki.fi>
Tue, 20 Mar 2012 15:10:08 +0000
(17:10 +0200)
committer
Juho Vähä-Herttua
<juhovh@iki.fi>
Wed, 16 May 2012 21:33:32 +0000
(
00:33
+0300)
AirTV-Qt/raopservice.cpp
patch
|
blob
|
blame
|
history
diff --git
a/AirTV-Qt/raopservice.cpp
b/AirTV-Qt/raopservice.cpp
index 19ba624c480438311c92b99849b891e64ee02c3e..8332f5cf0b607ce076370907556ce34d49e50466 100644
(file)
--- a/
AirTV-Qt/raopservice.cpp
+++ b/
AirTV-Qt/raopservice.cpp
@@
-17,14
+17,16
@@
#include <QDebug>
#include <QFile>
#include <QDebug>
#include <QFile>
-static void
-audio_init(void *cls,
void **session,
int bits, int channels, int samplerate)
+static void
*
+audio_init(void *cls, int bits, int channels, int samplerate)
{
{
+ void *session;
QMetaObject::invokeMethod((QObject*)cls, "audioInit", Qt::BlockingQueuedConnection,
QMetaObject::invokeMethod((QObject*)cls, "audioInit", Qt::BlockingQueuedConnection,
- Q_ARG(void*, (void*)session),
+ Q_ARG(void*, (void*)
&
session),
Q_ARG(int, bits),
Q_ARG(int, channels),
Q_ARG(int, samplerate));
Q_ARG(int, bits),
Q_ARG(int, channels),
Q_ARG(int, samplerate));
+ return session;
}
static void
}
static void
@@
-79,8
+81,6
@@
RaopService::~RaopService()
bool RaopService::init()
{
bool RaopService::init()
{
- const char hwaddr[] = { 0x48, 0x5d, 0x60, 0x7c, 0xee, 0x22 };
-
raop_callbacks_t raop_cbs;
int error;
raop_callbacks_t raop_cbs;
int error;
@@
-112,7
+112,7
@@
bool RaopService::init()
return false;
}
return false;
}
- m_dnssd = dnssd_init(
hwaddr, sizeof(hwaddr),
&error);
+ m_dnssd = dnssd_init(&error);
if (!m_dnssd) {
raop_destroy(m_raop);
m_raop = NULL;
if (!m_dnssd) {
raop_destroy(m_raop);
m_raop = NULL;
@@
-136,7
+136,7
@@
bool RaopService::start(const QString & name, quint16 port)
m_thread.wait();
return false;
}
m_thread.wait();
return false;
}
- if (dnssd_register_raop(m_dnssd, name.toUtf8(), port) < 0) {
+ if (dnssd_register_raop(m_dnssd, name.toUtf8(), port
, hwaddr, sizeof(hwaddr)
) < 0) {
raop_stop(m_raop);
m_thread.quit();
m_thread.wait();
raop_stop(m_raop);
m_thread.quit();
m_thread.wait();