* limitations under the License.
*/
+#include "afm_user_daemon_proxy.h"
#include "homescreencontrolinterface.h"
+extern org::AGL::afm::user *afm_user_daemon_proxy;
+
HomeScreenControlInterface::HomeScreenControlInterface(QObject *parent) :
QObject(parent),
- mp_homeScreenAdaptor(0),
- mp_dBusAppFrameworkProxy()
+ mp_homeScreenAdaptor(0)
{
// publish dbus homescreen interface
mp_homeScreenAdaptor = new HomescreenAdaptor((QObject*)this);
+
QDBusConnection dbus = QDBusConnection::sessionBus();
dbus.registerObject("/HomeScreen", this);
dbus.registerService("org.agl.homescreen");
-
- qDebug("D-Bus: connect to org.agl.homescreenappframeworkbindertizen /AppFramework");
- mp_dBusAppFrameworkProxy = new org::agl::appframework("org.agl.homescreenappframeworkbindertizen",
- "/AppFramework",
- QDBusConnection::sessionBus(),
- 0);
-}
-
-HomeScreenControlInterface::~HomeScreenControlInterface()
-{
- delete mp_dBusAppFrameworkProxy;
- delete mp_homeScreenAdaptor;
}
QList<int> HomeScreenControlInterface::getAllSurfacesOfProcess(int pid)
{
case InputEvent::HARDKEY_NAV:
qDebug("hardKeyPressed NAV key pressed!");
- pid = mp_dBusAppFrameworkProxy->launchApp("navigation@0.1");
+ pid = afm_user_daemon_proxy->start("navigation@0.1").value().toInt();
qDebug("pid: %d", pid);
emit newRequestsToBeVisibleApp(pid);
break;
case InputEvent::HARDKEY_MEDIA:
qDebug("hardKeyPressed MEDIA key pressed!");
- pid = mp_dBusAppFrameworkProxy->launchApp("media@0.1");
+ pid = afm_user_daemon_proxy->start("media@0.1").value().toInt();
qDebug("pid: %d", pid);
emit newRequestsToBeVisibleApp(pid);
break;
#include <QObject>
#include "include/homescreen.hpp"
#include "homescreen_adaptor.h"
-#include <include/appframework.hpp>
-#include <appframework_proxy.h>
class HomeScreenControlInterface : public QObject
{
Q_OBJECT
public:
explicit HomeScreenControlInterface(QObject *parent = 0);
- ~HomeScreenControlInterface();
signals:
void newRequestsToBeVisibleApp(int pid);
void renderSurfaceToArea(int surfaceId, int layoutArea);
bool renderAppToAreaAllowed(int appCategory, int layoutArea);
void requestSurfaceIdToFullScreen(int surfaceId);
+
private:
HomescreenAdaptor *mp_homeScreenAdaptor;
- org::agl::appframework *mp_dBusAppFrameworkProxy;
};
#endif // HOMESCREENCONTROLINTERFACE_H