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

Merge branch 'video' of git.linphone.org:linphone-android-private into video

Browse source 
Conflicts:
	src/org/linphone/core/AndroidCameraRecord.java
This commit is contained in:
Guillaume Beraudo 2010-11-29 12:12:12 +01:00
commit 966ec96f82
8 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
AndroidManifest.xml
View file

@ -68,7 +68,8 @@
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name=".VideoCallActivity" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"> <activity android:name=".VideoCallActivity" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:screenOrientation="nosensor">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
</intent-filter> </intent-filter>

BIN
libs/armeabi-v7a/liblinphone.so
View file

Binary file not shown.

BIN
libs/armeabi/liblinphone.so
View file

Binary file not shown.

2
src/org/linphone/LinphoneService.java
View file

@ -393,7 +393,7 @@ public class LinphoneService extends Service implements LinphoneCoreListener {
//init network state //init network state
ConnectivityManager lConnectivityManager = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); ConnectivityManager lConnectivityManager = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo lInfo = lConnectivityManager.getActiveNetworkInfo(); NetworkInfo lInfo = lConnectivityManager.getActiveNetworkInfo();
mLinphoneCore.setNetworkStateReachable( lInfo !=null? lConnectivityManager.getActiveNetworkInfo().getState() ==NetworkInfo.State.CONNECTED:false); mLinphoneCore.setNetworkReachable( lInfo !=null? lConnectivityManager.getActiveNetworkInfo().getState() ==NetworkInfo.State.CONNECTED:false);
} catch (LinphoneCoreException e) { } catch (LinphoneCoreException e) {
throw new LinphoneConfigException(getString(R.string.wrong_settings),e); throw new LinphoneConfigException(getString(R.string.wrong_settings),e);

4
src/org/linphone/NetworkManager.java
View file

@ -40,9 +40,9 @@ public class NetworkManager extends BroadcastReceiver {
return; return;
} }
if (lNoConnectivity| ((lNetworkInfo.getState() == NetworkInfo.State.DISCONNECTED) /*&& !lIsFailOver*/)) { if (lNoConnectivity| ((lNetworkInfo.getState() == NetworkInfo.State.DISCONNECTED) /*&& !lIsFailOver*/)) {
LinphoneService.instance().getLinphoneCore().setNetworkStateReachable(false); LinphoneService.instance().getLinphoneCore().setNetworkReachable(false);
} else if (lNetworkInfo.getState() == NetworkInfo.State.CONNECTED){ } else if (lNetworkInfo.getState() == NetworkInfo.State.CONNECTED){
LinphoneService.instance().getLinphoneCore().setNetworkStateReachable(true); LinphoneService.instance().getLinphoneCore().setNetworkReachable(true);
} else { } else {
//unhandled event //unhandled event
} }

1
src/org/linphone/core/AndroidVideoWindowImpl.java
View file

@ -80,3 +80,4 @@ public class AndroidVideoWindowImpl {
} }
} }

13
src/org/linphone/core/LinphoneCoreImpl.java
View file

@ -200,7 +200,7 @@ class LinphoneCoreImpl implements LinphoneCore {
throw new RuntimeException("object already destroyed"); throw new RuntimeException("object already destroyed");
} }
} }
public void setNetworkStateReachable(boolean isReachable) { public void setNetworkReachable(boolean isReachable) {
setNetworkStateReachable(nativePtr,isReachable); setNetworkStateReachable(nativePtr,isReachable);
} }
public void setPlaybackGain(float gain) { public void setPlaybackGain(float gain) {
@ -385,9 +385,6 @@ class LinphoneCoreImpl implements LinphoneCore {
return updateCall(nativePtr, ptrCall, ptrParams); return updateCall(nativePtr, ptrCall, ptrParams);
} }
<<<<<<< HEAD
public void setUploadBandwidth(int bw) { public void setUploadBandwidth(int bw) {
setUploadBandwidth(nativePtr, bw); setUploadBandwidth(nativePtr, bw);
} }
@ -406,14 +403,16 @@ class LinphoneCoreImpl implements LinphoneCore {
VideoSize vSize = new VideoSize(); VideoSize vSize = new VideoSize();
vSize.setWidth(nativeSize[0]); vSize.setWidth(nativeSize[0]);
vSize.setHeight(nativeSize[1]); vSize.setHeight(nativeSize[1]);
return vSize; return vSize;
======= }
public void setRing(String path) { public void setRing(String path) {
setRing(nativePtr, path); setRing(nativePtr, path);
} }
public String getRing() { public String getRing() {
return getRing(nativePtr); return getRing(nativePtr);
>>>>>>> c95431295dc09c5558d38c6de49fa071c957d926 }
public boolean isNetworkReachable() {
// TODO Auto-generated method stub
return false;
} }
} }

2
submodules/linphone

@ -1 +1 @@
Subproject commit a9db49b15aee38098d23086fd574adb99a1afda3 Subproject commit a5d821c32ea57fa44d8cec86ca0d9b805a3b3f4a