Modify car info name

[apps/agl-service-windowmanager.git] / src / app.hpp

diff --git a/src/app.hpp b/src/app.hpp
index f6b809a..3fc5738 100644 (file)
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -132,7 +132,7 @@ typedef struct CarInfo {
     bool parking_brake_stt;
     bool accel_pedal_stt;
     double accel_pedal_pos;
-    const char *car_stt;
+    bool running_stt;
     bool headlamp_stt;
     bool lightstatus_brake_stt;
 } CarInfo;
@@ -248,24 +248,28 @@ struct App {
    void surface_removed(uint32_t surface_id);
 
    void setAccelPedalPos(double val);
+   void updateWindowResources(json_object* json_out);
 
 private:
-   PolicyManager pm_;
-   LayoutManager lm_;
-   std::unordered_map<std::string, int> role2surfaceid_;
-   std::unordered_map<std::string, std::string> drawingname2role_;
-   std::unordered_map<std::string, std::string> role2app_;
-   std::unordered_map<int, int> appid2role_;
-   CarInfo crr_car_info_;
-
-   int allocateSurface();
+   typedef std::map<std::string, std::string> RoleState;
+
+   PolicyManager pm;
+   LayoutManager lm;
+   std::unordered_map<std::string, std::string> drawingname2role;
+   std::unordered_map<std::string, std::string> role2drawingname;
+   std::unordered_map<int, int> appid2role;
+   CarInfo crr_car_info;
+   std::map<std::string, RoleState> crr_layer_state;
+
+   void updateCarElements(json_object* json_out);
+   void updateLayers(json_object* json_out);
    void setSurfaceSize(const char* role, const char* area);
    int loadAppDb();
    const char* convertDrawingNameToRole(char const *drawing_name);
 
 #if 0
-   struct id_allocator app_id_alloc_;
-   std::unordered_map<std::string, int> appname2appid_;
+   struct id_allocator app_id_alloc;
+   std::unordered_map<std::string, int> appname2appid;
 #endif
 
    optional<int> lookup_id(char const *name);