From 38aec9fc0529b7b5e350a6cb3e6cbbc315849f7c Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Tue, 16 Nov 2010 08:57:47 +0100
Subject: [PATCH] fix tutorial linphonecore.h includes fix wrong mediastreamer2
 ref

---
 coreapi/help/buddy_status.c |  4 ++++
 coreapi/help/chatroom.c     |  4 ++++
 coreapi/help/helloworld.c   | 12 +++++++++---
 coreapi/help/registration.c |  4 ++++
 mediastreamer2              |  2 +-
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/coreapi/help/buddy_status.c b/coreapi/help/buddy_status.c
index 1032cf17b..379122974 100644
--- a/coreapi/help/buddy_status.c
+++ b/coreapi/help/buddy_status.c
@@ -33,7 +33,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  */
 
+#ifdef IN_LINPHONE
 #include "linphonecore.h"
+#else
+#include "linphone/linphonecore.h"
+#endif
 
 #include <signal.h>
 
diff --git a/coreapi/help/chatroom.c b/coreapi/help/chatroom.c
index 448b9ca13..51fc4a237 100644
--- a/coreapi/help/chatroom.c
+++ b/coreapi/help/chatroom.c
@@ -32,7 +32,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  */
 
+#ifdef IN_LINPHONE
 #include "linphonecore.h"
+#else
+#include "linphone/linphonecore.h"
+#endif
 
 #include <signal.h>
 
diff --git a/coreapi/help/helloworld.c b/coreapi/help/helloworld.c
index ce874d6dc..f3b3c9752 100644
--- a/coreapi/help/helloworld.c
+++ b/coreapi/help/helloworld.c
@@ -27,8 +27,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
  @include helloworld.c
  */
-
-#include <linphonecore.h>
+#ifdef IN_LINPHONE
+#include "linphonecore.h"
+#else
+#include "linphone/linphonecore.h"
+#endif
 
 #include <signal.h>
 
@@ -78,7 +81,10 @@ int main(int argc, char *argv[]){
 	}
 
 	signal(SIGINT,stop);
-	
+
+#ifdef DEBUG
+	linphone_core_enable_logs(NULL); /*enable liblinphone logs.*/
+#endif
 	/* 
 	 Fill the LinphoneCoreVTable with application callbacks.
 	 All are optional. Here we only use the call_state_changed callbacks
diff --git a/coreapi/help/registration.c b/coreapi/help/registration.c
index 1d22e2d47..6ed93e70d 100644
--- a/coreapi/help/registration.c
+++ b/coreapi/help/registration.c
@@ -33,7 +33,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  */
 
+#ifdef IN_LINPHONE
 #include "linphonecore.h"
+#else
+#include "linphone/linphonecore.h"
+#endif
 
 #include <signal.h>
 
diff --git a/mediastreamer2 b/mediastreamer2
index 7ec60743d..ffacf5671 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 7ec60743dfffefc49cc83e47f0eff0ec7928d83a
+Subproject commit ffacf56718c198cb80a290f7a65975916d8a9b6b