From 64e54ca6cbe54ca9e00beb9da903ff88a7f41f63 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 20 Feb 2017 16:39:14 +0100 Subject: [PATCH] Do not use deprecated call methods. --- .../src/components/call/CallModel.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/linphone-desktop/src/components/call/CallModel.cpp b/linphone-desktop/src/components/call/CallModel.cpp index 8e5d7dfc1..5f728bb35 100644 --- a/linphone-desktop/src/components/call/CallModel.cpp +++ b/linphone-desktop/src/components/call/CallModel.cpp @@ -68,7 +68,7 @@ CallModel::CallModel (shared_ptr linphone_call) { !m_linphone_call->getCurrentParams()->videoEnabled() && m_linphone_call->getRemoteParams()->videoEnabled() ) { - CoreManager::getInstance()->getCore()->deferCallUpdate(m_linphone_call); + m_linphone_call->deferUpdate(); emit videoRequested(); } @@ -103,7 +103,7 @@ void CallModel::accept () { setRecordFile(params); App::getInstance()->getCallsWindow()->show(); - core->acceptCallWithParams(m_linphone_call, params); + m_linphone_call->acceptWithParams(params); } void CallModel::acceptWithVideo () { @@ -113,11 +113,11 @@ void CallModel::acceptWithVideo () { setRecordFile(params); App::getInstance()->getCallsWindow()->show(); - core->acceptCallWithParams(m_linphone_call, params); + m_linphone_call->acceptWithParams(params); } void CallModel::terminate () { - CoreManager::getInstance()->getCore()->terminateCall(m_linphone_call); + m_linphone_call->terminate(); } void CallModel::transfer () { @@ -129,11 +129,11 @@ void CallModel::acceptVideoRequest () { shared_ptr params = core->createCallParams(m_linphone_call); params->enableVideo(true); - core->acceptCallUpdate(m_linphone_call, params); + m_linphone_call->acceptUpdate(params); } void CallModel::rejectVideoRequest () { - CoreManager::getInstance()->getCore()->acceptCallUpdate(m_linphone_call, m_linphone_call->getCurrentParams()); + m_linphone_call->acceptUpdate(m_linphone_call->getCurrentParams()); } void CallModel::takeSnapshot () { @@ -257,13 +257,13 @@ void CallModel::setPausedByUser (bool status) { if (status) { if (!m_paused_by_user) - CoreManager::getInstance()->getCore()->pauseCall(m_linphone_call); + m_linphone_call->pause(); return; } if (m_paused_by_user) - CoreManager::getInstance()->getCore()->resumeCall(m_linphone_call); + m_linphone_call->resume(); } bool CallModel::getVideoEnabled () const { @@ -286,7 +286,7 @@ void CallModel::setVideoEnabled (bool status) { shared_ptr params = core->createCallParams(m_linphone_call); params->enableVideo(status); - core->updateCall(m_linphone_call, params); + m_linphone_call->update(params); } bool CallModel::getUpdating () const {