update linphone & sip stack for info api reworked

This commit is contained in:
Simon Morlat 2013-06-06 21:41:45 +02:00
parent 9403a6aaea
commit 36eb0649ce
4 changed files with 9 additions and 5 deletions

6
README
View file

@ -5,11 +5,15 @@ To build liblinphone for Android, you must:
0) download the Android sdk with platform-tools and tools updated to latest revision (at least API 16 is needed), then add both 'tools' and 'platform-tools' folders in your path. 0) download the Android sdk with platform-tools and tools updated to latest revision (at least API 16 is needed), then add both 'tools' and 'platform-tools' folders in your path.
1) download the Android ndk (>=r8b) from google and add it to your path. 1) download the Android ndk (>=r8b) from google and add it to your path.
2) install the autotools: autoconf, automake, aclocal, libtoolize, pkgconfig 2) install the autotools: autoconf, automake, aclocal, libtoolize, pkgconfig
2bis) on some 64 bits systems you'll need the ia32-libs package On 64 bits linux systems you'll need the ia32-libs package
3) run the Makefile script in the top level directory. This will download iLBC source files and convert some assembly files in VP8 project. 3) run the Makefile script in the top level directory. This will download iLBC source files and convert some assembly files in VP8 project.
$ make $ make
4) To install the generated apk into a plugged device, run 4) To install the generated apk into a plugged device, run
$ make install $ make install
5) (Optional) To generate a liblinphone SDK zip containing a full jar and native libraries, run
$ make generate-sdk
To run the tutorials: To run the tutorials:
1) open the res/values/non_localizable_custom.xml file and change the value of the show_tutorials_instead_of_app to true. 1) open the res/values/non_localizable_custom.xml file and change the value of the show_tutorials_instead_of_app to true.

View file

@ -1712,8 +1712,8 @@ public final class LinphoneManager implements LinphoneCoreListener {
} }
@Override @Override
public void infoReceived(LinphoneCore lc, LinphoneInfoMessage info) { public void infoReceived(LinphoneCore lc, LinphoneCall call, LinphoneInfoMessage info) {
Log.d("Info message received from "+info.getFrom()); Log.d("Info message received from "+call.getRemoteAddress().asString());
LinphoneContent ct=info.getContent(); LinphoneContent ct=info.getContent();
if (ct!=null){ if (ct!=null){
Log.d("Info received with body with mime type "+ct.getType()+"/"+ct.getSubtype()+" and data ["+ct.getDataAsString()+"]"); Log.d("Info received with body with mime type "+ct.getType()+"/"+ct.getSubtype()+" and data ["+ct.getDataAsString()+"]");

@ -1 +1 @@
Subproject commit 81b4695a7720331d13a8fe5a7175071b10f52eb7 Subproject commit ab0f6d5a313b953ec84de9e613cbd6aa98ebff9b

@ -1 +1 @@
Subproject commit 2b03816684178a07b8719d4079dd5dc86b9442a7 Subproject commit 8c3fd2d4325fe1be53e3fb26a07afa52f0361a10