Code Review
/
apps
/
homescreen.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
ShortcutArea: use the launcher to verify if the app is running
[apps/homescreen.git]
/
homescreen
/
src
/
applicationlauncher.cpp
diff --git
a/homescreen/src/applicationlauncher.cpp
b/homescreen/src/applicationlauncher.cpp
index
5a1e2d6
..
917ecaf
100644
(file)
--- a/
homescreen/src/applicationlauncher.cpp
+++ b/
homescreen/src/applicationlauncher.cpp
@@
-18,13
+18,9
@@
#include "applicationlauncher.h"
#include "applicationlauncher.h"
-#include "afm_user_daemon_proxy.h"
-
#include "hmi-debug.h"
#include "hmi-debug.h"
-extern org::AGL::afm::user *afm_user_daemon_proxy;
-
-ApplicationLauncher::ApplicationLauncher(QObject *parent)
+ApplicationLauncher::ApplicationLauncher(const QString &conn_str, QObject *parent)
: QObject(parent)
, m_launching(false)
, m_timeout(new QTimer(this))
: QObject(parent)
, m_launching(false)
, m_timeout(new QTimer(this))
@@
-43,6
+39,12
@@
ApplicationLauncher::ApplicationLauncher(QObject *parent)
connect(this, &ApplicationLauncher::currentChanged, [&]() {
setLaunching(false);
});
connect(this, &ApplicationLauncher::currentChanged, [&]() {
setLaunching(false);
});
+
+ m_launching = false;
+ m_launcher = new Launcher(conn_str, parent);
+
+ if (m_launcher->setup_pws_connection() != 0)
+ HMI_DEBUG("HomeScreen","ApplicationLauncher failed to set-up connection to afm-system-daemon");
}
int ApplicationLauncher::launch(const QString &application)
}
int ApplicationLauncher::launch(const QString &application)
@@
-50,7
+52,10
@@
int ApplicationLauncher::launch(const QString &application)
int result = -1;
HMI_DEBUG("HomeScreen","ApplicationLauncher launch %s.", application.toStdString().c_str());
int result = -1;
HMI_DEBUG("HomeScreen","ApplicationLauncher launch %s.", application.toStdString().c_str());
- result = afm_user_daemon_proxy->start(application).value().toInt();
+ fprintf(stdout, "ApplicationLauncher::launch with %s\n", application.toStdString().c_str());
+ if (m_launcher->connection_is_set())
+ result = m_launcher->start(application);
+
HMI_DEBUG("HomeScreen","ApplicationLauncher pid: %d.", result);
if (result > 1) {
HMI_DEBUG("HomeScreen","ApplicationLauncher pid: %d.", result);
if (result > 1) {
@@
-60,6
+65,12
@@
int ApplicationLauncher::launch(const QString &application)
return result;
}
return result;
}
+bool ApplicationLauncher::is_running(const QString &application)
+{
+ if (m_launcher->connection_is_set())
+ return m_launcher->is_running(application);
+}
+
bool ApplicationLauncher::isLaunching() const
{
return m_launching;
bool ApplicationLauncher::isLaunching() const
{
return m_launching;