hs-proxy: Hand over the hs_instance to AfmMainProxy

[apps/agl-service-homescreen.git] / src / homescreen.cpp

diff --git a/src/homescreen.cpp b/src/homescreen.cpp
index 31c79f8..65c0064 100644 (file)
--- a/src/homescreen.cpp
+++ b/src/homescreen.cpp
@@ -17,14 +17,8 @@
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
-#include <memory>
-#include <algorithm>
-#include <unordered_map>
-#include <list>
-#include "hs-helper.h"
-#include "hs-clientmanager.h"
-#include "hs-appinfo.h"
 
+#include "homescreen.h"
 
 const char _error[] = "error";
 const char _application_id[] = "application_id";
@@ -33,18 +27,6 @@ const char _reply_message[] = "reply_message";
 const char _keyData[] = "data";
 const char _keyId[] = "id";
 
-struct hs_instance {
-  HS_ClientManager *client_manager;   // the connection session manager
-  HS_AppInfo *app_info;               // application info
-
-  hs_instance() : client_manager(HS_ClientManager::instance()), app_info(HS_AppInfo::instance()) {}
-  int init(afb_api_t api);
-  void setEventHook(const char *event, const event_hook_func f);
-  void onEvent(afb_api_t api, const char *event, struct json_object *object);
-private:
-  std::unordered_map<std::string, std::list<event_hook_func>> event_hook_list;
-};
-
 /**
  * init function
  *
@@ -181,7 +163,7 @@ static void tap_shortcut (afb_req_t request)
         if(ret == AFB_REQ_NOT_STARTED_APPLICATION) {
             std::string id = g_hs_instance->app_info->getAppProperty(value, _keyId);
             HS_AfmMainProxy afm_proxy;
-            afm_proxy.start(request, id);
+            afm_proxy.start(g_hs_instance, request, id);
             ret = 0;
         }
     }
@@ -333,7 +315,7 @@ static void showWindow(afb_req_t request)
         if(ret == AFB_REQ_NOT_STARTED_APPLICATION) {
             std::string id = g_hs_instance->app_info->getAppProperty(value, _keyId);
             HS_AfmMainProxy afm_proxy;
-            afm_proxy.start(request, id);
+            afm_proxy.start(g_hs_instance, request, id);
             ret = 0;
         }
     }