fix tutorial linphonecore.h includes

fix wrong mediastreamer2 ref

diff --git a/coreapi/help/buddy_status.c b/coreapi/help/buddy_status.c
index 1032cf17b0ce0b4997f45e355f75b31a4f90a80c..3791229742e030436db382c8e524c5ce7859b76c 100644 (file)
--- 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 448b9ca1337200ad23d9d5f99ff08de34de46173..51fc4a237b02bfe7622cd8a5642776518bc390de 100644 (file)
--- 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 ce874d6dc093051cdfc372e37d292349752cbd97..f3b3c975294b8834c4daa1ca7399110f654af1e3 100644 (file)
--- 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 1d22e2d47e0afdf38a7722b84227069f31bb59c6..6ed93e70da9729dce7884bdab81183395fff879d 100644 (file)
--- 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 7ec60743dfffefc49cc83e47f0eff0ec7928d83a..ffacf56718c198cb80a290f7a65975916d8a9b6b 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 7ec60743dfffefc49cc83e47f0eff0ec7928d83a
+Subproject commit ffacf56718c198cb80a290f7a65975916d8a9b6b