hs-clientmanager: Store the appidClientContext directly

[apps/agl-service-homescreen.git] / src / hs-clientmanager.h

diff --git a/src/hs-clientmanager.h b/src/hs-clientmanager.h
index cb49088..96a15b9 100644 (file)
--- a/src/hs-clientmanager.h
+++ b/src/hs-clientmanager.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2018 TOYOTA MOTOR CORPORATION
+ * Copyright (C) 2020 Konsulko Group
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,21 +19,19 @@
 #define HOMESCREEN_CLIENTMANAGER_H
 
 #include <string>
-#include <vector>
 #include <mutex>
 #include <memory>
 #include <unordered_map>
 #include "hs-helper.h"
 #include "hs-client.h"
 
-typedef struct HS_ClientCtxt
-{
+struct HS_ClientCtxt {
     std::string id;
-    HS_ClientCtxt(const char *appid)
+    HS_ClientCtxt(const std::string &appid)
     {
         id = appid;
     }
-} HS_ClientCtxt;
+};
 
 
 class HS_ClientManager {
@@ -46,14 +45,12 @@ public:
 
     static HS_ClientManager* instance(void);
     int init(void);
-    HS_Client* find(std::string appid);
-    HS_Client* getClient(afb_req req, std::string appid);
-    std::vector<HS_Client*> getAllClient(void);
-    void removeClientCtxt(void *data);
+    int handleRequest(afb_req_t request, const char *verb, const char *appid = nullptr);
+    int pushEvent(const char *event, struct json_object *param, std::string appid = "");
+    void removeClientCtxt(void *data);  // don't use, internal only
 
-private:
-    HS_ClientCtxt* createClientCtxt(afb_req req, std::string appid);
-    HS_Client* addClient(afb_req req, std::string appid);
+    HS_ClientCtxt* createClientCtxt(afb_req_t req, std::string appid);
+    HS_Client* addClient(afb_req_t req, std::string appid);
     void removeClient(std::string appid);
 
 private:
@@ -63,4 +60,4 @@ private:
     std::mutex mtx;
 };
 
-#endif // HOMESCREEN_CLIENTMANAGER_H
\ No newline at end of file
+#endif // HOMESCREEN_CLIENTMANAGER_H