marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-07-26 14:24:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[dialer] Implement hanging up in CallManager

Browse source
This commit is contained in:
Martin Klapetek 2015-06-19 01:25:44 +02:00
parent cf00cb85f3
commit bba2650087
2 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
dialer/src/call-manager.cpp
View file

@ -42,6 +42,14 @@ CallManager::CallManager(const Tp::CallChannelPtr &callChannel, DialerUtils *dia
connect(callChannel.data(), SIGNAL(callStateChanged(Tp::CallState)), connect(callChannel.data(), SIGNAL(callStateChanged(Tp::CallState)),
SLOT(onCallStateChanged(Tp::CallState))); SLOT(onCallStateChanged(Tp::CallState)));
connect(d->dialerUtils, &DialerUtils::acceptCall, this, &CallManager::onCallAccepted);
connect(d->dialerUtils, &DialerUtils::rejectCall, this, &CallManager::onCallRejected);
connect(d->dialerUtils, &DialerUtils::hangUp, this, &CallManager::onHangUpRequested);
connect(d->callChannel.data(), &Tp::CallChannel::invalidated, this, [=]() {
qDebug() << "Channel invalidated";
d->dialerUtils->setCallState("idle");
});
//create the channel handler //create the channel handler
// d->channelHandler = new CallChannelHandler(callChannel, this); // d->channelHandler = new CallChannelHandler(callChannel, this);
@ -96,8 +104,7 @@ void CallManager::onCallStateChanged(Tp::CallState state)
// d->callWindow.data()->setStatus(CallWindow::StatusRemoteRinging); // d->callWindow.data()->setStatus(CallWindow::StatusRemoteRinging);
} else { } else {
d->dialerUtils->setCallState("incoming"); d->dialerUtils->setCallState("incoming");
connect(d->dialerUtils, &DialerUtils::acceptCall, this, &CallManager::onCallAccepted);
connect(d->dialerUtils, &DialerUtils::rejectCall, this, &CallManager::onCallRejected);
//show approver; //show approver;
(void) d->callChannel->setRinging(); (void) d->callChannel->setRinging();
} }
@ -162,6 +169,20 @@ void CallManager::onCallRejected()
(void) d->callChannel->hangup(Tp::CallStateChangeReasonRejected, TP_QT_ERROR_REJECTED); (void) d->callChannel->hangup(Tp::CallStateChangeReasonRejected, TP_QT_ERROR_REJECTED);
} }
void CallManager::onHangUpRequested()
{
if (d->callChannel && d->callChannel->isValid()) {
qDebug() << "Hanging up";
Tp::PendingOperation *op = d->callChannel->hangup();
connect(op, &Tp::PendingOperation::finished, [=]() {
if (op->isError()) {
qWarning() << "Unable to hang up:" << op->errorMessage();
}
// d->callChannel->requestClose();
});
}
}
void CallManager::ensureCallWindow() void CallManager::ensureCallWindow()
{ {
// if (!d->callWindow) { // if (!d->callWindow) {

1
dialer/src/call-manager.h
View file

@ -33,6 +33,7 @@ private Q_SLOTS:
void onCallStateChanged(Tp::CallState state); void onCallStateChanged(Tp::CallState state);
void onCallAccepted(); void onCallAccepted();
void onCallRejected(); void onCallRejected();
void onHangUpRequested();
private: private:
void ensureCallWindow(); void ensureCallWindow();