Fix remove callback

remove callback have to pass object to keep
consistancy of old version.

Change-Id: I40001484188a983092d1bcd6e10f658249c38420
Signed-off-by: Hyunho Kang <hhstark.kang@samsung.com>

diff --git a/screen_connector_provider/include/screen_connector_provider.h b/screen_connector_provider/include/screen_connector_provider.h
index 4f3dab6..f937c50 100644 (file)
--- a/screen_connector_provider/include/screen_connector_provider.h
+++ b/screen_connector_provider/include/screen_connector_provider.h
@@ -17,7 +17,6 @@
 #ifndef __SCREEN_CONNECTOR_PROVIDER_H__
 #define __SCREEN_CONNECTOR_PROVIDER_H__
 #include <Evas.h>
-#include <wayland-tbm-client.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/screen_connector_provider/src/screen_connector_provider.c b/screen_connector_provider/src/screen_connector_provider.c
index 26575fe..7834f69 100644 (file)
--- a/screen_connector_provider/src/screen_connector_provider.c
+++ b/screen_connector_provider/src/screen_connector_provider.c
@@ -19,6 +19,7 @@
 #include <glib.h>
 #include <sys/mman.h>
 
+#include <tizen.h>
 #include <dlog.h>
 #include <wayland-client.h>
 #include <Ecore_Wayland.h>
@@ -27,6 +28,7 @@
 #include <tizen-remote-surface-client-protocol.h>
 #include <aul_screen_connector.h>
 
+
 #include "screen_connector_provider.h"
 
 #ifdef LOG_TAG

diff --git a/screen_connector_watcher/include/screen_connector_watcher.h b/screen_connector_watcher/include/screen_connector_watcher.h
index 7179bad..24aa3c4 100644 (file)
--- a/screen_connector_watcher/include/screen_connector_watcher.h
+++ b/screen_connector_watcher/include/screen_connector_watcher.h
@@ -18,6 +18,7 @@
 #define __SCREEN_CONNECTOR_WATCHER_H__
 
 #include <Evas.h>
+#include <wayland-client.h>
 #include <wayland-tbm-client.h>
 #ifdef __cplusplus
 extern "C" {
@@ -30,7 +31,7 @@ typedef enum {
 } visibility_type;
 
 typedef void (*screen_connector_watcher_added_cb)(const char *appid, Evas_Object *image, void *data);
-typedef void (*screen_connector_watcher_removed_cb)(const char *appid, void *data);
+typedef void (*screen_connector_watcher_removed_cb)(const char *appid, Evas_Object *image, void *data);
 typedef void (*screen_connector_watcher_updated_cb)(const char *appid, Evas_Object *image, void *data);
 
 typedef struct _screen_connector_watcher_ops {

diff --git a/screen_connector_watcher/src/screen_connector_watcher.c b/screen_connector_watcher/src/screen_connector_watcher.c
index 8a6ce7a..a22e5f8 100644 (file)
--- a/screen_connector_watcher/src/screen_connector_watcher.c
+++ b/screen_connector_watcher/src/screen_connector_watcher.c
@@ -411,7 +411,7 @@ static void __buffer_missing(void *data, struct tizen_remote_surface *trs)
        plug_id = evas_object_data_del(surface_info->img_tbm, "___PLUGID");
        free(plug_id);
 
-       surface_info->ops->removed(surface_info->appid, surface_info->data);
+       surface_info->ops->removed(surface_info->appid, surface_info->img_tbm, surface_info->data);
        __free_surface_info(surface_info);
 }
 
@@ -437,6 +437,8 @@ static void __redirect_surface(screen_connector_surface_info *surface_info)
 {
        surface_info->surface =
                tizen_remote_surface_manager_create_surface(__rsm, (uint32_t)surface_info->surface_id, __tbm);
+
+       LOGD("surface_id : %d, (%p)", surface_info->surface_id, surface_info->surface);
        tizen_remote_surface_add_listener(surface_info->surface, &__rs_listener,
                                                surface_info);
        tizen_remote_surface_redirect(surface_info->surface);
@@ -480,6 +482,8 @@ static void __app_added(const char *appid, const int pid, const unsigned int sur
                surface_info->pid = pid;
                surface_info->surface_id = surface_id;
                __pending_surface_list = g_list_append(__pending_surface_list, surface_info);
+
+               LOGD("add pending list: %d, surface_id: %d, appid: %s", pid, surface_id, appid);
                return;
        }
 

diff --git a/screen_connector_watcher_evas/include/screen_connector_watcher_evas.h b/screen_connector_watcher_evas/include/screen_connector_watcher_evas.h
index 06ebdf7..9407fee 100644 (file)
--- a/screen_connector_watcher_evas/include/screen_connector_watcher_evas.h
+++ b/screen_connector_watcher_evas/include/screen_connector_watcher_evas.h
@@ -39,7 +39,7 @@ extern "C" {
  */
 
 typedef void (*screen_connector_watcher_evas_added_cb)(const char *appid, Evas_Object *image, void *data);
-typedef void (*screen_connector_watcher_evas_removed_cb)(const char *appid, void *data);
+typedef void (*screen_connector_watcher_evas_removed_cb)(const char *appid, Evas_Object *image, void *data);
 typedef void (*screen_connector_watcher_evas_updated_cb)(const char *appid, Evas_Object *image, void *data);
 
 typedef struct _screen_connector_watcher_evas_ops {

diff --git a/screen_connector_watcher_evas/src/screen_connector_watcher_evas.c b/screen_connector_watcher_evas/src/screen_connector_watcher_evas.c
index ffd1589..3c97241 100644 (file)
--- a/screen_connector_watcher_evas/src/screen_connector_watcher_evas.c
+++ b/screen_connector_watcher_evas/src/screen_connector_watcher_evas.c
@@ -66,12 +66,12 @@ static void __watcher_added_cb(const char *appid, Evas_Object *image, void *data
        handle->ops->added(appid, image, handle->data);
 }
 
-static void __watcher_removed_cb(const char *appid, void *data)
+static void __watcher_removed_cb(const char *appid, Evas_Object *image, void *data)
 {
        screen_connector_watcher_evas_h handle;
 
        handle = (screen_connector_watcher_evas_h)data;
-       handle->ops->removed(appid, handle->data);
+       handle->ops->removed(appid, image, handle->data);
 }
 
 static void __watcher_updated_cb(const char *appid, Evas_Object *image, void *data)