Changeset 3925 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

Timestamp:

Dec 27, 2011 12:47:52 PM (12 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/src/pjsua-lib/pjsua_call.c (modified) (4 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

@@ -511 +511 @@
     pj_bzero(opt, sizeof(*opt));
     opt->flag = PJSUA_CALL_INCLUDE_DISABLED_MEDIA;
-    opt->audio_cnt = 1;
+    opt->aud_cnt = 1;
 
 #if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
-    opt->video_cnt = 1;
+    opt->vid_cnt = 1;
     opt->req_keyframe_method = PJSUA_VID_REQ_KEYFRAME_SIP_INFO |
                              PJSUA_VID_REQ_KEYFRAME_RTCP_PLI;
@@ -530 +530 @@
 
 #if !PJMEDIA_HAS_VIDEO
-    pj_assert(opt->video_cnt == 0);
+    pj_assert(opt->vid_cnt == 0);
 #endif
 
@@ -542 +542 @@
 
         /* Reinit media channel when media count is changed */
-        if (opt->audio_cnt != old_opt.audio_cnt ||
-            opt->video_cnt != old_opt.video_cnt)
+        if (opt->aud_cnt != old_opt.aud_cnt ||
+            opt->vid_cnt != old_opt.vid_cnt)
         {
             pjsip_role_e role = rem_sdp? PJSIP_ROLE_UAS : PJSIP_ROLE_UAC;
@@ -1599 +1599 @@
     info->rem_offerer   = call->rem_offerer;
     if (call->rem_offerer) {
-        info->rem_audio_cnt = call->rem_aud_cnt;
-        info->rem_video_cnt = call->rem_vid_cnt;
+        info->rem_aud_cnt = call->rem_aud_cnt;
+        info->rem_vid_cnt = call->rem_vid_cnt;
     }