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

Merge branch 'master' of git.linphone.org:linphone-android

Browse source
This commit is contained in:
Simon Morlat 2011-01-27 12:10:14 +01:00
commit d4d50e0ba4
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/org/linphone/core/AndroidCameraConf.java
View file

@ -25,13 +25,13 @@ import android.util.Log;
public class AndroidCameraConf {
private static final String tag = "Linphone";
public void findFrontAndRearCameraIds(Integer frontCameraId, Integer rearCameraId, Integer cameraId) {
public void findFrontAndRearCameraIds(int[] frontCameraId, int[] rearCameraId, int[] cameraId) {
Log.i(tag, "Detecting cameras");
if (Hacks.isGalaxyS()) {
Log.d(tag, "Hack Galaxy S : has 2 cameras front=2; rear=1");
frontCameraId = 2;
rearCameraId = 1;
cameraId = rearCameraId;
frontCameraId[0] = 2;
rearCameraId[0] = 1;
cameraId[0] = rearCameraId[0];
return;
}

4
src/org/linphone/core/AndroidCameraRecordManager.java
View file

@ -69,9 +69,9 @@ public class AndroidCameraRecordManager {
private AndroidCameraRecordManager() {
cc = Version.sdkAbove(9) ? new AndroidCameraConf9() : new AndroidCameraConf();
Integer fId = -1;Integer rId = -1;Integer cId = -1;
int[] fId = {-1};int[] rId = {-1};int[] cId = {-1};
cc.findFrontAndRearCameraIds(fId, rId, cId);
frontCameraId=fId;rearCameraId=rId;cameraId=cId;
frontCameraId=fId[0];rearCameraId=rId[0];cameraId=cId[0];
}