Changeset 3925 for pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

Timestamp:

Dec 27, 2011 12:47:52 PM (13 years ago)

Author:

bennylp

Message:

More re #1419: changed field names from video_count to vid_cnt and audio_cnt to aud_cnt for better consistency

File:

• pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c (modified) (6 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -2581 +2581 @@
 
         pjsua_call_setting_default(&call_opt);
-        call_opt.audio_cnt = app_config.aud_cnt;
-        call_opt.video_cnt = app_config.vid.vid_cnt;
+        call_opt.aud_cnt = app_config.aud_cnt;
+        call_opt.vid_cnt = app_config.vid.vid_cnt;
 
         pjsua_call_answer2(call_id, &call_opt, app_config.auto_answer, NULL, NULL);
@@ -2591 +2591 @@
 
 #if PJSUA_HAS_VIDEO
-        if (call_info.rem_offerer && call_info.rem_video_cnt) {
+        if (call_info.rem_offerer && call_info.rem_vid_cnt) {
             snprintf(notif_st, sizeof(notif_st), 
                      "To %s the video, type \"vid %s\" first, "
@@ -2608 +2608 @@
                   "Press a to answer or h to reject call",
                   acc_id,
-                  call_info.rem_audio_cnt,
-                  call_info.rem_video_cnt,
+                  call_info.rem_aud_cnt,
+                  call_info.rem_vid_cnt,
                   notif_st,
                   call_info.remote_info.ptr,
@@ -2898 +2898 @@
 #if PJSUA_HAS_VIDEO
     /* Check if remote has just tried to enable video */
-    if (call_info.rem_offerer && call_info.rem_video_cnt)
+    if (call_info.rem_offerer && call_info.rem_vid_cnt)
     {
         int vid_idx;
@@ -4239 +4239 @@
 
     pjsua_call_setting_default(&call_opt);
-    call_opt.audio_cnt = app_config.aud_cnt;
-    call_opt.video_cnt = app_config.vid.vid_cnt;
+    call_opt.aud_cnt = app_config.aud_cnt;
+    call_opt.vid_cnt = app_config.vid.vid_cnt;
 
     /* If user specifies URI to call, then call the URI */
@@ -4281 +4281 @@
         /* Update call setting */
         pjsua_call_setting_default(&call_opt);
-        call_opt.audio_cnt = app_config.aud_cnt;
-        call_opt.video_cnt = app_config.vid.vid_cnt;
+        call_opt.aud_cnt = app_config.aud_cnt;
+        call_opt.vid_cnt = app_config.vid.vid_cnt;
 
         switch (menuin[0]) {