1 files changed, 10 insertions, 6 deletions
diff --git a/src/app.hpp b/src/app.hpp
index e7a9ae0..b25f568 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -201,11 +201,11 @@ struct App {
 
    void set_pending_events();
 
-   result<int> api_request_surface(char const *drawing_name, char const *appid, int flag);
-   char const *api_request_surface(char const *drawing_name, char const *ivi_id);
+   result<int> api_request_surface(char const *appid, char const *drawing_name);
+   char const *api_request_surface(char const *appid, char const *drawing_name, char const *ivi_id);
    void api_activate_surface(char const *appid, char const *drawing_name, char const *drawing_area, const reply_func &reply);
-   void api_deactivate_surface(char const *drawing_name, const reply_func &reply);
-   void api_enddraw(char const *drawing_name);
+   void api_deactivate_surface(char const *appid, char const *drawing_name, const reply_func &reply);
+   void api_enddraw(char const *appid, char const *drawing_name);
    result<json_object *> api_get_display_info();
    result<json_object *> api_get_area_info(char const *drawing_name);
    void api_ping();
@@ -217,7 +217,8 @@ struct App {
    void surface_removed(uint32_t surface_id);
 
    // Do not use this function
-   static int processTimerHandler(sd_event_source *s, uint64_t usec, void *userdata);
+   //static int processTimerHandler(sd_event_source *s, uint64_t usec, void *userdata);
+   void timerHandler();
 
  private:
    optional<int> lookup_id(char const *name);
@@ -229,7 +230,6 @@ struct App {
    void check_flushdraw(int surface_id);
 
    int init_layers();
-   void timerHandler();
 
    void surface_set_layout(int surface_id, optional<int> sub_surface_id = nullopt);
    void layout_commit();
@@ -243,6 +243,10 @@ struct App {
    void emit_invisible(char const *label);
    void emit_visible(char const *label);
 
+   void do_allocate_window_resource(unsigned sequence_number);
+   void do_enddraw(unsigned sequence_number);
+   void process_request();
+
    void activate(int id);
    void deactivate(int id);
    void deactivate_main_surface();