I have made the following changes intended for : CE:Apps / voicecall Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below.
https://build.pub.meego.com//request/show/8141 Thank You, tswindell [This message was auto-generated] --- Request # 8141: Messages from BOSS: State: review at 2013-02-20T13:36:07 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:tswindell:CE:Apps / voicecall -> CE:Apps / voicecall changes files: -------------- --- voicecall.changes +++ voicecall.changes @@ -0,0 +1,3 @@ +* Wed Feb 20 2013 Tom Swindell <[email protected]> - 0.4.0 +- Updated call handler interface API with isIncoming property + old: ---- voicecall-0.3.5.tar.gz new: ---- voicecall-0.4.0.tar.gz spec files: ----------- --- voicecall.spec +++ voicecall.spec @@ -1,6 +1,6 @@ Name: voicecall Summary: Voice Call Suite -Version: 0.3.5 +Version: 0.4.0 Release: 1 Group: Communications/Telephony and IM License: Apache License, Version 2.0 other changes: -------------- ++++++ voicecall-0.3.5.tar.gz -> voicecall-0.4.0.tar.gz --- lib/src/abstractvoicecallhandler.h +++ lib/src/abstractvoicecallhandler.h @@ -39,6 +39,7 @@ Q_PROPERTY(QString lineId READ lineId NOTIFY lineIdChanged) Q_PROPERTY(QDateTime startedAt READ startedAt NOTIFY startedAtChanged) Q_PROPERTY(int duration READ duration NOTIFY durationChanged) + Q_PROPERTY(bool isIncoming READ isIncoming) Q_PROPERTY(bool isEmergency READ isEmergency NOTIFY emergencyChanged) Q_PROPERTY(bool isMultiparty READ isMultiparty NOTIFY multipartyChanged) @@ -63,6 +64,7 @@ virtual QString lineId() const = 0; virtual QDateTime startedAt() const = 0; virtual int duration() const = 0; + virtual bool isIncoming() const = 0; virtual bool isMultiparty() const = 0; virtual bool isEmergency() const = 0; --- lib/src/dbus/voicecallhandlerdbusadapter.cpp +++ lib/src/dbus/voicecallhandlerdbusadapter.cpp @@ -117,6 +117,16 @@ } /*! + Returns this voice calls' incoming call flag property. +*/ +bool VoiceCallHandlerDBusAdapter::isIncoming() const +{ + TRACE + Q_D(const VoiceCallHandlerDBusAdapter); + return d->handler->isIncoming(); +} + +/*! Returns this voice calls' multiparty flag property. */ bool VoiceCallHandlerDBusAdapter::isMultiparty() const --- lib/src/dbus/voicecallhandlerdbusadapter.h +++ lib/src/dbus/voicecallhandlerdbusadapter.h @@ -38,6 +38,7 @@ Q_PROPERTY(QString lineId READ lineId NOTIFY lineIdChanged) Q_PROPERTY(QDateTime startedAt READ startedAt) Q_PROPERTY(int duration READ duration NOTIFY durationChanged) + Q_PROPERTY(bool isIncoming READ isIncoming) Q_PROPERTY(bool isEmergency READ isEmergency NOTIFY emergencyChanged) Q_PROPERTY(bool isMultiparty READ isMultiparty NOTIFY multipartyChanged) @@ -52,6 +53,7 @@ QString lineId() const; QDateTime startedAt() const; int duration() const; + bool isIncoming() const; bool isMultiparty() const; bool isEmergency() const; --- lib/src/src.pro +++ lib/src/src.pro @@ -4,7 +4,7 @@ QT = core dbus CONFIG += qdbus -DEFINES += WANT_TRACE +#DEFINES += WANT_TRACE HEADERS += \ common.h \ --- plugins/declarative/src/src.pro +++ plugins/declarative/src/src.pro @@ -6,7 +6,7 @@ TARGET = $$qtLibraryTarget($$TARGET) uri = stage.rubyx.voicecall -DEFINES += WANT_TRACE +#DEFINES += WANT_TRACE HEADERS += \ common.h \ --- plugins/declarative/src/voicecallhandler.cpp +++ plugins/declarative/src/voicecallhandler.cpp @@ -149,6 +149,16 @@ } /*! + Returns this voice calls' incoming call flag property. + */ +bool VoiceCallHandler::isIncoming() const +{ + TRACE + Q_D(const VoiceCallHandler); + return d->interface->property("isIncoming").toBool(); +} + +/*! Returns this voice calls' multiparty flag property. */ bool VoiceCallHandler::isMultiparty() const --- plugins/declarative/src/voicecallhandler.h +++ plugins/declarative/src/voicecallhandler.h @@ -19,6 +19,7 @@ Q_PROPERTY(QString lineId READ lineId NOTIFY lineIdChanged) Q_PROPERTY(QDateTime startedAt READ startedAt NOTIFY startedAtChanged) Q_PROPERTY(int duration READ duration NOTIFY durationChanged) + Q_PROPERTY(bool isIncoming READ isIncoming) Q_PROPERTY(bool isEmergency READ isEmergency NOTIFY emergencyChanged) Q_PROPERTY(bool isMultiparty READ isMultiparty NOTIFY multipartyChanged) @@ -44,6 +45,7 @@ QString lineId() const; QDateTime startedAt() const; int duration() const; + bool isIncoming() const; bool isMultiparty() const; bool isEmergency() const; --- plugins/declarative/src/voicecallmanager.cpp +++ plugins/declarative/src/voicecallmanager.cpp @@ -262,7 +262,7 @@ Q_D(VoiceCallManager); QString voiceCallId = d->interface->property("activeVoiceCall").toString(); - if(voiceCallId.isNull() || voiceCallId.isEmpty()) + if(d->voicecalls->rowCount(QModelIndex()) == 0 || voiceCallId.isNull() || voiceCallId.isEmpty()) { d->activeVoiceCall = NULL; } --- plugins/ngf/src/src.pro +++ plugins/ngf/src/src.pro @@ -9,7 +9,7 @@ DEFINES += PLUGIN_NAME=\\\"ngf-plugin\\\" DEFINES += PLUGIN_VERSION=\\\"0.0.0.1\\\" -DEFINES += WANT_TRACE +#DEFINES += WANT_TRACE INCLUDEPATH += ../../../lib/src LIBS += -L../../../lib/src -lvoicecall --- plugins/ofono/src/ofonovoicecallhandler.cpp +++ plugins/ofono/src/ofonovoicecallhandler.cpp @@ -112,6 +112,14 @@ return d->duration; } +//TODO: Fix me! +bool OfonoVoiceCallHandler::isIncoming() const +{ + TRACE + Q_D(const OfonoVoiceCallHandler); + return false; +} + bool OfonoVoiceCallHandler::isMultiparty() const { TRACE --- plugins/ofono/src/ofonovoicecallhandler.h +++ plugins/ofono/src/ofonovoicecallhandler.h @@ -43,6 +43,7 @@ QString lineId() const; QDateTime startedAt() const; int duration() const; + bool isIncoming() const; bool isMultiparty() const; bool isEmergency() const; --- plugins/ofono/src/src.pro +++ plugins/ofono/src/src.pro @@ -4,7 +4,7 @@ QT = core dbus CONFIG += plugin link_pkgconfig -DEFINES += WANT_TRACE +#DEFINES += WANT_TRACE INCLUDEPATH += ../../../lib/src LIBS += -L../../../lib/src -lvoicecall --- plugins/playback-manager/src/src.pro +++ plugins/playback-manager/src/src.pro @@ -7,7 +7,7 @@ DEFINES += PLUGIN_NAME=\\\"voicecall-playback-manager-plugin\\\" DEFINES += PLUGIN_VERSION=\\\"0.0.0.1\\\" -DEFINES += WANT_TRACE +#DEFINES += WANT_TRACE INCLUDEPATH += ../../../lib/src LIBS += -L../../../lib/src -lvoicecall --- plugins/pulseaudio/src/src.pro +++ plugins/pulseaudio/src/src.pro @@ -7,7 +7,7 @@ DEFINES += PLUGIN_NAME=\\\"voicecall-pulseaudio-plugin\\\" DEFINES += PLUGIN_VERSION=\\\"0.0.0.1\\\" -DEFINES += WANT_TRACE +#DEFINES += WANT_TRACE INCLUDEPATH += ../../../lib/src LIBS += -L../../../lib/src -lvoicecall --- plugins/resource-policy-routing/src/src.pro +++ plugins/resource-policy-routing/src/src.pro @@ -7,7 +7,7 @@ DEFINES += PLUGIN_NAME=\\\"resource-policy-routing-plugin\\\" DEFINES += PLUGIN_VERSION=\\\"0.0.0.1\\\" -DEFINES += WANT_TRACE +#DEFINES += WANT_TRACE INCLUDEPATH += ../../../lib/src LIBS += -L../../../lib/src -lvoicecall --- plugins/telepathy/src/src.pro +++ plugins/telepathy/src/src.pro @@ -9,7 +9,7 @@ PKGCONFIG += TelepathyQt4 TelepathyQt4Farstream -DEFINES += WANT_TRACE +#DEFINES += WANT_TRACE HEADERS += \ common.h \ --- plugins/telepathy/src/telepathyhandler.cpp +++ plugins/telepathy/src/telepathyhandler.cpp @@ -152,6 +152,13 @@ return d->duration; } +bool TelepathyHandler::isIncoming() const +{ + TRACE + Q_D(const TelepathyHandler); + return !d->channel->isRequested(); +} + bool TelepathyHandler::isMultiparty() const { TRACE @@ -293,7 +300,7 @@ else return; } - dtmfIface->StartTone(0, toneId, 50); + dtmfIface->StartTone(1, toneId, 0); //dtmfIface->MultipleTones(tones); } @@ -551,6 +558,15 @@ SIGNAL(streamStateChanged(Tp::StreamedMediaStreamPtr,Tp::MediaStreamState)), SLOT(onStreamedMediaChannelStreamStateChanged(Tp::StreamedMediaStreamPtr,Tp::MediaStreamState))); + if(d->channel->hasInterface(TP_QT_IFACE_CHANNEL_INTERFACE_CALL_STATE)) + { + DEBUG_T("Creating CallState interface"); + Tp::Client::ChannelInterfaceCallStateInterface *csIface = new Tp::Client::ChannelInterfaceCallStateInterface(d->channel.data(), this); + QObject::connect(csIface, + SIGNAL(CallStateChanged(uint,uint)), + SLOT(onStreamedMediaChannelCallStateChanged())); + } + if(d->channel->hasInterface(TP_QT_IFACE_CHANNEL_INTERFACE_GROUP)) { DEBUG_T("Creating Group interface"); @@ -672,6 +688,12 @@ emit this->invalidated("closed", "user"); } +void TelepathyHandler::onStreamedMediaChannelCallStateChanged() +{ + TRACE + Q_D(TelepathyHandler); +} + void TelepathyHandler::onStreamedMediaChannelGroupMembersChanged(QString message, Tp::UIntList added, Tp::UIntList removed, Tp::UIntList localPending, Tp::UIntList remotePending, uint actor, uint reason) { TRACE --- plugins/telepathy/src/telepathyhandler.h +++ plugins/telepathy/src/telepathyhandler.h @@ -42,6 +42,7 @@ QString lineId() const; QDateTime startedAt() const; int duration() const; + bool isIncoming() const; bool isMultiparty() const; bool isEmergency() const; @@ -82,6 +83,9 @@ void onStreamedMediaChannelAcceptCallFinished(Tp::PendingOperation *op); void onStreamedMediaChannelHangupCallFinished(Tp::PendingOperation *op); + // StreamedMediaChannel CallState Interface Handling + void onStreamedMediaChannelCallStateChanged(); + // StreamedMediaChannel Group Interface Handling void onStreamedMediaChannelGroupMembersChanged(QString message, Tp::UIntList added, Tp::UIntList removed, Tp::UIntList localPending, Tp::UIntList remotePending, uint actor, uint reason); --- src/audiocallpolicyproxy.cpp +++ src/audiocallpolicyproxy.cpp @@ -96,6 +96,13 @@ return d->subject->duration(); } +bool AudioCallPolicyProxy::isIncoming() const +{ + TRACE + Q_D(const AudioCallPolicyProxy); + return d->subject->isIncoming(); +} + bool AudioCallPolicyProxy::isMultiparty() const { TRACE --- src/audiocallpolicyproxy.h +++ src/audiocallpolicyproxy.h @@ -38,6 +38,7 @@ QString lineId() const; QDateTime startedAt() const; int duration() const; + bool isIncoming() const; bool isMultiparty() const; bool isEmergency() const; --- src/src.pro +++ src/src.pro @@ -5,7 +5,7 @@ QT = core dbus CONFIG += mobility link_pkgconfig -DEFINES += WANT_TRACE +#DEFINES += WANT_TRACE INCLUDEPATH += ../lib/src LIBS += -L../lib/src -lvoicecall --- ui/src/src.pro +++ ui/src/src.pro @@ -4,7 +4,7 @@ TEMPLATE = app QT = core network gui declarative -DEFINES += WANT_TRACE +#DEFINES += WANT_TRACE DEFINES += APPLICATION_NAME=\\\"voicecall-ui\\\" DEFINES += APPLICATION_VERSION=\\\"0.1.0\\\"
