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

Fix hack to workaround Galaxy S speaker/mic issue.

Browse source
This commit is contained in:
Guillaume Beraudo 2011-08-05 16:15:59 +02:00
parent 8432509fae
commit 54ef1fce4a
2 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -144,15 +144,12 @@ public final class LinphoneManager implements LinphoneCoreListener {
private BroadcastReceiver mKeepAliveReceiver = new KeepAliveReceiver(); private BroadcastReceiver mKeepAliveReceiver = new KeepAliveReceiver();
private synchronized void routeAudioToSpeakerHelper(boolean speakerOn) { private native void hackSpeakerState(boolean speakerOn);
LinphoneCall call = mLc.getCurrentCall(); @SuppressWarnings("unused")
boolean paused = false; private static void sRouteAudioToSpeakerHelperHelper(boolean speakerOn) {
if (call != null && call.getState() == State.StreamsRunning && Hacks.needPausingCallForSpeakers()) { getInstance().routeAudioToSpeakerHelperHelper(speakerOn);
Log.d("Hack pausing call to have speaker=",speakerOn); }
mLc.pauseCall(call); private void routeAudioToSpeakerHelperHelper(boolean speakerOn) {
paused = true;
}
if (Hacks.needGalaxySAudioHack() || lpm.useGalaxySHack()) if (Hacks.needGalaxySAudioHack() || lpm.useGalaxySHack())
setAudioModeIncallForGalaxyS(); setAudioModeIncallForGalaxyS();
@ -167,13 +164,18 @@ public final class LinphoneManager implements LinphoneCoreListener {
} else { } else {
mAudioManager.setSpeakerphoneOn(speakerOn); mAudioManager.setSpeakerphoneOn(speakerOn);
} }
}
if (paused) { private synchronized void routeAudioToSpeakerHelper(boolean speakerOn) {
Log.d("Hack resuming call to have speaker=",speakerOn); final LinphoneCall call = mLc.getCurrentCall();
mLc.resumeCall(call); if (call != null && call.getState() == State.StreamsRunning && Hacks.needPausingCallForSpeakers()) {
Log.d("Hack to have speaker=",speakerOn," while on call");
hackSpeakerState(speakerOn);
} else {
routeAudioToSpeakerHelperHelper(speakerOn);
} }
} }
public void routeAudioToSpeaker() { public void routeAudioToSpeaker() {
routeAudioToSpeakerHelper(true); routeAudioToSpeakerHelper(true);
if (mLc.isIncall()) { if (mLc.isIncall()) {

2
submodules/linphone

@ -1 +1 @@
Subproject commit 743ef7d0cf511161ff4c2300315df775e601bae3 Subproject commit 68df42b2924930043bbf466b0c6eab1409fb6c3e