Rename TIZEN_TV_PROD with TIZEN_FEATURE_TV_PROD 17/86917/2 accepted/tizen/common/20160907.154635 accepted/tizen/ivi/20160908.044139 accepted/tizen/mobile/20160908.043149 accepted/tizen/tv/20160908.043924 accepted/tizen/wearable/20160908.044030 submit/tizen/20160907.074000
authorSeungbae Shin <seungbae.shin@samsung.com>
Mon, 5 Sep 2016 12:03:29 +0000 (21:03 +0900)
committerSeungbae Shin <seungbae.shin@samsung.com>
Mon, 5 Sep 2016 12:05:20 +0000 (21:05 +0900)
[Version] Release 0.3.63
[Profile] Common
[Issue Type] Rule

Change-Id: I3dc36af1c37c816a780fd61509ad2170de106051

packaging/capi-media-sound-manager.spec
src/sound_manager_internal.c
test/sound_manager_test.c

index 364f59a76a2de16806422da1b78b9d69c3c768cc..6fa83743c2dc11a6a50af1db5979474e006c6007 100755 (executable)
@@ -1,6 +1,6 @@
 Name:       capi-media-sound-manager
 Summary:    Sound Manager library
-Version:    0.3.62
+Version:    0.3.63
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0
@@ -43,7 +43,7 @@ rm include/sound_manager_internal_tv.h
 
 %build
 %if "%{?TIZEN_PRODUCT_TV}" == "1"
-export CFLAGS+=" -DTIZEN_TV_PROD"
+export CFLAGS+=" -DTIZEN_FEATURE_TV_PROD"
 %endif
 
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
index e4c5bddbc6c042e83c32f8309ef86e14fb39676b..9d7897352f330a1df07f26c950391318fa066c9b 100644 (file)
@@ -23,7 +23,7 @@
 extern int g_stream_info_count;
 extern pthread_mutex_t g_stream_info_count_mutex;
 
-#ifndef TIZEN_TV_PROD
+#ifndef TIZEN_FEATURE_TV_PROD
 int sound_manager_get_max_master_volume(int *max_level)
 {
        int ret = MM_ERROR_NONE;
index 90f21dc02fae27f530f735886788003d7a03f92e..5755e4560818beb25d5c6cd687108a1a45b47671 100644 (file)
@@ -78,7 +78,7 @@ enum {
        CURRENT_STATUS_START_VIRTUAL_STREAM,
        CURRENT_STATUS_STOP_VIRTUAL_STREAM,
        CURRENT_STATUS_DESTROY_VIRTUAL_STREAM,
-#ifndef TIZEN_TV_PROD
+#ifndef TIZEN_FEATURE_TV_PROD
        CURRENT_STATUS_GET_MAX_MASTER_VOLUME,
        CURRENT_STATUS_SET_MASTER_VOLUME,
        CURRENT_STATUS_GET_MASTER_VOLUME,
@@ -236,7 +236,7 @@ void _interpret_main_menu(char *cmd)
                g_menu_state = CURRENT_STATUS_STOP_VIRTUAL_STREAM;
        else if (strncmp(cmd, "vdt", 3) == 0)
                g_menu_state = CURRENT_STATUS_DESTROY_VIRTUAL_STREAM;
-#ifndef TIZEN_TV_PROD
+#ifndef TIZEN_FEATURE_TV_PROD
        if (strncmp(cmd, "mgx", 3) == 0)
                g_menu_state = CURRENT_STATUS_GET_MAX_MASTER_VOLUME;
        else if (strncmp(cmd, "msv", 3) == 0)
@@ -267,7 +267,7 @@ void display_sub_basic()
        g_print("ut. Unset Current Sound Type \n");
        g_print("vc. Set Volume Changed CB \t");
        g_print("uv. Unset Volume Changed CB \n");
-#ifndef TIZEN_TV_PROD
+#ifndef TIZEN_FEATURE_TV_PROD
        g_print("mgx. *Get Max Master Volume \t");
        g_print("mgv. *Get Master Volume \t");
        g_print("msv. *Set Master Volume \n");
@@ -435,7 +435,7 @@ static void displaymenu()
                g_print("*** press enter to stop virtual stream\n");
        else if (g_menu_state == CURRENT_STATUS_DESTROY_VIRTUAL_STREAM)
                g_print("*** press enter to destroy virtual stream\n");
-#ifndef TIZEN_TV_PROD
+#ifndef TIZEN_FEATURE_TV_PROD
        else if (g_menu_state == CURRENT_STATUS_GET_MAX_MASTER_VOLUME)
                g_print("*** press enter to get max master volume level\n");
        else if (g_menu_state == CURRENT_STATUS_SET_MASTER_VOLUME)
@@ -1480,7 +1480,7 @@ static void interpret(char *cmd)
                reset_menu_state();
                break;
        }
-#ifndef TIZEN_TV_PROD
+#ifndef TIZEN_FEATURE_TV_PROD
        case CURRENT_STATUS_GET_MAX_MASTER_VOLUME: {
                int max_level;
                if (sound_manager_get_max_master_volume(&max_level) != SOUND_MANAGER_ERROR_NONE)