webrtc_test: Rename variable

g_menu_state -> g_menu_status

[Version] 0.3.101
[Issue Type] Refactoring

Change-Id: I782107a51e1849dfa9df7b97774e556a9913193b
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>

diff --git a/packaging/capi-media-webrtc.spec b/packaging/capi-media-webrtc.spec
index deddf3a7ed4e87f1b891e92c81af25f0052b7a9f..79f4aa321ab0c711439af49dcb0697d033d005fe 100644 (file)
--- a/packaging/capi-media-webrtc.spec
+++ b/packaging/capi-media-webrtc.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-webrtc
 Summary:    A WebRTC library in Tizen Native API
-Version:    0.3.100
+Version:    0.3.101
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/test/webrtc_test.c b/test/webrtc_test.c
index d9a291e13d32a1d40c94fc93e8256342cd43055c..f8a2cb35ea62c4571e74bb71c0c537ee1badc37f 100644 (file)
--- a/test/webrtc_test.c
+++ b/test/webrtc_test.c
@@ -413,7 +413,7 @@ static gchar g_proxy[MAX_STRING_LEN];
 static appdata_s g_ad;
 static connection_s g_conns[MAX_CONNECTION_LEN];
 static signaling_server_s g_signaling_server;
-static int g_menu_state;
+static int g_menu_status;
 static int g_cnt;
 
 static webrtc_signaling_server_h g_inner_signaling_server;
@@ -4389,7 +4389,7 @@ static void quit_program()
        }
 
        g_print("quit program\n");
-       g_menu_state = CURRENT_STATUS_TERMINATE;
+       g_menu_status = CURRENT_STATUS_TERMINATE;
 
        elm_exit();
 }
@@ -4410,7 +4410,7 @@ static bool interpret_main_menu_cmd(char *cmd)
                menu_info_s *menu_info = g_hash_table_lookup(g_ad.menu_items, cmd);
                if (!menu_info)
                        break;
-               g_menu_state = menu_info->status;
+               g_menu_status = menu_info->status;
                return menu_info->key_input_needed;
        }
        default:
@@ -4572,7 +4572,7 @@ static void display_menu_main(void)
 
 static void display_menu_webrtc_common(void)
 {
-       switch (g_menu_state) {
+       switch (g_menu_status) {
        case CURRENT_STATUS_SET_STUN_SERVER:
                g_print("*** input STUN server address.\n");
                break;
@@ -4604,7 +4604,7 @@ static void display_menu_webrtc_common(void)
 
 static void display_menu_webrtc_media_source(void)
 {
-       switch (g_menu_state) {
+       switch (g_menu_status) {
        case CURRENT_STATUS_ADD_MEDIA_SOURCE:
                g_print("*** input media source type.(1:audiotest, 2:videotest, 3:mic, 4:camera, 5:screen, 6:file, 7:media packet, 8:custom audio, 9:custom video)\n");
                break;
@@ -4731,7 +4731,7 @@ static void display_menu_webrtc_media_source(void)
 
 static void display_menu_webrtc_media_render(void)
 {
-       switch (g_menu_state) {
+       switch (g_menu_status) {
        case CURRENT_STATUS_SET_DISPLAY_TYPE:
                g_print("*** input display type.(1:overlay 2:evas)\n");
                break;
@@ -4771,7 +4771,7 @@ static void display_menu_webrtc_media_render(void)
 
 static void display_menu_webrtc_data_channel(void)
 {
-       switch (g_menu_state) {
+       switch (g_menu_status) {
        case CURRENT_STATUS_DATA_CHANNEL_SEND_STRING:
                g_print("*** input string to send.\n");
                break;
@@ -4790,7 +4790,7 @@ static void display_menu_webrtc_data_channel(void)
 
 static void display_menu_webrtc_stats(void)
 {
-       switch (g_menu_state) {
+       switch (g_menu_status) {
        case CURRENT_STATUS_FOREACH_STATS:
                if (g_cnt == 0)
                        g_print("*** input stats type.(1:all, 2:codec, 3:inbound-rtp/remote-outbound-rtp, 4:outbound-rtp/remote-inbound-rtp)\n");
@@ -4801,7 +4801,7 @@ static void display_menu_webrtc_stats(void)
 
 static void display_menu_app_signaling(void)
 {
-       switch (g_menu_state) {
+       switch (g_menu_status) {
        case CURRENT_STATUS_SETTING_SIGNALING_SERVER:
                g_print("*** input signaling server URL.\n");
                break;
@@ -4835,30 +4835,30 @@ static void display_menu_app_signaling(void)
 
 static void displaymenu(void)
 {
-       if (g_menu_state == CURRENT_STATUS_MAINMENU) {
+       if (g_menu_status == CURRENT_STATUS_MAINMENU) {
                display_menu_main();
 
        } else {
-               if (g_menu_state & TEST_MENU_WEBRTC_COMMON) {
+               if (g_menu_status & TEST_MENU_WEBRTC_COMMON) {
                        display_menu_webrtc_common();
 
-               } else if (g_menu_state & TEST_MENU_WEBRTC_MEDIA_SOURCE) {
+               } else if (g_menu_status & TEST_MENU_WEBRTC_MEDIA_SOURCE) {
                        display_menu_webrtc_media_source();
 
-               } else if (g_menu_state & TEST_MENU_WEBRTC_MEDIA_RENDER) {
+               } else if (g_menu_status & TEST_MENU_WEBRTC_MEDIA_RENDER) {
                        display_menu_webrtc_media_render();
 
-               } else if (g_menu_state & TEST_MENU_WEBRTC_DATA_CHANNEL) {
+               } else if (g_menu_status & TEST_MENU_WEBRTC_DATA_CHANNEL) {
                        display_menu_webrtc_data_channel();
 
-               } else if (g_menu_state & TEST_MENU_WEBRTC_STATS) {
+               } else if (g_menu_status & TEST_MENU_WEBRTC_STATS) {
                        display_menu_webrtc_stats();
 
-               } else if (g_menu_state & TEST_MENU_APP_SIGNALING) {
+               } else if (g_menu_status & TEST_MENU_APP_SIGNALING) {
                        display_menu_app_signaling();
 
                } else {
-                       g_print("%s() > unknown menu status[0x%x]\n", __FUNCTION__, g_menu_state);
+                       g_print("%s() > unknown menu status[0x%x]\n", __FUNCTION__, g_menu_status);
                        quit_program();
                }
        }
@@ -4872,14 +4872,14 @@ static gboolean timeout_menu_display_cb(void *data)
 
 static void reset_menu_state(void)
 {
-       g_menu_state = CURRENT_STATUS_MAINMENU;
+       g_menu_status = CURRENT_STATUS_MAINMENU;
 }
 
 static void test_webrtc_common(char *cmd)
 {
        int value;
 
-       switch (g_menu_state) {
+       switch (g_menu_status) {
        case CURRENT_STATUS_CREATE:
                _webrtc_create(0);
                reset_menu_state();
@@ -4945,13 +4945,13 @@ static void test_webrtc_common(char *cmd)
        }
        case CURRENT_STATUS_CREATE_OFFER:
        case CURRENT_STATUS_CREATE_OFFER_ASYNC: {
-               _webrtc_create_offer(&g_conns[0], g_menu_state == CURRENT_STATUS_CREATE_OFFER ? false : true);
+               _webrtc_create_offer(&g_conns[0], g_menu_status == CURRENT_STATUS_CREATE_OFFER ? false : true);
                reset_menu_state();
                break;
        }
        case CURRENT_STATUS_CREATE_ANSWER:
        case CURRENT_STATUS_CREATE_ANSWER_ASYNC: {
-               _webrtc_create_answer(&g_conns[0], g_menu_state == CURRENT_STATUS_CREATE_ANSWER ? false: true);
+               _webrtc_create_answer(&g_conns[0], g_menu_status == CURRENT_STATUS_CREATE_ANSWER ? false: true);
                reset_menu_state();
                break;
        }
@@ -5034,7 +5034,7 @@ static void test_webrtc_media_source(char *cmd)
 {
        int value;
 
-       switch (g_menu_state) {
+       switch (g_menu_status) {
        case CURRENT_STATUS_ADD_MEDIA_SOURCE: {
                value = atoi(cmd);
                _webrtc_add_media_source(0, value - 1, NULL);
@@ -5065,7 +5065,7 @@ static void test_webrtc_media_source(char *cmd)
                        break;
                case 2:
                        new_state = value;
-                       if (g_menu_state == CURRENT_STATUS_MEDIA_SOURCE_SET_PAUSE)
+                       if (g_menu_status == CURRENT_STATUS_MEDIA_SOURCE_SET_PAUSE)
                                _webrtc_media_source_set_pause(0, id, media_type, new_state);
                        else
                                _webrtc_media_source_set_mute(0, id, media_type, new_state);
@@ -5087,7 +5087,7 @@ static void test_webrtc_media_source(char *cmd)
                        g_cnt++;
                        break;
                case 1:
-                       if (g_menu_state == CURRENT_STATUS_MEDIA_SOURCE_GET_PAUSE)
+                       if (g_menu_status == CURRENT_STATUS_MEDIA_SOURCE_GET_PAUSE)
                                _webrtc_media_source_get_pause(0, id, value - 1);
                        else
                                _webrtc_media_source_get_mute(0, id, value - 1);
@@ -5334,7 +5334,7 @@ static void test_webrtc_media_render(char *cmd)
 {
        int value;
 
-       switch (g_menu_state) {
+       switch (g_menu_status) {
        case CURRENT_STATUS_SET_DISPLAY_TYPE: {
                value = atoi(cmd);
                _webrtc_set_display_type(0, value - 1);
@@ -5438,7 +5438,7 @@ static void test_webrtc_media_render(char *cmd)
 
 static void test_webrtc_data_channel(char *cmd)
 {
-       switch (g_menu_state) {
+       switch (g_menu_status) {
        case CURRENT_STATUS_DATA_CHANNEL_CREATE: {
                _webrtc_create_data_channel(0);
                reset_menu_state();
@@ -5494,7 +5494,7 @@ static void test_webrtc_data_channel(char *cmd)
 
 static void test_webrtc_stats(char *cmd)
 {
-       switch (g_menu_state) {
+       switch (g_menu_status) {
        case CURRENT_STATUS_FOREACH_STATS: {
                _webrtc_foreach_stats(0, atoi(cmd));
                reset_menu_state();
@@ -5507,7 +5507,7 @@ static void app_setting_and_signaling(char *cmd)
 {
        int value;
 
-       switch (g_menu_state) {
+       switch (g_menu_status) {
        case CURRENT_STATUS_SETTING_SIGNALING_SERVER: {
                _setting_uri(g_signaling_server.url, cmd);
                reset_menu_state();
@@ -5622,34 +5622,34 @@ static void interpret(char *cmd)
        if (!cmd)
                return;
 
-       if (g_menu_state == CURRENT_STATUS_MAINMENU) {
+       if (g_menu_status == CURRENT_STATUS_MAINMENU) {
                if (interpret_main_menu_cmd(cmd))
                        goto out;
        }
 
-       if (g_menu_state & TEST_MENU_WEBRTC_COMMON)
+       if (g_menu_status & TEST_MENU_WEBRTC_COMMON)
                test_webrtc_common(cmd);
 
-       else if (g_menu_state & TEST_MENU_WEBRTC_MEDIA_SOURCE)
+       else if (g_menu_status & TEST_MENU_WEBRTC_MEDIA_SOURCE)
                test_webrtc_media_source(cmd);
 
-       else if (g_menu_state & TEST_MENU_WEBRTC_MEDIA_RENDER)
+       else if (g_menu_status & TEST_MENU_WEBRTC_MEDIA_RENDER)
                test_webrtc_media_render(cmd);
 
-       else if (g_menu_state & TEST_MENU_WEBRTC_DATA_CHANNEL)
+       else if (g_menu_status & TEST_MENU_WEBRTC_DATA_CHANNEL)
                test_webrtc_data_channel(cmd);
 
-       else if (g_menu_state & TEST_MENU_WEBRTC_STATS)
+       else if (g_menu_status & TEST_MENU_WEBRTC_STATS)
                test_webrtc_stats(cmd);
 
-       else if (g_menu_state & TEST_MENU_APP_SIGNALING)
+       else if (g_menu_status & TEST_MENU_APP_SIGNALING)
                app_setting_and_signaling(cmd);
 
-       else if (g_menu_state == CURRENT_STATUS_QUIT)
+       else if (g_menu_status == CURRENT_STATUS_QUIT)
                quit_program();
 
 out:
-       if (g_menu_state != CURRENT_STATUS_TERMINATE)
+       if (g_menu_status != CURRENT_STATUS_TERMINATE)
                g_timeout_add(100, timeout_menu_display_cb, 0);
 }