From 575a9d9d860f5417b0173ff6dc3ed41cfef0bbaf Mon Sep 17 00:00:00 2001 From: Jeremy Lainé Date: Fri, 14 Sep 2012 14:36:59 +0200 Subject: fix example --- .../example_4_callHandling.cpp | 174 +++++++++++++++++++++ .../example_4_callHandling.h | 50 ++++++ .../example_4_callHandling.pro | 5 +- examples/example_4_callHandling/main.cpp | 49 ------ examples/example_4_callHandling/xmppClient.cpp | 145 ----------------- examples/example_4_callHandling/xmppClient.h | 48 ------ 6 files changed, 226 insertions(+), 245 deletions(-) create mode 100644 examples/example_4_callHandling/example_4_callHandling.cpp create mode 100644 examples/example_4_callHandling/example_4_callHandling.h delete mode 100644 examples/example_4_callHandling/main.cpp delete mode 100644 examples/example_4_callHandling/xmppClient.cpp delete mode 100644 examples/example_4_callHandling/xmppClient.h (limited to 'examples/example_4_callHandling') diff --git a/examples/example_4_callHandling/example_4_callHandling.cpp b/examples/example_4_callHandling/example_4_callHandling.cpp new file mode 100644 index 00000000..b73c9caa --- /dev/null +++ b/examples/example_4_callHandling/example_4_callHandling.cpp @@ -0,0 +1,174 @@ +/* + * Copyright (C) 2008-2012 The QXmpp developers + * + * Authors: + * Ian Reinhart Geiser + * Jeremy Lainé + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + +#include +#include + +#include +#include +#include +#include + +#include "QXmppCallManager.h" +#include "QXmppJingleIq.h" +#include "QXmppRtpChannel.h" +#include "QXmppUtils.h" + +#include "example_4_callHandling.h" + +xmppClient::xmppClient(QObject *parent) + : QXmppClient(parent) +{ + // add QXmppCallManager extension + callManager = new QXmppCallManager; + addExtension(callManager); + + bool check = connect(this, SIGNAL(presenceReceived(QXmppPresence)), + this, SLOT(slotPresenceReceived(QXmppPresence))); + Q_ASSERT(check); + + check = connect(callManager, SIGNAL(callReceived(QXmppCall*)), + this, SLOT(slotCallReceived(QXmppCall*))); + Q_ASSERT(check); +} + +void xmppClient::setRecipient(const QString &recipient) +{ + m_recipient = recipient; +} + +/// The audio mode of a call changed. + +void xmppClient::slotAudioModeChanged(QIODevice::OpenMode mode) +{ + QXmppCall *call = qobject_cast(sender()); + Q_ASSERT(call); + QXmppRtpAudioChannel *channel = call->audioChannel(); + + // prepare audio format + QAudioFormat format; + format.setFrequency(channel->payloadType().clockrate()); + format.setChannels(channel->payloadType().channels()); + format.setSampleSize(16); + format.setCodec("audio/pcm"); + format.setByteOrder(QAudioFormat::LittleEndian); + format.setSampleType(QAudioFormat::SignedInt); + + // the size in bytes of the audio buffers to/from sound devices + // 160 ms seems to be the minimum to work consistently on Linux/Mac/Windows + const int bufferSize = (format.frequency() * format.channels() * (format.sampleSize() / 8) * 160) / 1000; + + if (mode & QIODevice::ReadOnly) { + // initialise audio output + QAudioOutput *audioOutput = new QAudioOutput(format, this); + audioOutput->setBufferSize(bufferSize); + audioOutput->start(channel); + } + + if (mode & QIODevice::WriteOnly) { + // initialise audio input + QAudioInput *audioInput = new QAudioInput(format, this); + audioInput->setBufferSize(bufferSize); + audioInput->start(channel); + } +} + + +/// A call was received. + +void xmppClient::slotCallReceived(QXmppCall *call) +{ + qDebug() << "Got call from:" << call->jid(); + + bool check; + check = connect(call, SIGNAL(stateChanged(QXmppCall::State)), + this, SLOT(slotCallStateChanged(QXmppCall::State))); + Q_ASSERT(check); + + check = connect(call, SIGNAL(audioModeChanged(QIODevice::OpenMode)), + this, SLOT(slotAudioModeChanged(QIODevice::OpenMode))); + Q_ASSERT(check); + + // accept call + call->accept(); +} + +/// A call changed state. + +void xmppClient::slotCallStateChanged(QXmppCall::State state) +{ + if (state == QXmppCall::ActiveState) + qDebug("Call active"); + else if (state == QXmppCall::DisconnectingState) + qDebug("Call disconnecting"); + else if (state == QXmppCall::FinishedState) + qDebug("Call finished"); +} + +/// A presence was received. + +void xmppClient::slotPresenceReceived(const QXmppPresence &presence) +{ + // if we don't have a recipient, or if the presence is not from the recipient, + // do nothing + if (m_recipient.isEmpty() || + QXmppUtils::jidToBareJid(presence.from()) != m_recipient || + presence.type() != QXmppPresence::Available) + return; + + // start the call and connect to the its signals + QXmppCall *call = callManager->call(presence.from()); + + bool check; + check = connect(call, SIGNAL(stateChanged(QXmppCall:State)), + this, SLOT(slotCallStateChanged(QXmppCall::State))); + Q_ASSERT(check); + + check = connect(call, SIGNAL(audioModeChanged(QIODevice::OpenMode)), + this, SLOT(slotAudioModeChanged(QIODevice::OpenMode))); + Q_ASSERT(check); +} + +int main(int argc, char *argv[]) +{ + QCoreApplication a(argc, argv); + + // we want one argument : "send" or "receive" + if (argc != 2 || (strcmp(argv[1], "send") && strcmp(argv[1], "receive"))) + { + fprintf(stderr, "Usage: %s send|receive\n", argv[0]); + return EXIT_FAILURE; + } + + xmppClient client; + client.logger()->setLoggingType(QXmppLogger::StdoutLogging); + if (!strcmp(argv[1], "send")) { + client.setRecipient("qxmpp.test2@qxmpp.org"); + client.connectToServer("qxmpp.test1@qxmpp.org", "qxmpp123"); + } else { + client.connectToServer("qxmpp.test2@qxmpp.org", "qxmpp456"); + } + + return a.exec(); +} diff --git a/examples/example_4_callHandling/example_4_callHandling.h b/examples/example_4_callHandling/example_4_callHandling.h new file mode 100644 index 00000000..788d932c --- /dev/null +++ b/examples/example_4_callHandling/example_4_callHandling.h @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2008-2012 The QXmpp developers + * + * Author: + * Ian Reinhart Geiser + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#ifndef XMPPCLIENT_H +#define XMPPCLIENT_H + +#include "QXmppCallManager.h" +#include "QXmppClient.h" + +class xmppClient : public QXmppClient +{ + Q_OBJECT + +public: + xmppClient(QObject *parent = 0); + void setRecipient(const QString &recipient); + +private slots: + void slotAudioModeChanged(QIODevice::OpenMode mode); + void slotCallReceived(QXmppCall *call); + void slotCallStateChanged(QXmppCall::State state); + void slotPresenceReceived(const QXmppPresence &presence); + +private: + QXmppCallManager *callManager; + QString m_recipient; +}; + +#endif // IBBCLIENT_H diff --git a/examples/example_4_callHandling/example_4_callHandling.pro b/examples/example_4_callHandling/example_4_callHandling.pro index 1da3b529..039455ef 100644 --- a/examples/example_4_callHandling/example_4_callHandling.pro +++ b/examples/example_4_callHandling/example_4_callHandling.pro @@ -5,10 +5,9 @@ MOBILITY += multimedia TARGET = example_4_callHandling -SOURCES += main.cpp \ - xmppClient.cpp +SOURCES += example_4_callHandling.cpp -HEADERS += xmppClient.h +HEADERS += example_4_callHandling.h # Symbian packaging rules symbian { diff --git a/examples/example_4_callHandling/main.cpp b/examples/example_4_callHandling/main.cpp deleted file mode 100644 index d1e4bfa5..00000000 --- a/examples/example_4_callHandling/main.cpp +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) 2008-2012 The QXmpp developers - * - * Author: - * Ian Reinhart Geiser - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - -#include -#include - -#include - -#include "QXmppLogger.h" -#include "xmppClient.h" - -int main(int argc, char *argv[]) -{ - QCoreApplication a(argc, argv); - - QXmppLogger::getLogger()->setLoggingType(QXmppLogger::StdoutLogging); - - // we want one argument : "send" or "receive" - if (argc != 2 || (strcmp(argv[1], "send") && strcmp(argv[1], "receive"))) - { - fprintf(stderr, "Usage: callClient send|receive\n"); - return EXIT_FAILURE; - } - const QString username = (!strcmp(argv[1], "send")) ? QLatin1String("qxmpp.test1") : QLatin1String("qxmpp.test2"); - - xmppClient client; - client.connectToServer(username + "@gmail.com", "qxmpp123"); - return a.exec(); -} diff --git a/examples/example_4_callHandling/xmppClient.cpp b/examples/example_4_callHandling/xmppClient.cpp deleted file mode 100644 index b49024ba..00000000 --- a/examples/example_4_callHandling/xmppClient.cpp +++ /dev/null @@ -1,145 +0,0 @@ -/* - * Copyright (C) 2008-2012 The QXmpp developers - * - * Authors: - * Ian Reinhart Geiser - * Jeremy Lainé - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - -#include -#include -#include - -#include "QXmppCallManager.h" -#include "QXmppJingleIq.h" -#include "QXmppRtpChannel.h" -#include "QXmppUtils.h" - -#include "xmppClient.h" - -xmppClient::xmppClient(QObject *parent) - : QXmppClient(parent) -{ - // add QXmppCallManager extension - callManager = new QXmppCallManager; - addExtension(callManager); - - bool check = connect(this, SIGNAL(presenceReceived(QXmppPresence)), - this, SLOT(slotPresenceReceived(QXmppPresence))); - Q_ASSERT(check); - - check = connect(callManager, SIGNAL(callReceived(QXmppCall*)), - this, SLOT(slotCallReceived(QXmppCall*))); - Q_ASSERT(check); -} - -/// The audio mode of a call changed. - -void xmppClient::slotAudioModeChanged(QIODevice::OpenMode mode) -{ - QXmppCall *call = qobject_cast(sender()); - Q_ASSERT(call); - QXmppRtpAudioChannel *channel = call->audioChannel(); - - // prepare audio format - QAudioFormat format; - format.setFrequency(channel->payloadType().clockrate()); - format.setChannels(channel->payloadType().channels()); - format.setSampleSize(16); - format.setCodec("audio/pcm"); - format.setByteOrder(QAudioFormat::LittleEndian); - format.setSampleType(QAudioFormat::SignedInt); - - // the size in bytes of the audio buffers to/from sound devices - // 160 ms seems to be the minimum to work consistently on Linux/Mac/Windows - const int bufferSize = (format.frequency() * format.channels() * (format.sampleSize() / 8) * 160) / 1000; - - if (mode & QIODevice::ReadOnly) { - // initialise audio output - QAudioOutput *audioOutput = new QAudioOutput(format, this); - audioOutput->setBufferSize(bufferSize); - audioOutput->start(channel); - } - - if (mode & QIODevice::WriteOnly) { - // initialise audio input - QAudioInput *audioInput = new QAudioInput(format, this); - audioInput->setBufferSize(bufferSize); - audioInput->start(channel); - } -} - - -/// A call was received. - -void xmppClient::slotCallReceived(QXmppCall *call) -{ - qDebug() << "Got call from:" << call->jid(); - - bool check; - check = connect(call, SIGNAL(stateChanged(QXmppCall::State)), - this, SLOT(slotCallStateChanged(QXmppCall::State))); - Q_ASSERT(check); - - check = connect(call, SIGNAL(audioModeChanged(QIODevice::OpenMode)), - this, SLOT(slotAudioModeChanged(QIODevice::OpenMode))); - Q_ASSERT(check); - - // accept call - call->accept(); -} - -/// A call changed state. - -void xmppClient::slotCallStateChanged(QXmppCall::State state) -{ - if (state == QXmppCall::ActiveState) - qDebug("Call active"); - else if (state == QXmppCall::DisconnectingState) - qDebug("Call disconnecting"); - else if (state == QXmppCall::FinishedState) - qDebug("Call finished"); -} - -/// A presence was received. - -void xmppClient::slotPresenceReceived(const QXmppPresence &presence) -{ - const QLatin1String recipient("qxmpp.test2@gmail.com"); - - // if we are the recipient, or if the presence is not from the recipient, - // do nothing - if (jidToBareJid(configuration().jid()) == recipient || - jidToBareJid(presence.from()) != recipient || - presence.type() != QXmppPresence::Available) - return; - - // start the call and connect to the its signals - QXmppCall *call = callManager->call(presence.from()); - - bool check; - check = connect(call, SIGNAL(stateChanged(QXmppCall:State)), - this, SLOT(slotCallStateChanged(QXmppCall::State))); - Q_ASSERT(check); - - check = connect(call, SIGNAL(audioModeChanged(QIODevice::OpenMode)), - this, SLOT(slotAudioModeChanged(QIODevice::OpenMode))); - Q_ASSERT(check); -} - diff --git a/examples/example_4_callHandling/xmppClient.h b/examples/example_4_callHandling/xmppClient.h deleted file mode 100644 index b65816c4..00000000 --- a/examples/example_4_callHandling/xmppClient.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2008-2012 The QXmpp developers - * - * Author: - * Ian Reinhart Geiser - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#ifndef XMPPCLIENT_H -#define XMPPCLIENT_H - -#include "QXmppCallManager.h" -#include "QXmppClient.h" - -class xmppClient : public QXmppClient -{ - Q_OBJECT - -public: - xmppClient(QObject *parent = 0); - -private slots: - void slotAudioModeChanged(QIODevice::OpenMode mode); - void slotCallReceived(QXmppCall *call); - void slotCallStateChanged(QXmppCall::State state); - void slotPresenceReceived(const QXmppPresence &presence); - -private: - QXmppCallManager *callManager; -}; - -#endif // IBBCLIENT_H -- cgit v1.2.3