Remove duplicate declaration

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

diff --git a/screen_connector_watcher/include/screen_connector_common.h b/screen_connector_watcher/include/screen_connector_common.h
new file mode 100644 (file)
index 0000000..4bb5149
--- /dev/null
+++ b/screen_connector_watcher/include/screen_connector_common.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __SCREEN_CONNECTOR_COMMON_H__
+#define __SCREEN_CONNECTOR_COMMON_H__
+
+#include <tizen.h>
+#include <wayland-client.h>
+#include <wayland-tbm-client.h>
+#include <wayland-extension/tizen-extension-client-protocol.h>
+#include <tizen-remote-surface-client-protocol.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum {
+       SCREEN_CONNECTOR_CHANGED_EVENT_FILTER_NONE = TIZEN_REMOTE_SURFACE_CHANGED_BUFFER_EVENT_FILTER_NONE,
+       SCREEN_CONNECTOR_CHANGED_EVENT_FILTER_TBM = TIZEN_REMOTE_SURFACE_CHANGED_BUFFER_EVENT_FILTER_TBM,
+       SCREEN_CONNECTOR_CHANGED_EVENT_FILTER_IMAGE_FILE = TIZEN_REMOTE_SURFACE_CHANGED_BUFFER_EVENT_FILTER_IMAGE_FILE,
+       SCREEN_CONNECTOR_CHANGED_EVENT_FILTER_ALL =
+               TIZEN_REMOTE_SURFACE_CHANGED_BUFFER_EVENT_FILTER_TBM | TIZEN_REMOTE_SURFACE_CHANGED_BUFFER_EVENT_FILTER_IMAGE_FILE,
+} screen_connector_changed_event_filter_type;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SCREEN_CONNECTOR_COMMON_H__ */

diff --git a/screen_connector_watcher/include/screen_connector_toolkit.h b/screen_connector_watcher/include/screen_connector_toolkit.h
index a1d215e..1d91eee 100644 (file)
--- a/screen_connector_watcher/include/screen_connector_toolkit.h
+++ b/screen_connector_watcher/include/screen_connector_toolkit.h
@@ -17,22 +17,13 @@
 #ifndef __SCREEN_CONNECTOR_TOOLKIT_H__
 #define __SCREEN_CONNECTOR_TOOLKIT_H__
 
-#include <wayland-client.h>
-#include <wayland-tbm-client.h>
 #include <aul_screen_connector.h>
+#include <screen_connector_common.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 typedef enum {
-       SCREEN_CONNECTOR_CHANGED_EVENT_FILTER_NONE = TIZEN_REMOTE_SURFACE_CHANGED_BUFFER_EVENT_FILTER_NONE,
-       SCREEN_CONNECTOR_CHANGED_EVENT_FILTER_TBM = TIZEN_REMOTE_SURFACE_CHANGED_BUFFER_EVENT_FILTER_TBM,
-       SCREEN_CONNECTOR_CHANGED_EVENT_FILTER_IMAGE_FILE = TIZEN_REMOTE_SURFACE_CHANGED_BUFFER_EVENT_FILTER_IMAGE_FILE,
-       SCREEN_CONNECTOR_CHANGED_EVENT_FILTER_ALL =
-               TIZEN_REMOTE_SURFACE_CHANGED_BUFFER_EVENT_FILTER_TBM | TIZEN_REMOTE_SURFACE_CHANGED_BUFFER_EVENT_FILTER_IMAGE_FILE,
-} screen_connector_changed_event_filter_type;
-
-typedef enum {
        SCREEN_CONNECTOR_INPUT_TYPE_MOUSE_UP_DOWN = TIZEN_REMOTE_SURFACE_INPUT_EVENT_FILTER_MOUSE_UP_DOWN,
        SCREEN_CONNECTOR_INPUT_TYPE_MOUSE_MOVE_X = TIZEN_REMOTE_SURFACE_INPUT_EVENT_FILTER_MOUSE_MOVE_X,
        SCREEN_CONNECTOR_INPUT_TYPE_MOUSE_MOVE_Y = TIZEN_REMOTE_SURFACE_INPUT_EVENT_FILTER_MOUSE_MOVE_Y,

diff --git a/screen_connector_watcher/include/screen_connector_watcher.h b/screen_connector_watcher/include/screen_connector_watcher.h
index ca82edc..a9bc3e7 100644 (file)
--- a/screen_connector_watcher/include/screen_connector_watcher.h
+++ b/screen_connector_watcher/include/screen_connector_watcher.h
@@ -17,20 +17,11 @@
 #ifndef __SCREEN_CONNECTOR_WATCHER_H__
 #define __SCREEN_CONNECTOR_WATCHER_H__
 
-#include <wayland-client.h>
-#include <wayland-tbm-client.h>
+#include <screen_connector_common.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef enum {
-       SCREEN_CONNECTOR_CHANGED_EVENT_FILTER_NONE = TIZEN_REMOTE_SURFACE_CHANGED_BUFFER_EVENT_FILTER_NONE,
-       SCREEN_CONNECTOR_CHANGED_EVENT_FILTER_TBM = TIZEN_REMOTE_SURFACE_CHANGED_BUFFER_EVENT_FILTER_TBM,
-       SCREEN_CONNECTOR_CHANGED_EVENT_FILTER_IMAGE_FILE = TIZEN_REMOTE_SURFACE_CHANGED_BUFFER_EVENT_FILTER_IMAGE_FILE,
-       SCREEN_CONNECTOR_CHANGED_EVENT_FILTER_ALL =
-               TIZEN_REMOTE_SURFACE_CHANGED_BUFFER_EVENT_FILTER_TBM | TIZEN_REMOTE_SURFACE_CHANGED_BUFFER_EVENT_FILTER_IMAGE_FILE,
-} screen_connector_changed_event_filter_type;
-
 typedef void (*screen_connector_watcher_added_cb)(const char *appid, const char *instance_id, const int pid, void *data);
 typedef void (*screen_connector_watcher_removed_cb)(const char *appid, const char *instance_id, const int pid, void *data);
 typedef void (*screen_connector_watcher_update_cb)(struct tizen_remote_surface *trs, uint32_t type, struct wl_buffer *tbm,

diff --git a/screen_connector_watcher_evas/include/screen_connector_common_evas.h b/screen_connector_watcher_evas/include/screen_connector_common_evas.h
new file mode 100644 (file)
index 0000000..f20fb8b
--- /dev/null
+++ b/screen_connector_watcher_evas/include/screen_connector_common_evas.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __SCREEN_CONNECTOR_COMMON_EVAS_H__
+#define __SCREEN_CONNECTOR_COMMON_EVAS_H__
+
+#include <tizen.h>
+#include <wayland-client.h>
+#include <wayland-tbm-client.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @file screen_connector_toolkit_evas.h
+ * @brief  This file declares API of libscreen_connector library
+ * @since_tizen 3.0
+ */
+
+/**
+ * @addtogroup CAPI_SCREEN_CONNECTOR_WATCHER_EVAS_MODULE
+ * @{
+ */
+typedef enum {
+       SCREEN_CONNECTOR_EVAS_CHANGED_EVENT_FILTER_NONE = TIZEN_REMOTE_SURFACE_CHANGED_BUFFER_EVENT_FILTER_NONE,
+       SCREEN_CONNECTOR_EVAS_CHANGED_EVENT_FILTER_TBM = TIZEN_REMOTE_SURFACE_CHANGED_BUFFER_EVENT_FILTER_TBM,
+       SCREEN_CONNECTOR_EVAS_CHANGED_EVENT_FILTER_IMAGE_FILE = TIZEN_REMOTE_SURFACE_CHANGED_BUFFER_EVENT_FILTER_IMAGE_FILE,
+       SCREEN_CONNECTOR_EVAS_CHANGED_EVENT_FILTER_ALL =
+               TIZEN_REMOTE_SURFACE_CHANGED_BUFFER_EVENT_FILTER_TBM | TIZEN_REMOTE_SURFACE_CHANGED_BUFFER_EVENT_FILTER_IMAGE_FILE,
+} screen_connector_evas_changed_event_filter_type;
+
+
+
+/**
+ * @}
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SCREEN_CONNECTOR_COMMON_EVAS_H__ */

diff --git a/screen_connector_watcher_evas/include/screen_connector_toolkit_evas.h b/screen_connector_watcher_evas/include/screen_connector_toolkit_evas.h
index 58073ed..fbf9356 100644 (file)
--- a/screen_connector_watcher_evas/include/screen_connector_toolkit_evas.h
+++ b/screen_connector_watcher_evas/include/screen_connector_toolkit_evas.h
@@ -23,6 +23,7 @@
 #include <wayland-client.h>
 #include <wayland-tbm-client.h>
 #include <screen_connector_toolkit.h>
+#include <screen_connector_common_evas.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -38,13 +39,6 @@ extern "C" {
  * @addtogroup CAPI_SCREEN_CONNECTOR_WATCHER_EVAS_MODULE
  * @{
  */
-typedef enum {
-       SCREEN_CONNECTOR_EVAS_CHANGED_EVENT_FILTER_NONE = TIZEN_REMOTE_SURFACE_CHANGED_BUFFER_EVENT_FILTER_NONE,
-       SCREEN_CONNECTOR_EVAS_CHANGED_EVENT_FILTER_TBM = TIZEN_REMOTE_SURFACE_CHANGED_BUFFER_EVENT_FILTER_TBM,
-       SCREEN_CONNECTOR_EVAS_CHANGED_EVENT_FILTER_IMAGE_FILE = TIZEN_REMOTE_SURFACE_CHANGED_BUFFER_EVENT_FILTER_IMAGE_FILE,
-       SCREEN_CONNECTOR_EVAS_CHANGED_EVENT_FILTER_ALL =
-               TIZEN_REMOTE_SURFACE_CHANGED_BUFFER_EVENT_FILTER_TBM | TIZEN_REMOTE_SURFACE_CHANGED_BUFFER_EVENT_FILTER_IMAGE_FILE,
-} screen_connector_evas_changed_event_filter_type;
 
 typedef enum {
        VISIBILITY_TYPE_UNOBSCURED,

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 97e4528..fbeb528 100644 (file)
--- a/screen_connector_watcher_evas/include/screen_connector_watcher_evas.h
+++ b/screen_connector_watcher_evas/include/screen_connector_watcher_evas.h
@@ -22,6 +22,7 @@
 #include <tizen_type.h>
 #include <wayland-extension/tizen-extension-client-protocol.h>
 #include <tizen-remote-surface-client-protocol.h>
+#include <screen_connector_common_evas.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -36,13 +37,6 @@ extern "C" {
  * @addtogroup CAPI_SCREEN_CONNECTOR_WATCHER_EVAS_MODULE
  * @{
  */
-typedef enum {
-       SCREEN_CONNECTOR_EVAS_CHANGED_EVENT_FILTER_NONE = TIZEN_REMOTE_SURFACE_CHANGED_BUFFER_EVENT_FILTER_NONE,
-       SCREEN_CONNECTOR_EVAS_CHANGED_EVENT_FILTER_TBM = TIZEN_REMOTE_SURFACE_CHANGED_BUFFER_EVENT_FILTER_TBM,
-       SCREEN_CONNECTOR_EVAS_CHANGED_EVENT_FILTER_IMAGE_FILE = TIZEN_REMOTE_SURFACE_CHANGED_BUFFER_EVENT_FILTER_IMAGE_FILE,
-       SCREEN_CONNECTOR_EVAS_CHANGED_EVENT_FILTER_ALL =
-               TIZEN_REMOTE_SURFACE_CHANGED_BUFFER_EVENT_FILTER_TBM | TIZEN_REMOTE_SURFACE_CHANGED_BUFFER_EVENT_FILTER_IMAGE_FILE,
-} screen_connector_evas_changed_event_filter_type;
 
 typedef void (*screen_connector_watcher_evas_added_cb)(const char *appid, const char *instance_id, const int pid, void *data);
 typedef void (*screen_connector_watcher_evas_removed_cb)(const char *appid, const char *instance_id, const int pid, void *data);