Merge remote-tracking branch 'origin/master' into dev_videoios

Conflicts:
	mediastreamer2
	oRTP

diff --git a/.gitmodules b/.gitmodules
index 0655d8e56ae99aa4cff04291206d981dad996eb7..b3e1551c1da7ceed757f5e76bd9f5c815db9e108 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,4 +3,4 @@
        url = git://git.linphone.org/ortp.git
 [submodule "mediastreamer2"]
        path = mediastreamer2
-       url = git://git.linphone.org/mediastreamer2.git
+       url = gitosis@git.linphone.org:mediastreamer2-private.git

diff --git a/configure.ac b/configure.ac
index 7bafc43935269d9775e75c2fbf133760caaf52da..f99e1dab49d741776281e6776c348135a8f5ba46 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,7 @@ AM_PROG_CC_C_O
 AC_CHECK_PROGS(MD5SUM,[md5sum md5])
 AM_CONDITIONAL(HAVE_MD5SUM,test -n $MD5SUM)
 
-case $target_os in
+case $target in
        *mingw32ce)
                CFLAGS="$CFLAGS -D_WIN32_WCE -DORTP_STATIC -D_WIN32_WINNT=0x0501"
                CXXFLAGS="$CXXFLAGS -DORTP_STATIC -D_WIN32_WINNT=0x0501"
@@ -60,11 +60,18 @@ case $target_os in
                CONSOLE_FLAGS="-mconsole"
                mingw_found=yes
        ;;
-       *darwin*)
+       armv6-apple-darwin|armv7-apple-darwin|i386-apple-darwin)
+                CFLAGS="$CFLAGS -DTARGET_OS_IPHONE "
+                build_tests=no
+                ios_found=yes
+        ;;
+        x86_64-apple-darwin*|i686-apple-darwin*)
+                MSPLUGINS_CFLAGS=""
                dnl use macport installation
                ACLOCAL_MACOS_FLAGS="-I /opt/local/share/aclocal"
                build_macos=yes
-       ;;
+        ;;
+
 esac
 
 AC_SUBST(ACLOCAL_MACOS_FLAGS)
@@ -74,6 +81,7 @@ AC_SUBST(GUI_FLAGS)
 dnl localization tools
 IT_PROG_INTLTOOL([0.40], [no-xml])
 
+AM_CONDITIONAL(BUILD_TESTS,test x$build_tests != xno)
 dnl Initialize libtool
 LT_INIT([win32-dll shared disable-static])
 

diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am
index e9cfe715b70a83da0fbcc8ad972ff28934066d24..316b6f0365ee9835cbb7c5bc6770f67a863d4442 100644 (file)
--- a/coreapi/Makefile.am
+++ b/coreapi/Makefile.am
@@ -50,8 +50,7 @@ liblinphone_la_LIBADD= \
 if BUILD_WIN32
 liblinphone_la_LIBADD+=$(top_builddir)/oRTP/src/libortp.la
 endif
-
-if ENABLE_TESTS
+if BUILD_TESTS
 noinst_PROGRAMS=test_lsd test_ecc
 
 test_lsd_SOURCES=test_lsd.c

diff --git a/coreapi/help/Makefile.am b/coreapi/help/Makefile.am
index 6690fd4a6379842cb90d456afd77afdccf3cd940..a68ab2f19c7cfe0b28d899ad56b42a31ff7bb3bc 100644 (file)
--- a/coreapi/help/Makefile.am
+++ b/coreapi/help/Makefile.am
@@ -34,7 +34,7 @@ clean-local:
 
 if ENABLE_TESTS
 #tutorials
-
+if BUILD_TESTS
 noinst_PROGRAMS=helloworld registration buddy_status chatroom
 
 helloworld_SOURCES=helloworld.c
@@ -60,7 +60,7 @@ LINPHONE_TUTOS+=$(chatroom_SOURCES)
 chatroom_LDADD=$(helloworld_LDADD)
 endif
                                                                                                
-                               
+endif                  
 
 INCLUDES=-I$(top_srcdir)/coreapi \
                $(MEDIASTREAMER_CFLAGS)

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index cce64048ee8d1facb5b68b6073c8f10cc13e502d..12f985c2fbfad2ece7964defc977917bedee4f8e 100644 (file)
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -3507,7 +3507,12 @@ void linphone_core_set_native_preview_window_id(LinphoneCore *lc, unsigned long
 void linphone_core_use_preview_window(LinphoneCore *lc, bool_t yesno){
        lc->use_preview_window=yesno;
 }
-
+/**
+ *returns current device orientation
+ */
+int linphone_core_get_device_rotation(LinphoneCore *lc ) {
+       return lc->device_rotation;
+}
 /**
  * Tells the core the device current orientation. This can be used by capture filters
  * on mobile devices to select between portrait/landscape mode and to produce properly

diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 368746cda3cb783126fef2ea3f6eea0dd5f2e4a9..f7a48215e55f6ceb734aaa74348710b842c3a85c 100644 (file)
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -935,6 +935,7 @@ unsigned long linphone_core_get_native_preview_window_id(const LinphoneCore *lc)
 void linphone_core_set_native_preview_window_id(LinphoneCore *lc, unsigned long id);
 
 void linphone_core_use_preview_window(LinphoneCore *lc, bool_t yesno);
+int linphone_core_get_device_rotation(LinphoneCore *lc );
 void linphone_core_set_device_rotation(LinphoneCore *lc, int rotation);
 
 /*play/record support: use files instead of soundcard*/

diff --git a/coreapi/lsd.c b/coreapi/lsd.c
index f22a5b2072776edf9d465ca1f19743a147143a45..e47023f4ffc94b93e4b7f675ec5c1b956071d670 100644 (file)
--- a/coreapi/lsd.c
+++ b/coreapi/lsd.c
@@ -215,7 +215,7 @@ bool_t lsd_player_loop_enabled(const LsdPlayer *p){
 void lsd_player_set_gain(LsdPlayer *p, float gain){
        MSAudioMixerCtl gainctl;
        gainctl.pin=p->mixer_pin;
-       gainctl.gain=gain;
+       gainctl.param.gain=gain;
        ms_filter_call_method(p->lsd->mixer,MS_AUDIO_MIXER_SET_INPUT_GAIN,&gainctl);
 }
 

diff --git a/mediastreamer2 b/mediastreamer2
index 81d090ad2987cf990161e5e20f3d3f2ce81c12d3..279c7874e94cfd5d8dfc36a0d61eaf6d2acc6f4c 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 81d090ad2987cf990161e5e20f3d3f2ce81c12d3
+Subproject commit 279c7874e94cfd5d8dfc36a0d61eaf6d2acc6f4c

diff --git a/oRTP b/oRTP
index a56d7f752717bea7d92cf63a6d187c2f6361d38b..a4e50eedc1d6b6f8855d1c600b56b116e95c5060 160000 (submodule)
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit a56d7f752717bea7d92cf63a6d187c2f6361d38b
+Subproject commit a4e50eedc1d6b6f8855d1c600b56b116e95c5060