aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2010-12-03 16:45:52 +0000
committerJeremy Lainé <jeremy.laine@m4x.org>2010-12-03 16:45:52 +0000
commit9ae5f2e3c9a36c7912d624b7f5041c468cea0918 (patch)
tree3ad739ee6ef736e7168f229467a3487c882f1658 /src
parent52b80d92b0749e9c01fa2c0c51ff46f7c5d04444 (diff)
downloadqxmpp-9ae5f2e3c9a36c7912d624b7f5041c468cea0918.tar.gz
fix ICE/RTP bindings
Diffstat (limited to 'src')
-rw-r--r--src/QXmppCallManager.cpp15
-rw-r--r--src/QXmppCallManager.h3
2 files changed, 13 insertions, 5 deletions
diff --git a/src/QXmppCallManager.cpp b/src/QXmppCallManager.cpp
index f0288847..5f8ff8eb 100644
--- a/src/QXmppCallManager.cpp
+++ b/src/QXmppCallManager.cpp
@@ -106,11 +106,15 @@ QXmppCall::QXmppCall(const QString &jid, QXmppCall::Direction direction, QObject
Q_ASSERT(check);
check = connect(d->connection, SIGNAL(datagramReceived(int,QByteArray)),
- this, SLOT(datagramReceived(int, QByteArray)));
+ this, SLOT(datagramReceived(int,QByteArray)));
Q_ASSERT(check);
// RTP channel
d->audioChannel = new QXmppRtpChannel(this);
+
+ check = connect(d->audioChannel, SIGNAL(sendDatagram(QByteArray)),
+ this, SLOT(sendDatagram(QByteArray)));
+ Q_ASSERT(check);
}
QXmppCall::~QXmppCall()
@@ -198,10 +202,13 @@ void QXmppCall::updateOpenMode()
void QXmppCall::datagramReceived(int component, const QByteArray &buffer)
{
- if (component != RTP_COMPONENT)
- return;
+ if (component == RTP_COMPONENT)
+ d->audioChannel->datagramReceived(buffer);
+}
- d->audioChannel->datagramReceived(buffer);
+void QXmppCall::sendDatagram(const QByteArray &buffer)
+{
+ d->connection->writeDatagram(RTP_COMPONENT, buffer);
}
/// Returns the call's session identifier.
diff --git a/src/QXmppCallManager.h b/src/QXmppCallManager.h
index 0fb489b2..46f681b2 100644
--- a/src/QXmppCallManager.h
+++ b/src/QXmppCallManager.h
@@ -106,9 +106,10 @@ public slots:
private slots:
void datagramReceived(int component, const QByteArray &datagram);
- void updateOpenMode();
+ void sendDatagram(const QByteArray &datagram);
void terminate();
void terminated();
+ void updateOpenMode();
private:
QXmppCall(const QString &jid, QXmppCall::Direction direction, QObject *parent);