Changeset 6112 for pjproject/trunk/pjsip/include/pjsua2/media.hpp

Timestamp:

Nov 29, 2019 4:21:17 AM (5 years ago)

Author:

ming

Message:

Fixed #2251: Deadlock between PJSUA LOCK and conference mutex

File:

• pjproject/trunk/pjsip/include/pjsua2/media.hpp (modified) (3 diffs)

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

@@ -549 +549 @@
      */
 
+
+/* Unfortunately for pjsua2, a hard deprecation is inevitable. */
+#if 0 // !DEPRECATED_FOR_TICKET_2251
     /**
      * Register a callback to be called when the file player reading has
@@ -563 +566 @@
     virtual bool onEof()
     { return true; }
-
+#endif
+
+    /**
+     * Register a callback to be called when the file player reading has
+     * reached the end of file, or when the file reading has reached the
+     * end of file of the last file for a playlist. If the file or playlist
+     * is set to play repeatedly, then the callback will be called multiple
+     * times.
+     *
+     * If application wishes to stop the playback, it can stop the media
+     * transmission in the callback, and only after all transmissions have
+     * been stopped, could the application safely destroy the player.
+     */
+    virtual void onEof2()
+    { }
 
 private:
@@ -574 +591 @@
      *  Low level PJMEDIA callback
      */
-    static pj_status_t eof_cb(pjmedia_port *port,
-                              void *usr_data);
+    static void eof_cb(pjmedia_port *port,
+                       void *usr_data);
 };