Changeset 6074 for pjproject/trunk/pjsip/src/pjsua2/media.cpp

Timestamp:

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

Author:

riza

Message:

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

File:

• pjproject/trunk/pjsip/src/pjsua2/media.cpp (modified) (6 diffs)

pjproject/trunk/pjsip/src/pjsua2/media.cpp

@@ -749 +749 @@
 }
 
+#if !DEPRECATED_FOR_TICKET_2232
 const AudioDevInfoVector &AudDevManager::enumDev() PJSUA2_THROW(Error)
 {
@@ -766 +767 @@
     return audioDevList;
 }
+#endif
 
 AudioDevInfoVector2 AudDevManager::enumDev2() const PJSUA2_THROW(Error)
@@ -1084 +1086 @@
 void AudDevManager::clearAudioDevList()
 {
+#if !DEPRECATED_FOR_TICKET_2232
     for(unsigned i=0;i<audioDevList.size();++i) {
         delete audioDevList[i];
     }
     audioDevList.clear();
+#endif
 }
 
@@ -1481 +1485 @@
 }
 
+#if !DEPRECATED_FOR_TICKET_2232
 const VideoDevInfoVector &VidDevManager::enumDev() PJSUA2_THROW(Error)
 {
@@ -1500 +1505 @@
     return videoDevList;
 }
+#endif
 
 VideoDevInfoVector2 VidDevManager::enumDev2() const PJSUA2_THROW(Error)
@@ -1666 +1672 @@
 void VidDevManager::clearVideoDevList()
 {
-#if PJSUA_HAS_VIDEO
+#if PJSUA_HAS_VIDEO && !DEPRECATED_FOR_TICKET_2232
     for (unsigned i = 0;i<videoDevList.size();++i) {
         delete videoDevList[i];