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

Timestamp:

Jan 21, 2014 10:59:25 AM (11 years ago)

Author:

nanang

Message:

Re #1519 [into SVN trunk]: AudioMedia? objects must not be destroyed before unregistered from conf bridge.

File:

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

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

@@ -248 +248 @@
 AudioMediaPlayer::~AudioMediaPlayer()
 {
-    if (playerId != PJSUA_INVALID_ID)
+    if (playerId != PJSUA_INVALID_ID) {
+        unregisterMediaPort();
         pjsua_player_destroy(playerId);
+    }
 }
 
@@ -256 +258 @@
                                     throw(Error)
 {
+    if (playerId != PJSUA_INVALID_ID) {
+        PJSUA2_RAISE_ERROR(PJ_EEXISTS);
+    }
+
     pj_str_t pj_name = str2Pj(file_name);
 
@@ -273 +279 @@
                                       throw(Error)
 {
+    if (playerId != PJSUA_INVALID_ID) {
+        PJSUA2_RAISE_ERROR(PJ_EEXISTS);
+    }
+
     pj_str_t pj_files[MAX_FILE_NAMES];
     unsigned i, count = 0;
@@ -318 +328 @@
 AudioMediaRecorder::~AudioMediaRecorder()
 {
-    if (recorderId != PJSUA_INVALID_ID)
+    if (recorderId != PJSUA_INVALID_ID) {
+        unregisterMediaPort();
         pjsua_recorder_destroy(recorderId);
+    }
 }
 
@@ -329 +341 @@
 {
     PJ_UNUSED_ARG(max_size);
+
+    if (recorderId != PJSUA_INVALID_ID) {
+        PJSUA2_RAISE_ERROR(PJ_EEXISTS);
+    }
 
     pj_str_t pj_name = str2Pj(file_name);