← Back to branch summary

~mterry/telephony-service/start-on

~mterry/telephony-service/start-on

« back to all changes in this revision

Viewing changes to handler/callhandler.h

Committer: CI bot
Author(s): Gustavo Pichorim Boiko
Date: 2014-04-02 12:41:29 UTC
mfrom: (765.2.24 telephony-service-conf_call)
Revision ID: ps-jenkins@lists.canonical.com-20140402124129-oywt8u6u9f4253bg

Add support for handling conference calls.

files added:
handler/tests/mock/conferencecallchannel.cpp

handler/tests/mock/conferencecallchannel.h

handler/tests/mock/speakeriface.cpp

handler/tests/mock/speakeriface.h

files modified:
handler/Handler.xml

handler/TelephonyServiceHandler.client

handler/callhandler.cpp

handler/callhandler.h

handler/handler.cpp

handler/handlerdbus.cpp

handler/handlerdbus.h

handler/tests/HandlerTest.cpp

handler/tests/handlercontroller.cpp

handler/tests/handlercontroller.h

handler/tests/mock/CMakeLists.txt

handler/tests/mock/MockConnection.xml

handler/tests/mock/callchannel.cpp

handler/tests/mock/callchannel.h

handler/tests/mock/connection.cpp

handler/tests/mock/connection.h

handler/tests/mock/mockconnectiondbus.cpp

handler/tests/mock/mockconnectiondbus.h

handler/tests/mockcontroller.cpp

handler/tests/mockcontroller.h

libtelephonyservice/callentry.cpp

libtelephonyservice/callentry.h

libtelephonyservice/callmanager.cpp

libtelephonyservice/callmanager.h

libtelephonyservice/channelobserver.cpp

libtelephonyservice/telepathyhelper.cpp

libtelephonyservice/telepathyhelper.h

Show diffs side-by-side

added added

removed removed

handler/callhandler.h

47

47

void setSpeakerMode(const QString &objectPath, bool enabled);

48

48

void sendDTMF(const QString &objectPath, const QString &key);

49

49

50

// conference call related

51

void createConferenceCall(const QStringList &objectPaths);

52

void mergeCall(const QString &conferenceObjectPath, const QString &callObjectPath);

53

void splitCall(const QString &objectPath);

54

50

55

Q_SIGNALS:

51

56

void callPropertiesChanged(const QString &objectPath, const QVariantMap &properties);

52

57

Older »