keep sending streams when put on hold by remote

diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index cb9999a0180e05730b6bc9b21ec71fe23d168798..ff155b6ddcef2f8855952647af95f28a2809c057 100644 (file)
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -248,7 +248,8 @@ static void call_updated(SalOp *op){
                                lc->vtable.display_status(lc,"we have been resumed...");
                        call->state = LinphoneCallAVRunning;
                        lc->vtable.resumed_recv(lc,call);
-                       linphone_core_start_media_streams(lc,call);
+                       //we have to keep sending when holded
+                       //linphone_core_start_media_streams(lc,call);
                }
                else if( (call->state != LinphoneCallPaused) && !strcmp(call->resultdesc->addr,"0.0.0.0"))
                {
@@ -256,11 +257,14 @@ static void call_updated(SalOp *op){
                                lc->vtable.display_status(lc,"we have been paused...");
                        call->state = LinphoneCallPaused;
                        lc->vtable.paused_recv(lc,call);
+                       //we have to keep sending when holded
+                       /*
                        if(call == linphone_core_get_current_call(lc))
                        {
                                linphone_core_stop_media_streams(lc,call);
                                linphone_core_init_media_streams(lc,call);
                        }
+                       */
                }
                else
                {

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 5a85e7efafcc6758dace7e3996174606b24846e6..060de0a0e1845a88edc94ea5b2fd75a1fc5af52f 100644 (file)
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -18,7 +18,9 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-
+#ifdef WIN32
+#include <time.h>
+#endif
 #include "linphonecore.h"
 #include "sipsetup.h"
 #include "lpconfig.h"

diff --git a/mediastreamer2 b/mediastreamer2
index f315bd22ffbbe9a07d079c2859ea67e831f94e52..4882634280c82ca495d5bebec482d2744ddb7f61 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit f315bd22ffbbe9a07d079c2859ea67e831f94e52
+Subproject commit 4882634280c82ca495d5bebec482d2744ddb7f61

diff --git a/oRTP b/oRTP
index 92c452dcd38b26a0ce41d10be9a32d37f72a7d27..ba73b8155b3a6aa64f8df95dee6b25ca9b95cbca 160000 (submodule)
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 92c452dcd38b26a0ce41d10be9a32d37f72a7d27
+Subproject commit ba73b8155b3a6aa64f8df95dee6b25ca9b95cbca