Changeset 4670 for pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/call.cpp

Timestamp:

Dec 4, 2013 2:38:20 AM (10 years ago)

Author:

nanang

Message:

Misc update & fix:

• added new files (call & media) to VS2005 project
• fixed compile warnings
• fixed compile error when video is disabled
• fixed Makefile when JAVA_HOME env var is set

File:

• pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/call.cpp (modified) (6 diffs)

pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/call.cpp

@@ -172 +172 @@
 CallVidSetStreamParam::CallVidSetStreamParam()
 {
+#if PJSUA_HAS_VIDEO
     pjsua_call_vid_strm_op_param prm;
     
@@ -178 +179 @@
     this->dir    = prm.dir;
     this->capDev = prm.cap_dev;
+#endif
 }
 
@@ -242 +244 @@
 void CallInfo::fromPj(const pjsua_call_info &pci)
 {
-    int mi;
+    unsigned mi;
     
     id                  = pci.id;
     role                = pci.role;
     accId               = pci.acc_id;
-    localURI            = pj2Str(pci.local_info);
+    localUri            = pj2Str(pci.local_info);
     localContact        = pj2Str(pci.local_contact);
-    remoteURI           = pj2Str(pci.remote_info);
+    remoteUri           = pj2Str(pci.remote_info);
     remoteContact       = pj2Str(pci.remote_contact);
     callIdString        = pj2Str(pci.call_id);
@@ -259 +261 @@
     connectDuration.fromPj(pci.connect_duration);
     totalDuration.fromPj(pci.total_duration);
-    remOfferer          = pci.rem_offerer;
+    remOfferer          = PJ2BOOL(pci.rem_offerer);
     remAudioCount       = pci.rem_aud_cnt;
     remVideoCount       = pci.rem_vid_cnt;
@@ -606 +608 @@
     return pjsua_call_vid_stream_is_running(id, med_idx, dir);
 #else
+    PJ_UNUSED_ARG(med_idx);
+    PJ_UNUSED_ARG(dir);
     return false;
 #endif
@@ -621 +625 @@
     PJSUA2_CHECK_EXPR( pjsua_call_set_vid_strm(id, op, &prm) );
 #else
-    PJSUA2_RAISE_ERROR(PJ_EINVOP);
+    PJ_UNUSED_ARG(op);
+    PJ_UNUSED_ARG(param);
+    PJSUA2_RAISE_ERROR(PJ_EINVALIDOP);
 #endif
 }