Move global variable to PolicyManager member

[apps/agl-service-windowmanager.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index d7d731f..f7ec927 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -40,10 +40,10 @@ typedef struct wmClientCtxt{
 
 struct afb_instance {
    std::unique_ptr<wl::display> display;
-   wm::LowCanClient lcc_;
+   wm::LowCanClient lcc;
    wm::App app;
 
-   afb_instance() : display{new wl::display}, lcc_{}, app{this->display.get()} {}
+   afb_instance() : display{new wl::display}, lcc{}, app{this->display.get()} {}
 
    int init();
 };
@@ -53,7 +53,7 @@ std::mutex binding_m;
 
 int afb_instance::init() {
    // Initialize LowCanClient class
-   this->lcc_.initialize();
+   this->lcc.initialize();
 
    // Initialize App class
    return this->app.init();
@@ -304,13 +304,8 @@ void windowmanager_activatesurface(afb_req req) noexcept {
        return;
    }
 
-   const char* a_role = afb_req_value(req, "role");
-   if(!a_role){
-       a_role = "";
-   }
-
-   g_afb_instance->app.allocateWindowResource("activate", a_drawing_name,
-                                              a_drawing_area, a_role,
+   g_afb_instance->app.allocateWindowResource("activate",
+                                              a_drawing_name, a_drawing_area,
                                               [&req](const char* errmsg){
       if (errmsg != nullptr) {
          HMI_ERROR("wm", errmsg);
@@ -344,13 +339,8 @@ void windowmanager_deactivatesurface(afb_req req) noexcept {
        return;
    }
 
-   const char* a_role = afb_req_value(req, "role");
-   if(!a_role){
-       a_role = "";
-   }
-
-   g_afb_instance->app.allocateWindowResource("deactivate", a_drawing_name,
-                                              nullptr, a_role,
+   g_afb_instance->app.allocateWindowResource("deactivate",
+                                              a_drawing_name, nullptr,
                                               [&req](const char* errmsg){
       if (errmsg != nullptr) {
          HMI_ERROR("wm", errmsg);
@@ -664,7 +654,7 @@ void on_event(const char *event, struct json_object *object){
 
     // If receive low can signal
     if (strstr(event, "low-can")) {
-        wm::LowCanClient *lcc = &(g_afb_instance->lcc_);
+        wm::LowCanClient *lcc = &(g_afb_instance->lcc);
         wm::App *app = &(g_afb_instance->app);
 
         // Analyze low can signal
@@ -672,7 +662,7 @@ void on_event(const char *event, struct json_object *object){
 
         // If car info is updated, set event name
         const char *can_event = nullptr;
-        if (strstr(signal_name, lcc->kSignalName_[lcc->SignalNoParkingBrake])) {
+        if (strstr(signal_name, lcc->kSignalName[lcc->SignalNoParkingBrake])) {
             HMI_DEBUG("wm", "Parking Brake state is changed");
 
             // Set event
@@ -683,7 +673,7 @@ void on_event(const char *event, struct json_object *object){
                 can_event = "parking_brake_off";
             }
         }
-        else if (strstr(signal_name, lcc->kSignalName_[lcc->SignalNoAccelPedalPos])) {
+        else if (strstr(signal_name, lcc->kSignalName[lcc->SignalNoAccelPedalPos])) {
             // Update accel pedal position
             app->setAccelPedalPos(lcc->getCurrentAccelPedalPosition());
 
@@ -699,7 +689,7 @@ void on_event(const char *event, struct json_object *object){
                 }
             }
         }
-        else if (strstr(signal_name, lcc->kSignalName_[lcc->SignalNoHeadlame])) {
+        else if (strstr(signal_name, lcc->kSignalName[lcc->SignalNoHeadlame])) {
             HMI_DEBUG("wm", "Headlamp state is changed");
 
             // Set event
@@ -710,7 +700,7 @@ void on_event(const char *event, struct json_object *object){
                 can_event = "headlamp_off";
             }
         }
-        else if (strstr(signal_name, lcc->kSignalName_[lcc->SignalNoLightstatusBrake])) {
+        else if (strstr(signal_name, lcc->kSignalName[lcc->SignalNoLightstatusBrake])) {
             HMI_DEBUG("wm", "Lightstatus Brake state is changed");
 
             // Set event
@@ -724,7 +714,7 @@ void on_event(const char *event, struct json_object *object){
 
         // Allocate window resource
         if (nullptr != can_event) {
-            g_afb_instance->app.allocateWindowResource(can_event, nullptr,
+            g_afb_instance->app.allocateWindowResource(can_event,
                                                        nullptr, nullptr,
                                                        [](const char* errmsg){
                 if (errmsg != nullptr) {