Changeset 4728 for pjproject/trunk/pjsip-apps/src/pjsystest/systest.c

Timestamp:

Feb 4, 2014 10:13:56 AM (10 years ago)

Author:

bennylp

Message:

Misc (re #1630): Fixing warnings about variable set but not used with recent gcc

File:

• pjproject/trunk/pjsip-apps/src/pjsystest/systest.c (modified) (37 diffs)

pjproject/trunk/pjsip-apps/src/pjsystest/systest.c

@@ -1 +1 @@
 /* $Id$ */
-/* 
+/*
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  *
@@ -15 +15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "systest.h"
@@ -57 +57 @@
 static gui_menu menu_getsets = { "View Settings", &systest_display_settings };
 
-static gui_menu menu_tests = { 
-    "Tests", NULL, 
-    10, 
+static gui_menu menu_tests = {
+    "Tests", NULL,
+    10,
     {
         &menu_wizard,
-        &menu_audtest, 
+        &menu_audtest,
         &menu_playtn,
         &menu_playwv1,
@@ -69 +69 @@
         &menu_calclat,
         &menu_sndaec,
-        NULL, 
+        NULL,
         &menu_exit
     }
 };
 
-static gui_menu menu_options = { 
-    "Options", NULL, 
-    2, 
+static gui_menu menu_options = {
+    "Options", NULL,
+    2,
     {
         &menu_listdev,
@@ -83 +83 @@
 };
 
-static gui_menu root_menu = { 
-    "Root", NULL, 2, {&menu_tests, &menu_options} 
+static gui_menu root_menu = {
+    "Root", NULL, 2, {&menu_tests, &menu_options}
 };
 
@@ -134 +134 @@
     else
         errmsg[0] = '\0';
-    
+
     strcpy(themsg, title);
     strncat(themsg, errmsg, sizeof(themsg)-1);
@@ -159 +159 @@
 
 /*****************************************************************************
- * test: play simple ringback tone and hear it 
+ * test: play simple ringback tone and hear it
  */
 static void systest_play_tone(void)
@@ -202 +202 @@
 
     pool = pjsua_pool_create("ringback", 512, 512);
-    samples_per_frame = systest.media_cfg.audio_frame_ptime * 
+    samples_per_frame = systest.media_cfg.audio_frame_ptime *
                         systest.media_cfg.clock_rate *
                         systest.media_cfg.channel_count / 1000;
@@ -208 +208 @@
     /* Ringback tone (call is ringing) */
     name = pj_str("ringback");
-    status = pjmedia_tonegen_create2(pool, &name, 
+    status = pjmedia_tonegen_create2(pool, &name,
                                      systest.media_cfg.clock_rate,
-                                     systest.media_cfg.channel_count, 
+                                     systest.media_cfg.channel_count,
                                      samples_per_frame,
-                                     16, PJMEDIA_TONEGEN_LOOP, 
+                                     16, PJMEDIA_TONEGEN_LOOP,
                                      &ringback_port);
     if (status != PJ_SUCCESS)
@@ -270 +270 @@
  * the file.
  */
-static pj_status_t create_player(unsigned path_cnt, const char *paths[], 
+static pj_status_t create_player(unsigned path_cnt, const char *paths[],
                                  pjsua_player_id *p_id)
 {
@@ -365 +365 @@
 
 /*****************************************************************************
- * test: record audio 
+ * test: record audio
  */
 static void systest_rec_audio(void)
@@ -388 +388 @@
                      "from the microphone, and playback the "
                      "audio to the speaker. Press OK to start recording, "
-                     "CANCEL to skip.", 
+                     "CANCEL to skip.",
                      WITH_OKCANCEL);
     if (key != KEY_OK) {
@@ -433 +433 @@
                      "The recorded audio is being played now to "
                      "the speaker device, in a loop. Listen for "
-                     "any audio impairments. Press OK to stop.", 
+                     "any audio impairments. Press OK to stop.",
                      WITH_OK);
 
@@ -526 +526 @@
     param.clock_rate = systest.media_cfg.snd_clock_rate;
     param.channel_count = systest.media_cfg.channel_count;
-    param.samples_per_frame = param.clock_rate * param.channel_count * 
+    param.samples_per_frame = param.clock_rate * param.channel_count *
                               systest.media_cfg.audio_frame_ptime / 1000;
 
     /* Latency settings */
-    param.flags |= (PJMEDIA_AUD_DEV_CAP_INPUT_LATENCY | 
+    param.flags |= (PJMEDIA_AUD_DEV_CAP_INPUT_LATENCY |
                     PJMEDIA_AUD_DEV_CAP_OUTPUT_LATENCY);
     param.input_latency_ms = systest.media_cfg.snd_rec_latency;
@@ -554 +554 @@
 
     if (result.rec.frame_cnt==0) {
-        problems[problem_count++] = 
+        problems[problem_count++] =
             "No audio frames were captured from the microphone. "
             "This means the audio device is not working properly.";
     } else {
-        pj_ansi_snprintf(textbuf+textbufpos, 
+        pj_ansi_snprintf(textbuf+textbufpos,
                          sizeof(textbuf)-textbufpos,
                          "Rec : interval (min/max/avg/dev)=\r\n"
@@ -571 +571 @@
 
         if (result.rec.max_burst > GOOD_MAX_INTERVAL) {
-            problems[problem_count++] = 
+            problems[problem_count++] =
                 "Recording max burst is quite high";
         }
@@ -577 +577 @@
 
     if (result.play.frame_cnt==0) {
-        problems[problem_count++] = 
+        problems[problem_count++] =
             "No audio frames were played to the speaker. "
             "This means the audio device is not working properly.";
     } else {
-        pj_ansi_snprintf(textbuf+textbufpos, 
+        pj_ansi_snprintf(textbuf+textbufpos,
                          sizeof(textbuf)-textbufpos,
                          "Play: interval (min/max/avg/dev)=\r\n"
@@ -594 +594 @@
 
         if (result.play.max_burst > GOOD_MAX_INTERVAL) {
-            problems[problem_count++] = 
+            problems[problem_count++] =
                 "Playback max burst is quite high";
         }
@@ -601 +601 @@
     if (result.rec_drift_per_sec) {
         const char *which = result.rec_drift_per_sec>=0 ? "faster" : "slower";
-        unsigned drift = result.rec_drift_per_sec>=0 ? 
+        unsigned drift = result.rec_drift_per_sec>=0 ?
                             result.rec_drift_per_sec :
                             -result.rec_drift_per_sec;
@@ -614 +614 @@
 
     if (problem_count == 0) {
-        pj_ansi_snprintf(textbuf+textbufpos, 
+        pj_ansi_snprintf(textbuf+textbufpos,
                          sizeof(textbuf)-textbufpos,
                          "\r\nThe sound device seems to be okay!");
@@ -624 +624 @@
 
         pj_ansi_snprintf(textbuf+textbufpos,
-                         sizeof(textbuf)-textbufpos, 
+                         sizeof(textbuf)-textbufpos,
                          "There could be %d problem(s) with the "
                          "sound device:\r\n",
@@ -632 +632 @@
         for (i=0; i<problem_count; ++i) {
             pj_ansi_snprintf(textbuf+textbufpos,
-                             sizeof(textbuf)-textbufpos, 
+                             sizeof(textbuf)-textbufpos,
                              " %d: %s\r\n", i+1, problems[i]);
             textbufpos = strlen(textbuf);
@@ -650 +650 @@
  */
 static int calculate_latency(pj_pool_t *pool, pjmedia_port *wav,
-                             unsigned *lat_sum, unsigned *lat_cnt, 
+                             unsigned *lat_sum, unsigned *lat_cnt,
                              unsigned *lat_min, unsigned *lat_max)
 {
@@ -689 +689 @@
     }
 
-    /* Zero the first 500ms to remove loud click noises 
+    /* Zero the first 500ms to remove loud click noises
      * (keypad press, etc.)
      */
@@ -784 +784 @@
         return;
     }
-    key = gui_msgbox(title, 
+    key = gui_msgbox(title,
                      "For this test to work, we must be able to capture "
                      "the audio played in the speaker (the echo), and only"
@@ -798 +798 @@
     PJ_LOG(3,(THIS_FILE, "Running %s", title));
 
-    status = create_player(PJ_ARRAY_SIZE(ref_wav_paths), ref_wav_paths, 
+    status = create_player(PJ_ARRAY_SIZE(ref_wav_paths), ref_wav_paths,
                            &play_id);
     if (status != PJ_SUCCESS)
@@ -817 +817 @@
     status = pjsua_conf_connect(0, rec_slot);
     status = pjsua_conf_connect(play_slot, rec_slot);
-    
+
 
     /* We're running */
@@ -870 +870 @@
         goto on_return;
 
-    status = calculate_latency(pool, wav_port, &lat_sum, &lat_cnt, 
+    status = calculate_latency(pool, wav_port, &lat_sum, &lat_cnt,
                                &lat_min, &lat_max);
     if (status != PJ_SUCCESS)
@@ -913 +913 @@
             msglen = strlen(msg);
         }
-        
+
         key = gui_msgbox(title, msg, WITH_OK);
 
@@ -965 +965 @@
      * Create player and recorder
      */
-    status = create_player(PJ_ARRAY_SIZE(ref_wav_paths), ref_wav_paths, 
+    status = create_player(PJ_ARRAY_SIZE(ref_wav_paths), ref_wav_paths,
                            &player_id);
     if (status != PJ_SUCCESS) {
@@ -1018 +1018 @@
     gui_msgbox(title, "We are now playing the captured audio from the mic. "
                       "Check if echo (of the audio played back previously) is "
-                      "present in the audio. The recording is stored in " 
+                      "present in the audio. The recording is stored in "
                       AEC_REC_PATH " for offline analysis. "
                       "Press OK to stop.",
@@ -1074 +1074 @@
     enum gui_key key;
     const char *title = "Audio Device List";
-    
+
     ti = systest_alloc_test_item(title);
     if (!ti)
@@ -1083 +1083 @@
     dev_count = pjmedia_aud_dev_count();
     if (dev_count == 0) {
-        key = gui_msgbox(title, 
+        key = gui_msgbox(title,
                          "No audio devices are found", WITH_OK);
         ti->success = PJ_FALSE;
@@ -1107 +1107 @@
         pj_ansi_snprintf(ti->reason+len, sizeof(ti->reason)-len,
                          " %2d: %s [%s] (%d/%d)\r\n",
-                          i, info.driver, info.name, 
+                          i, info.driver, info.name,
                           info.input_count, info.output_count);
         len = strlen(ti->reason);
@@ -1114 +1114 @@
     ti->reason[len] = '\0';
     key = gui_msgbox(title, ti->reason, WITH_OK);
+    PJ_UNUSED_ARG(key);
 
     ti->success = PJ_TRUE;
@@ -1205 +1206 @@
     ti->reason[sizeof(ti->reason)-1] = '\0';
     key = gui_msgbox(title, textbuf, WITH_OK);
-
+    PJ_UNUSED_ARG(key); /* Warning about unused var */
 }
 
@@ -1243 +1244 @@
     systest.media_cfg.snd_rec_latency = OVERRIDE_AUDDEV_REC_LAT;
 #endif
-        
+
     status = pjsua_init(&systest.ua_cfg, &log_cfg, &systest.media_cfg);
     if (status != PJ_SUCCESS) {