[v0.3.35]apply coding rule and set header path of player_test for each profile

Change-Id: Ibba4f7502bf467dd0a6568e985acfecc6a9fb210
Signed-off-by: Eunhae Choi <eunhae1.choi@samsung.com>

diff --git a/src/player.c b/src/player.c
index 148ef234f380abe240865c652c778ea005425bb5..3fce02622eb27378a600e3f41e9ec0bf4f4777ff 100644 (file)
--- a/src/player.c
+++ b/src/player.c
@@ -2346,9 +2346,10 @@ int player_get_duration(player_h player, int *pduration)
 }
 
 /* The player_display_type_e is different at wearable profile */
-int _player_convert_display_type (player_display_type_e type, player_private_display_type_e *out_type)
+int _player_convert_display_type(player_display_type_e type, player_private_display_type_e *out_type)
 {
        int ret = PLAYER_ERROR_NONE;
+       PLAYER_NULL_ARG_CHECK(out_type);
 
        switch (type) {
        case PLAYER_DISPLAY_TYPE_OVERLAY:
@@ -2365,7 +2366,7 @@ int _player_convert_display_type (player_display_type_e type, player_private_dis
                break;
        }
 
-       LOGD("display type(%d) => (%d)", type, out_type);
+       LOGD("display type(%d) -> (%d)", type, *out_type);
        return ret;
 }
 
@@ -2396,9 +2397,8 @@ int player_set_display(player_h player, player_display_type_e type, player_displ
        LOGD("ENTER type: %d", type);
 
        ret = _player_convert_display_type(type, &conv_type);
-       if (ret != PLAYER_ERROR_NONE) {
+       if (ret != PLAYER_ERROR_NONE)
                return ret;
-       }
 
        if (conv_type != PLAYER_PRIVATE_DISPLAY_TYPE_NONE) {
                obj = (Evas_Object *) display;

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index c45fd8a21ba824d428113c31020cb403cbe6e2a8..dba7898a96b20d9a211e85cac7384a6d3de92d92 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,7 +1,12 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 SET(fw_test "${fw_name}-test")
 
+IF (TIZEN_WEARABLE)
+INCLUDE_DIRECTORIES(../include/wearable)
+ELSE (TIZEN_WEARABLE)
 INCLUDE_DIRECTORIES(../include/common)
+ENDIF (TIZEN_WEARABLE)
+
 link_directories(${CMAKE_SOURCE_DIR}/../)
 
 SET(WIN_PKG "${WIN_PKG} ecore-wayland")