Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated linphone

Browse source
This commit is contained in:
Sylvain Berfini 2014-03-06 10:56:14 +01:00
parent 81f51960e6
commit 37177cd0c5
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
res/raw/incoming_chat.wav Normal file
View file

Binary file not shown.

5
src/org/linphone/LinphoneManager.java
View file

@ -71,6 +71,7 @@ import org.linphone.core.PayloadType;
import org.linphone.core.PresenceActivityType; import org.linphone.core.PresenceActivityType;
import org.linphone.core.PresenceModel; import org.linphone.core.PresenceModel;
import org.linphone.core.PublishState; import org.linphone.core.PublishState;
import org.linphone.core.Reason;
import org.linphone.core.SubscriptionState; import org.linphone.core.SubscriptionState;
import org.linphone.mediastream.Log; import org.linphone.mediastream.Log;
import org.linphone.mediastream.Version; import org.linphone.mediastream.Version;
@ -183,6 +184,7 @@ public class LinphoneManager implements LinphoneCoreListener {
mRingbackSoundFile = basePath + "/ringback.wav"; mRingbackSoundFile = basePath + "/ringback.wav";
mPauseSoundFile = basePath + "/toy_mono.wav"; mPauseSoundFile = basePath + "/toy_mono.wav";
mChatDatabaseFile = basePath + "/linphone-history.db"; mChatDatabaseFile = basePath + "/linphone-history.db";
mErrorToneFile = basePath + "/error_tone.wav";
mPrefs = LinphonePreferences.instance(); mPrefs = LinphonePreferences.instance();
mAudioManager = ((AudioManager) c.getSystemService(Context.AUDIO_SERVICE)); mAudioManager = ((AudioManager) c.getSystemService(Context.AUDIO_SERVICE));
@ -203,6 +205,7 @@ public class LinphoneManager implements LinphoneCoreListener {
private final String mRingbackSoundFile; private final String mRingbackSoundFile;
private final String mPauseSoundFile; private final String mPauseSoundFile;
private final String mChatDatabaseFile; private final String mChatDatabaseFile;
private final String mErrorToneFile;
private Timer mTimer; private Timer mTimer;
@ -634,6 +637,7 @@ public class LinphoneManager implements LinphoneCoreListener {
mLc.setRootCA(mLinphoneRootCaFile); mLc.setRootCA(mLinphoneRootCaFile);
mLc.setPlayFile(mPauseSoundFile); mLc.setPlayFile(mPauseSoundFile);
mLc.setChatDatabasePath(mChatDatabaseFile); mLc.setChatDatabasePath(mChatDatabaseFile);
//mLc.setCallErrorTone(Reason.NotFound, mErrorToneFile);
int availableCores = Runtime.getRuntime().availableProcessors(); int availableCores = Runtime.getRuntime().availableProcessors();
Log.w("MediaStreamer : " + availableCores + " cores detected and configured"); Log.w("MediaStreamer : " + availableCores + " cores detected and configured");
@ -662,6 +666,7 @@ public class LinphoneManager implements LinphoneCoreListener {
copyIfNotExist(R.raw.oldphone_mono, mRingSoundFile); copyIfNotExist(R.raw.oldphone_mono, mRingSoundFile);
copyIfNotExist(R.raw.ringback, mRingbackSoundFile); copyIfNotExist(R.raw.ringback, mRingbackSoundFile);
copyIfNotExist(R.raw.toy_mono, mPauseSoundFile); copyIfNotExist(R.raw.toy_mono, mPauseSoundFile);
copyIfNotExist(R.raw.incoming_chat, mErrorToneFile);
copyIfNotExist(R.raw.linphonerc_default, mLinphoneConfigFile); copyIfNotExist(R.raw.linphonerc_default, mLinphoneConfigFile);
copyFromPackage(R.raw.linphonerc_factory, new File(mLinphoneFactoryConfigFile).getName()); copyFromPackage(R.raw.linphonerc_factory, new File(mLinphoneFactoryConfigFile).getName());
copyIfNotExist(R.raw.lpconfig, mLPConfigXsd); copyIfNotExist(R.raw.lpconfig, mLPConfigXsd);

2
submodules/linphone

@ -1 +1 @@
Subproject commit 972659a1f903af87bb35a5a6d937e2b5b58b3cd7 Subproject commit aad2df16d1945abd71bef720d079515383cf88d4