Changeset 6074 for pjproject/trunk/pjsip/include/pjsua2/endpoint.hpp

Timestamp:

Sep 23, 2019 10:47:05 PM (4 years ago)

Author:

riza

Message:

Close #2232: Crash on Endpoint::libDestroy() when there is an active call.

File:

• pjproject/trunk/pjsip/include/pjsua2/endpoint.hpp (modified) (7 diffs)

pjproject/trunk/pjsip/include/pjsua2/endpoint.hpp

@@ -1389 +1389 @@
     unsigned mediaActivePorts() const;
 
+#if !DEPRECATED_FOR_TICKET_2232
     /**
      * Warning: deprecated, use mediaEnumPorts2() instead. This function is
@@ -1398 +1399 @@
      */
     const AudioMediaVector &mediaEnumPorts() const PJSUA2_THROW(Error);
+#endif
 
     /**
@@ -1431 +1433 @@
      */
 
+#if !DEPRECATED_FOR_TICKET_2232
     /**
      * Warning: deprecated, use codecEnum2() instead. This function is not
@@ -1440 +1443 @@
      */
     const CodecInfoVector &codecEnum() PJSUA2_THROW(Error);
+#endif
 
     /**
@@ -1482 +1486 @@
                        const CodecParam param) PJSUA2_THROW(Error);
 
+#if !DEPRECATED_FOR_TICKET_2232
     /**
      * Warning: deprecated, use videoCodecEnum2() instead. This function is
@@ -1491 +1496 @@
      */
     const CodecInfoVector &videoCodecEnum() PJSUA2_THROW(Error);
+#endif
 
     /**
@@ -1662 +1668 @@
     static Endpoint             *instance_;     // static instance
     LogWriter                   *writer;        // Custom writer, if any
-    AudioMediaVector             mediaList;
     AudDevManager                audioDevMgr;
     VidDevManager                videoDevMgr;
+#if !DEPRECATED_FOR_TICKET_2232
     CodecInfoVector              codecInfoList;
     CodecInfoVector              videoCodecInfoList;
+#endif
     std::map<pj_thread_t*, pj_thread_desc*> threadDescMap;
     pj_mutex_t                  *threadDescMutex;
+#if !DEPRECATED_FOR_TICKET_2232
+    AudioMediaVector             mediaList;
     pj_mutex_t                  *mediaListMutex;
+#endif
 
     /* Pending logging */