mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-05-07 14:44:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

feat(src/app/App): display app only when core is started (so after creation)

Browse source
This commit is contained in:
Ronan Abhamon 2017-05-10 11:55:42 +02:00
parent a1066c362c
commit ae7f10ca80
5 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
linphone-desktop/src/app/App.cpp
View file

@ -114,7 +114,7 @@ inline QQuickWindow *createSubWindow (App *app, const char *path) {
inline void activeSplashScreen (App *app) {
QQuickWindow *splashScreen = createSubWindow(app, QML_VIEW_SPLASH_SCREEN);
QObject::connect(CoreManager::getInstance(), &CoreManager::linphoneCoreCreated, splashScreen, [splashScreen] {
QObject::connect(CoreManager::getInstance()->getHandlers().get(), &CoreHandlers::coreStarted, splashScreen, [splashScreen] {
splashScreen->close();
splashScreen->deleteLater();
});
@ -179,8 +179,8 @@ void App::initContentApp () {
activeSplashScreen(this);
QObject::connect(
CoreManager::getInstance(),
&CoreManager::linphoneCoreCreated,
CoreManager::getInstance()->getHandlers().get(),
&CoreHandlers::coreStarted,
this, mParser.isSet("selftest") ? &App::quit : &App::openAppAfterInit
);
}
@ -441,7 +441,6 @@ void App::openAppAfterInit () {
tryToUsePreferredLocale();
qInfo() << QStringLiteral("Linphone core created.");
CoreManager::getInstance()->enableHandlers();
#ifndef __APPLE__
// Enable TrayIconSystem.

9
linphone-desktop/src/components/core/CoreHandlers.cpp
View file

@ -52,6 +52,15 @@ void CoreHandlers::onCallStateChanged (
App::getInstance()->getNotifier()->notifyReceivedCall(call);
}
void CoreHandlers::onGlobalStateChanged (
const shared_ptr<linphone::Core> &,
linphone::GlobalState gstate,
const string &
) {
if (gstate == linphone::GlobalStateOn)
emit coreStarted ();
}
void CoreHandlers::onCallStatsUpdated (
const shared_ptr<linphone::Core> &,
const shared_ptr<linphone::Call> &call,

7
linphone-desktop/src/components/core/CoreHandlers.hpp
View file

@ -36,6 +36,7 @@ class CoreHandlers :
signals:
void authenticationRequested (const std::shared_ptr<linphone::AuthInfo> &authInfo);
void callStateChanged (const std::shared_ptr<linphone::Call> &call, linphone::CallState state);
void coreStarted ();
void messageReceived (const std::shared_ptr<linphone::ChatMessage> &message);
void presenceReceived (const QString &sipAddress, const std::shared_ptr<const linphone::PresenceModel> &presenceModel);
void registrationStateChanged (const std::shared_ptr<linphone::ProxyConfig> &proxyConfig, linphone::RegistrationState state);
@ -54,6 +55,12 @@ private:
const std::string &message
) override;
void onGlobalStateChanged (
const std::shared_ptr<linphone::Core> &core,
linphone::GlobalState gstate,
const std::string &message
) override;
void onCallStatsUpdated (
const std::shared_ptr<linphone::Core> &core,
const std::shared_ptr<linphone::Call> &call,

6
linphone-desktop/src/components/core/CoreManager.cpp
View file

@ -48,6 +48,8 @@ CoreManager::CoreManager (QObject *parent, const QString &configPath) : QObject(
mInstance->mSettingsModel = new SettingsModel(mInstance);
mInstance->mAccountSettingsModel = new AccountSettingsModel(mInstance);
mInstance->mCbsTimer->start();
emit mInstance->linphoneCoreCreated();
}
);
@ -55,10 +57,6 @@ CoreManager::CoreManager (QObject *parent, const QString &configPath) : QObject(
mPromiseWatcher.setFuture(mPromiseBuild);
}
void CoreManager::enableHandlers () {
mCbsTimer->start();
}
// -----------------------------------------------------------------------------
void CoreManager::init (QObject *parent, const QString &configPath) {

2
linphone-desktop/src/components/core/CoreManager.hpp
View file

@ -47,8 +47,6 @@ class CoreManager : public QObject {
public:
~CoreManager () = default;
void enableHandlers ();
std::shared_ptr<linphone::Core> getCore () {
return mCore;
}