Remove build flag TIZEN_FEATURE_WIFI_DISPLAY

Description: We have added new features with build flags.
But it makes spec file complicated. So we'll manage this feature
at run time not compile time.

Change-Id: Ia419ba5d7051caa1cf8a1216c83b73e30af95a1f
Signed-off-by: Yu jiung <jiung.yu@samsung.com>

diff --git a/packaging/capi-network-wifi-direct.spec b/packaging/capi-network-wifi-direct.spec
index 8bf5b1a..7299a67 100644 (file)
--- a/packaging/capi-network-wifi-direct.spec
+++ b/packaging/capi-network-wifi-direct.spec
@@ -3,7 +3,7 @@
 
 Name:       capi-network-wifi-direct
 Summary:    Network WiFi-Direct Library
-Version:    1.2.84
+Version:    1.2.85
 Release:    1
 Group:      Network & Connectivity/API
 License:    Apache-2.0
@@ -83,14 +83,12 @@ pushd build_extension
 cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
        -DTIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND=1 \
        -DTIZEN_FEATURE_SERVICE_DISCOVERY=1 \
-       -DTIZEN_FEATURE_WIFI_DISPLAY=1 \
        .. -DVERSION=%{version} -DMAJORVERSION=${MAJORVER} -DCMAKE_LIB_DIR=%{_libdir}
 make %{?jobs:-j%jobs}
 popd
 
 cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
        -DTIZEN_FEATURE_SERVICE_DISCOVERY=0 \
-       -DTIZEN_FEATURE_WIFI_DISPLAY=0 \
        . -DVERSION=%{version} -DMAJORVERSION=${MAJORVER} -DCMAKE_LIB_DIR=%{_libdir}
 make %{?jobs:-j%jobs}
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index eb30da1..71720de 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -91,10 +91,6 @@ IF(TIZEN_FEATURE_SERVICE_DISCOVERY)
        ADD_DEFINITIONS(-DTIZEN_FEATURE_SERVICE_DISCOVERY)
        SET(FEATURES "${FEATURES} -DTIZEN_FEATURE_SERVICE_DISCOVERY")
 ENDIF(TIZEN_FEATURE_SERVICE_DISCOVERY)
-IF(TIZEN_FEATURE_WIFI_DISPLAY)
-       ADD_DEFINITIONS(-DTIZEN_FEATURE_WIFI_DISPLAY)
-       SET(FEATURES "${FEATURES} -DTIZEN_FEATURE_WIFI_DISPLAY")
-ENDIF(TIZEN_FEATURE_WIFI_DISPLAY)
 IF(TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND)
        ADD_DEFINITIONS(-DTIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND)
        SET(FEATURES "${FEATURES} -DTIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND")

diff --git a/src/include/wifi-direct-client-proxy.h b/src/include/wifi-direct-client-proxy.h
index 7515041..7b1f925 100644 (file)
--- a/src/include/wifi-direct-client-proxy.h
+++ b/src/include/wifi-direct-client-proxy.h
@@ -54,6 +54,7 @@
 
 typedef struct {
        bool is_registered;
+       bool is_display_supported;
 
        wifi_direct_device_state_changed_cb activation_cb;
        void *user_data_for_cb_activation;

diff --git a/src/wifi-direct-client-proxy.c b/src/wifi-direct-client-proxy.c
index 3872dd3..74bb7f8 100644 (file)
--- a/src/wifi-direct-client-proxy.c
+++ b/src/wifi-direct-client-proxy.c
@@ -118,6 +118,13 @@ static int __net_wifidirect_gerror_to_enum(GError* error)
        return ret;
 }
 
+static int __wfd_check_display_feature()
+{
+       CHECK_FEATURE_SUPPORTED(WIFIDIRECT_DISPLAY_FEATURE);
+
+       return WIFI_DIRECT_ERROR_NONE;
+}
+
 //LCOV_EXCL_START
 void __wfd_vconf_state_changed_cb(keynode_t *key, void *data)
 {
@@ -758,9 +765,8 @@ static void __wfd_client_extract_discovered_peer_info(GVariantIter *iter,
                        info->secondary_device_type = g_variant_get_uint16(var);
 
                } else if (!g_strcmp0(key, "IsWfdDevice")) {
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
-                       info->is_miracast_device = g_variant_get_boolean(var);
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
+                       if (g_client_info.is_display_supported)
+                               info->is_miracast_device = g_variant_get_boolean(var);
                } else {
                        ;/* Do Nothing */
                }
@@ -831,6 +837,11 @@ int wifi_direct_initialize(void)
 
        g_client_info.is_registered = TRUE;
 
+       if (__wfd_check_display_feature() == WIFI_DIRECT_ERROR_NONE)
+               g_client_info.is_display_supported = TRUE;
+       else
+               g_client_info.is_display_supported = FALSE;
+
        /* Initialize callbacks */
        g_client_info.activation_cb = NULL;
        g_client_info.user_data_for_cb_activation = NULL;
@@ -1916,9 +1927,9 @@ int wifi_direct_foreach_connected_peers(wifi_direct_connected_peer_cb cb,
                                peer_list->secondary_device_type = g_variant_get_uint16(var);
 
                        } else if (!g_strcmp0(key, "IsWfdDevice")) {
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
-                               peer_list->is_miracast_device = g_variant_get_boolean(var);
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
+
+                               if (g_client_info.is_display_supported)
+                                       peer_list->is_miracast_device = g_variant_get_boolean(var);
                        } else if (!g_strcmp0(key, "IsP2P")) {
                                peer_list->p2p_supported = g_variant_get_boolean(var);
 
@@ -3820,9 +3831,8 @@ int wifi_direct_get_peer_info(char* mac_address, wifi_direct_discovered_peer_inf
                        peer->secondary_device_type = g_variant_get_uint16(var);
 
                } else if (!g_strcmp0(key, "IsWfdDevice")) {
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
-                       peer->is_miracast_device = g_variant_get_boolean(var);
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
+                       if (g_client_info.is_display_supported)
+                               peer->is_miracast_device = g_variant_get_boolean(var);
                } else {
                        ;/* Do Nothing */
                }
@@ -3964,7 +3974,6 @@ int wifi_direct_set_autoconnection_peer(char *mac_address)
 int wifi_direct_init_display(void)
 {
        __WDC_LOG_FUNC_START__;
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
 
        CHECK_FEATURE_SUPPORTED(WIFIDIRECT_DISPLAY_FEATURE);
 
@@ -3991,16 +4000,13 @@ int wifi_direct_init_display(void)
 
        WDC_LOGD("%s() return : [%d]", __func__, ret);
        __WDC_LOG_FUNC_END__;
+
        return ret;
-#else /* TIZEN_FEATURE_WIFI_DISPLAY */
-       return WIFI_DIRECT_ERROR_NOT_SUPPORTED;
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
 }
 
 int wifi_direct_deinit_display(void)
 {
        __WDC_LOG_FUNC_START__;
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
 
        CHECK_FEATURE_SUPPORTED(WIFIDIRECT_DISPLAY_FEATURE);
 
@@ -4027,16 +4033,13 @@ int wifi_direct_deinit_display(void)
 
        WDC_LOGD("%s() return : [%d]", __func__, ret);
        __WDC_LOG_FUNC_END__;
+
        return ret;
-#else /* TIZEN_FEATURE_WIFI_DISPLAY */
-       return WIFI_DIRECT_ERROR_NOT_SUPPORTED;
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
 }
 
 int wifi_direct_set_display(wifi_direct_display_type_e type, int port, int hdcp)
 {
        __WDC_LOG_FUNC_START__;
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
 
        CHECK_FEATURE_SUPPORTED(WIFIDIRECT_DISPLAY_FEATURE);
 
@@ -4073,16 +4076,13 @@ int wifi_direct_set_display(wifi_direct_display_type_e type, int port, int hdcp)
 
        WDC_LOGD("%s() return : [%d]", __func__, ret);
        __WDC_LOG_FUNC_END__;
+
        return ret;
-#else /* TIZEN_FEATURE_WIFI_DISPLAY */
-       return WIFI_DIRECT_ERROR_NOT_SUPPORTED;
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
 }
 
 int wifi_direct_set_display_availability(bool availability)
 {
        __WDC_LOG_FUNC_START__;
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
 
        CHECK_FEATURE_SUPPORTED(WIFIDIRECT_DISPLAY_FEATURE);
 
@@ -4112,17 +4112,14 @@ int wifi_direct_set_display_availability(bool availability)
 
        WDC_LOGD("%s() return : [%d]", __func__, ret);
        __WDC_LOG_FUNC_END__;
+
        return ret;
-#else /* TIZEN_FEATURE_WIFI_DISPLAY */
-       return WIFI_DIRECT_ERROR_NOT_SUPPORTED;
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
 }
 
 //LCOV_EXCL_START
 int wifi_direct_get_peer_display_type(char *mac_address, wifi_direct_display_type_e *type)
 {
        __WDC_LOG_FUNC_START__;
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
 
        CHECK_FEATURE_SUPPORTED(WIFIDIRECT_DISPLAY_FEATURE);
 
@@ -4160,16 +4157,13 @@ int wifi_direct_get_peer_display_type(char *mac_address, wifi_direct_display_typ
 
        WDC_LOGD("%s() return : [%d]", __func__, ret);
        __WDC_LOG_FUNC_END__;
+
        return ret;
-#else /* TIZEN_FEATURE_WIFI_DISPLAY */
-       return WIFI_DIRECT_ERROR_NOT_SUPPORTED;
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
 }
 
 int wifi_direct_get_peer_display_availability(char *mac_address, bool *availability)
 {
        __WDC_LOG_FUNC_START__;
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
 
        CHECK_FEATURE_SUPPORTED(WIFIDIRECT_DISPLAY_FEATURE);
 
@@ -4207,16 +4201,13 @@ int wifi_direct_get_peer_display_availability(char *mac_address, bool *availabil
 
        WDC_LOGD("%s() return : [%d]", __func__, ret);
        __WDC_LOG_FUNC_END__;
+
        return ret;
-#else /* TIZEN_FEATURE_WIFI_DISPLAY */
-       return WIFI_DIRECT_ERROR_NOT_SUPPORTED;
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
 }
 
 int wifi_direct_get_peer_display_hdcp(char *mac_address, int *hdcp)
 {
        __WDC_LOG_FUNC_START__;
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
 
        CHECK_FEATURE_SUPPORTED(WIFIDIRECT_DISPLAY_FEATURE);
 
@@ -4254,16 +4245,13 @@ int wifi_direct_get_peer_display_hdcp(char *mac_address, int *hdcp)
 
        WDC_LOGD("%s() return : [%d]", __func__, ret);
        __WDC_LOG_FUNC_END__;
+
        return ret;
-#else /* TIZEN_FEATURE_WIFI_DISPLAY */
-       return WIFI_DIRECT_ERROR_NOT_SUPPORTED;
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
 }
 
 int wifi_direct_get_peer_display_port(char *mac_address, int *port)
 {
        __WDC_LOG_FUNC_START__;
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
 
        CHECK_FEATURE_SUPPORTED(WIFIDIRECT_DISPLAY_FEATURE);
 
@@ -4301,16 +4289,13 @@ int wifi_direct_get_peer_display_port(char *mac_address, int *port)
 
        WDC_LOGD("%s() return : [%d]", __func__, ret);
        __WDC_LOG_FUNC_END__;
+
        return ret;
-#else /* TIZEN_FEATURE_WIFI_DISPLAY */
-       return WIFI_DIRECT_ERROR_NOT_SUPPORTED;
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
 }
 
 int wifi_direct_get_peer_display_throughput(char *mac_address, int *throughput)
 {
        __WDC_LOG_FUNC_START__;
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
 
        CHECK_FEATURE_SUPPORTED(WIFIDIRECT_DISPLAY_FEATURE);
 
@@ -4348,10 +4333,8 @@ int wifi_direct_get_peer_display_throughput(char *mac_address, int *throughput)
 
        WDC_LOGD("%s() return : [%d]", __func__, ret);
        __WDC_LOG_FUNC_END__;
+
        return ret;
-#else /* TIZEN_FEATURE_WIFI_DISPLAY */
-       return WIFI_DIRECT_ERROR_NOT_SUPPORTED;
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
 }
 
 int wifi_direct_set_session_timer(int seconds)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e03471c..f0deaac 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -22,10 +22,6 @@ IF(TIZEN_FEATURE_SERVICE_DISCOVERY)
        ADD_DEFINITIONS(-DTIZEN_FEATURE_SERVICE_DISCOVERY)
        SET(FEATURES "${FEATURES} -DTIZEN_FEATURE_SERVICE_DISCOVERY")
 ENDIF(TIZEN_FEATURE_SERVICE_DISCOVERY)
-IF(TIZEN_FEATURE_WIFI_DISPLAY)
-       ADD_DEFINITIONS(-DTIZEN_FEATURE_WIFI_DISPLAY)
-       SET(FEATURES "${FEATURES} -DTIZEN_FEATURE_WIFI_DISPLAY")
-ENDIF(TIZEN_FEATURE_WIFI_DISPLAY)
 
 FOREACH (flag ${TEST_APP_REQ_PKGS_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")