Changeset 3841 for pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h

Timestamp:

Oct 24, 2011 9:28:13 AM (12 years ago)

Author:

ming

Message:

Re #1395: Backport of PJSIP 1.x branch into PJSIP 2.0 trunk

• Backport of r3557:r3832

TODO: ticket #1268 (Option for automatic/manual sending of RTCP SDES/BYE for the stream) for video stream.

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjsip/include/pjsua-lib/pjsua_internal.h (modified) (6 diffs)

pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h

@@ -44 +44 @@
     unsigned             idx;       /**< This media index in parent call.   */
     pjsua_call_media_status state;  /**< Media state.                       */
+    pjsua_call_media_status prev_state;/**< Previous media state.           */
     pjmedia_dir          dir;       /**< Media direction.                   */
 
@@ -79 +80 @@
     pj_bool_t            tp_auto_del; /**< May delete media transport       */
     pjsua_med_tp_st      tp_st;     /**< Media transport state              */
+    pj_bool_t            use_custom_med_tp;/**< Use custom media transport? */
     pj_sockaddr          rtp_addr;  /**< Current RTP source address
                                             (used to update ICE default
@@ -131 +133 @@
     pjsua_call_hold_type call_hold_type; /**< How to do call hold.          */
     pj_bool_t            local_hold;/**< Flag for call-hold by local.       */
+    void                *hold_msg;  /**< Outgoing hold tx_data.             */
 
     unsigned             med_cnt;   /**< Number of media in SDP.            */
@@ -581 +584 @@
  * Shutdown presence.
  */
-void pjsua_pres_shutdown(void);
+void pjsua_pres_shutdown(unsigned flags);
 
 /**
@@ -596 +599 @@
  *  Send un-PUBLISH
  */
-void pjsua_pres_unpublish(pjsua_acc *acc);
+void pjsua_pres_unpublish(pjsua_acc *acc, unsigned flags);
 
 /**
  * Terminate server subscription for the account 
  */
-void pjsua_pres_delete_acc(int acc_id);
+void pjsua_pres_delete_acc(int acc_id, unsigned flags);
 
 /**
@@ -636 +639 @@
  * Destroy pjsua media subsystem.
  */
-pj_status_t pjsua_media_subsys_destroy(void);
+pj_status_t pjsua_media_subsys_destroy(unsigned flags);
 
 /**