mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-02-02 12:19:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update sdk to master

Browse source
This commit is contained in:
Julien Wadel 2024-02-16 12:02:15 +01:00
parent d8e2a366d0
commit b09c1aaed3
11 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci-files/job-macosx-desktop.yml
View file

@ -18,7 +18,7 @@
echo $DEFAULT_MACOS_CMAKE_OPTIONS
echo $CMAKE_OPTIONS
echo $ADDITIONAL_BUILD_OPTIONS
cmake .. -G "$CMAKE_GENERATOR" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DCMAKE_BUILD_TYPE=$CI_BUILD_TYPE $DEFAULT_MACOS_CMAKE_OPTIONS -DLINPHONE_BUILDER_SIGNING_IDENTITY="$MACOS_SIGNING_IDENTITY" $XCODE_OPTIONS $CMAKE_OPTIONS $SCHEDULE_CMAKE_OPTIONS $RELEASE_FILE
cmake .. -G "$CMAKE_GENERATOR" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_BUILD_TYPE=$CI_BUILD_TYPE $DEFAULT_MACOS_CMAKE_OPTIONS -DLINPHONE_BUILDER_SIGNING_IDENTITY="$MACOS_SIGNING_IDENTITY" $XCODE_OPTIONS $CMAKE_OPTIONS $SCHEDULE_CMAKE_OPTIONS $RELEASE_FILE
cmake --build . --target install --config $CI_BUILD_TYPE $LBC_NODEBUG_OPTIONS -- $ADDITIONAL_BUILD_OPTIONS
ccache -s

6
linphone-app/src/components/contact/ContactModel.cpp
View file

@ -21,7 +21,7 @@
#include <QQmlApplicationEngine>
#include "app/App.hpp"
#include "components/core/CoreManager.hpp"
#include "ContactModel.hpp"
#include "VcardModel.hpp"
@ -43,7 +43,7 @@ ContactModel::ContactModel (VcardModel *vcardModel, QObject * parent) : QObject(
Q_CHECK_PTR(vcardModel->mVcard);
Q_ASSERT(!vcardModel->mIsReadOnly);
mLinphoneFriend = linphone::Friend::newFromVcard(vcardModel->mVcard);
mLinphoneFriend = CoreManager::getInstance()->getCore()->createFriendFromVcard(vcardModel->mVcard);
mLinphoneFriend->setData("contact-model", *this);
if(mLinphoneFriend)
qInfo() << QStringLiteral("Create contact from vcard:") << this << vcardModel;
@ -233,4 +233,4 @@ bool ContactModel::hasCapability(const LinphoneEnums::FriendCapability& capabili
std::shared_ptr<linphone::Friend> ContactModel::getFriend() const{
return mLinphoneFriend;
}
}

4
linphone-app/src/components/core/CoreHandlers.cpp
View file

@ -185,11 +185,11 @@ void CoreHandlers::onChatRoomStateChanged(
void CoreHandlers::onConfiguringStatus(
const std::shared_ptr<linphone::Core> & core,
linphone::Config::ConfiguringState status,
linphone::ConfiguringState status,
const std::string & message){
Q_UNUSED(core)
emit setLastRemoteProvisioningState(status);
if(status == linphone::Config::ConfiguringState::Failed){
if(status == linphone::ConfiguringState::Failed){
qWarning() << "Remote provisioning has failed and was removed : "<< QString::fromStdString(message);
core->setProvisioningUri("");
}

4
linphone-app/src/components/core/CoreHandlers.hpp
View file

@ -58,7 +58,7 @@ signals:
void presenceStatusReceived(std::shared_ptr<linphone::Friend> contact);
void registrationStateChanged (const std::shared_ptr<linphone::Account> &account, linphone::RegistrationState state);
void ecCalibrationResult(linphone::EcCalibratorStatus status, int delayMs);
void setLastRemoteProvisioningState(const linphone::Config::ConfiguringState &state);
void setLastRemoteProvisioningState(const linphone::ConfiguringState &state);
void conferenceInfoReceived(const std::shared_ptr<const linphone::ConferenceInfo> & conferenceInfo);
void foundQRCode(const std::string & result);
@ -77,7 +77,7 @@ public slots:
void onCallCreated(const std::shared_ptr<linphone::Core> & lc,const std::shared_ptr<linphone::Call> & call);
void onChatRoomRead(const std::shared_ptr<linphone::Core> & core, const std::shared_ptr<linphone::ChatRoom> & chatRoom);
void onChatRoomStateChanged(const std::shared_ptr<linphone::Core> & core, const std::shared_ptr<linphone::ChatRoom> & chatRoom,linphone::ChatRoom::State state);
void onConfiguringStatus(const std::shared_ptr<linphone::Core> & core,linphone::Config::ConfiguringState status,const std::string & message);
void onConfiguringStatus(const std::shared_ptr<linphone::Core> & core,linphone::ConfiguringState status,const std::string & message);
void onDtmfReceived(const std::shared_ptr<linphone::Core> & lc,const std::shared_ptr<linphone::Call> & call,int dtmf);
void onGlobalStateChanged (const std::shared_ptr<linphone::Core> &core,linphone::GlobalState gstate,const std::string &message);
void onIsComposingReceived (const std::shared_ptr<linphone::Core> &core,const std::shared_ptr<linphone::ChatRoom> &room);

2
linphone-app/src/components/core/CoreListener.cpp
View file

@ -57,7 +57,7 @@ void CoreListener::onChatRoomRead(const std::shared_ptr<linphone::Core> & core,
void CoreListener::onChatRoomStateChanged(const std::shared_ptr<linphone::Core> & core, const std::shared_ptr<linphone::ChatRoom> & chatRoom,linphone::ChatRoom::State state){
emit chatRoomStateChanged(core, chatRoom,state);
}
void CoreListener::onConfiguringStatus(const std::shared_ptr<linphone::Core> & core,linphone::Config::ConfiguringState status,const std::string & message){
void CoreListener::onConfiguringStatus(const std::shared_ptr<linphone::Core> & core,linphone::ConfiguringState status,const std::string & message){
emit configuringStatus(core,status,message);
}
void CoreListener::onDtmfReceived(const std::shared_ptr<linphone::Core> & lc,const std::shared_ptr<linphone::Call> & call,int dtmf){

4
linphone-app/src/components/core/CoreListener.hpp
View file

@ -44,7 +44,7 @@ public:
virtual void onCallCreated(const std::shared_ptr<linphone::Core> & lc,const std::shared_ptr<linphone::Call> & call) override;
virtual void onChatRoomRead(const std::shared_ptr<linphone::Core> & core, const std::shared_ptr<linphone::ChatRoom> & chatRoom) override;
virtual void onChatRoomStateChanged(const std::shared_ptr<linphone::Core> & core, const std::shared_ptr<linphone::ChatRoom> & chatRoom,linphone::ChatRoom::State state) override;
virtual void onConfiguringStatus(const std::shared_ptr<linphone::Core> & core,linphone::Config::ConfiguringState status,const std::string & message) override;
virtual void onConfiguringStatus(const std::shared_ptr<linphone::Core> & core,linphone::ConfiguringState status,const std::string & message) override;
virtual void onDtmfReceived(const std::shared_ptr<linphone::Core> & lc,const std::shared_ptr<linphone::Call> & call,int dtmf) override;
virtual void onGlobalStateChanged (const std::shared_ptr<linphone::Core> &core,linphone::GlobalState gstate,const std::string &message) override;
virtual void onIsComposingReceived (const std::shared_ptr<linphone::Core> &core,const std::shared_ptr<linphone::ChatRoom> &room) override;
@ -72,7 +72,7 @@ signals:
void callCreated(const std::shared_ptr<linphone::Core> & lc,const std::shared_ptr<linphone::Call> & call);
void chatRoomRead(const std::shared_ptr<linphone::Core> & core, const std::shared_ptr<linphone::ChatRoom> & chatRoom);
void chatRoomStateChanged(const std::shared_ptr<linphone::Core> & core, const std::shared_ptr<linphone::ChatRoom> & chatRoom,linphone::ChatRoom::State state);
void configuringStatus(const std::shared_ptr<linphone::Core> & core,linphone::Config::ConfiguringState status,const std::string & message);
void configuringStatus(const std::shared_ptr<linphone::Core> & core,linphone::ConfiguringState status,const std::string & message);
void dtmfReceived(const std::shared_ptr<linphone::Core> & lc,const std::shared_ptr<linphone::Call> & call,int dtmf);
void globalStateChanged (const std::shared_ptr<linphone::Core> &core,linphone::GlobalState gstate,const std::string &message);
void isComposingReceived (const std::shared_ptr<linphone::Core> &core,const std::shared_ptr<linphone::ChatRoom> &room);

8
linphone-app/src/components/core/CoreManager.cpp
View file

@ -70,7 +70,7 @@ CoreManager::CoreManager (QObject *parent, const QString &configPath) :
QObject(parent) {
mHandlers = QSharedPointer<CoreHandlers>::create(this);
mCore = nullptr;
mLastRemoteProvisioningState = linphone::Config::ConfiguringState::Skipped;
mLastRemoteProvisioningState = linphone::ConfiguringState::Skipped;
CoreHandlers *coreHandlers = mHandlers.get();
QObject::connect(coreHandlers, &CoreHandlers::coreStarting, this, &CoreManager::startIterate, Qt::QueuedConnection);
QObject::connect(coreHandlers, &CoreHandlers::setLastRemoteProvisioningState, this, &CoreManager::setLastRemoteProvisioningState);
@ -462,14 +462,14 @@ QString CoreManager::getDownloadUrl () {
return Constants::DownloadUrl;
}
void CoreManager::setLastRemoteProvisioningState(const linphone::Config::ConfiguringState& state){
void CoreManager::setLastRemoteProvisioningState(const linphone::ConfiguringState& state){
mLastRemoteProvisioningState = state;
if (state == linphone::Config::ConfiguringState::Failed)
if (state == linphone::ConfiguringState::Failed)
emit remoteProvisioningFailed();
}
bool CoreManager::isLastRemoteProvisioningGood(){
return mLastRemoteProvisioningState != linphone::Config::ConfiguringState::Failed;
return mLastRemoteProvisioningState != linphone::ConfiguringState::Failed;
}
QString CoreManager::getUserAgent()const {

4
linphone-app/src/components/core/CoreManager.hpp
View file

@ -177,7 +177,7 @@ public slots:
void initCoreManager();
void startIterate();
void stopIterate();
void setLastRemoteProvisioningState(const linphone::Config::ConfiguringState& state);
void setLastRemoteProvisioningState(const linphone::ConfiguringState& state);
void createLinphoneCore (const QString &configPath);// In order to delay creation
void handleChatRoomCreated(const QSharedPointer<ChatRoomModel> &chatRoomModel);
@ -219,7 +219,7 @@ private:
QSharedPointer<CoreHandlers> mHandlers;
bool mStarted = false;
linphone::Config::ConfiguringState mLastRemoteProvisioningState;
linphone::ConfiguringState mLastRemoteProvisioningState;
CallsListModel *mCallsListModel = nullptr;
ContactsListModel *mContactsListModel = nullptr;

2
linphone-app/src/utils/LinphoneEnums.cpp
View file

@ -42,7 +42,7 @@ void LinphoneEnums::registerMetaTypes(){
qRegisterMetaType<std::shared_ptr<linphone::Call>>();
qRegisterMetaType<linphone::Call::State>();
qRegisterMetaType<std::shared_ptr<linphone::Core>>();
qRegisterMetaType<linphone::Config::ConfiguringState>();
qRegisterMetaType<linphone::ConfiguringState>();
qRegisterMetaType<std::string>();
qRegisterMetaType<linphone::GlobalState>();
qRegisterMetaType<std::shared_ptr<linphone::ChatRoom>>();

2
linphone-app/src/utils/LinphoneEnums.hpp
View file

@ -234,7 +234,7 @@ Q_DECLARE_METATYPE(LinphoneEnums::TransportType)
Q_DECLARE_METATYPE(std::shared_ptr<linphone::Call>)
Q_DECLARE_METATYPE(linphone::Call::State)
Q_DECLARE_METATYPE(std::shared_ptr<linphone::Core>)
Q_DECLARE_METATYPE(linphone::Config::ConfiguringState)
Q_DECLARE_METATYPE(linphone::ConfiguringState)
Q_DECLARE_METATYPE(std::string)
Q_DECLARE_METATYPE(linphone::GlobalState)
Q_DECLARE_METATYPE(std::shared_ptr<linphone::ChatRoom>)

2
linphone-sdk

@ -1 +1 @@
Subproject commit bf9106ee57b8a32aea2693f0fc69c2397a66d570
Subproject commit e310a060639474dd333239810d86d14db5f9c83d