From 06a2777ce769346ba85aee9f38ccb237a2d72915 Mon Sep 17 00:00:00 2001
From: zheng_wenlong <wenlong_zheng@nexty-ele.com>
Date: Mon, 23 Oct 2017 14:42:50 +0900
Subject: Remove the redundant thread loop

    Because libhomescreen already has a thread to receive events,
    we can remove the thread loop in libhomescreen.
    Related Commit:
        https://gerrit.automotivelinux.org/gerrit/#/c/11403/

BUG-AGL: SPEC-989
Change-Id: I32d65efcf32f3395719837339659ff94b3e64889
Signed-off-by: zheng_wenlong <wenlong_zheng@nexty-ele.com>
---
 include/libhomescreen.hpp | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

(limited to 'include/libhomescreen.hpp')

diff --git a/include/libhomescreen.hpp b/include/libhomescreen.hpp
index 06e9ad8..5720368 100644
--- a/include/libhomescreen.hpp
+++ b/include/libhomescreen.hpp
@@ -35,26 +35,26 @@ public:
     LibHomeScreen();
     ~LibHomeScreen();
 
-		LibHomeScreen(const LibHomeScreen &) = delete;
-		LibHomeScreen &operator=(const LibHomeScreen &) = delete;
+    LibHomeScreen(const LibHomeScreen &) = delete;
+    LibHomeScreen &operator=(const LibHomeScreen &) = delete;
 
-		using handler_func = std::function<void(const char*)>;
+    using handler_func = std::function<void(const char*)>;
 
-		enum EventType {
-			Event_TapShortcut = 1,
-			Event_OnScreenMessage
-		};
+    enum EventType {
+        Event_TapShortcut = 1,
+        Event_OnScreenMessage
+    };
 
-		static const std::vector<std::string> api_list;
-		static const std::vector<std::string> event_list;
+    static const std::vector<std::string> api_list;
+    static const std::vector<std::string> event_list;
 
     /* Method */
-		int init(const int port, const std::string& token);
+    int init(const int port, const std::string& token);
 
-		int tapShortcut(const char* application_name);
-		int onScreenMessage(const char* display_message);
+    int tapShortcut(const char* application_name);
+    int onScreenMessage(const char* display_message);
 
-		void set_event_handler(enum EventType et, handler_func f);
+    void set_event_handler(enum EventType et, handler_func f);
 
     void registerCallback(
         void (*event_cb)(const std::string& event, struct json_object* event_contents),
@@ -68,8 +68,7 @@ public:
 
 private:
     int initialize_websocket();
-    int runEventloop();
-    
+
     void (*onEvent)(const std::string& event, struct json_object* event_contents);
     void (*onReply)(struct json_object* reply);
     void (*onHangup)(void);
@@ -82,7 +81,7 @@ private:
     int mport = 2000;
     std::string mtoken = "hs";
 
-		std::map<EventType, handler_func> handlers;
+    std::map<EventType, handler_func> handlers;
 
 public:
     /* Don't use/ Internal only */
-- 
cgit 1.2.3-korg