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

Use new CaptureTextureView instead of removed AutoFitTextureView

Browse source
This commit is contained in:
Sylvain Berfini 2019-09-11 14:17:46 +02:00
parent 3506264347
commit c03a30d8a9
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/org/linphone/utils/AndroidAudioManager.java
View file

@ -65,6 +65,7 @@ public class AndroidAudioManager {
private BluetoothHeadset mBluetoothHeadset; private BluetoothHeadset mBluetoothHeadset;
private BluetoothReceiver mBluetoothReceiver; private BluetoothReceiver mBluetoothReceiver;
private HeadsetReceiver mHeadsetReceiver; private HeadsetReceiver mHeadsetReceiver;
private boolean mHeadsetReceiverRegistered;
private boolean mIsRinging; private boolean mIsRinging;
private boolean mAudioFocused; private boolean mAudioFocused;
@ -79,6 +80,7 @@ public class AndroidAudioManager {
mAudioManager = ((AudioManager) context.getSystemService(Context.AUDIO_SERVICE)); mAudioManager = ((AudioManager) context.getSystemService(Context.AUDIO_SERVICE));
mVibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE); mVibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
mEchoTesterIsRunning = false; mEchoTesterIsRunning = false;
mHeadsetReceiverRegistered = false;
startBluetooth(); startBluetooth();
@ -131,6 +133,7 @@ public class AndroidAudioManager {
} }
} }
// Only register this one when a call is active // Only register this one when a call is active
enableHeadsetReceiver(); enableHeadsetReceiver();
} }
} else if (state == Call.State.End || state == Call.State.Error) { } else if (state == Call.State.End || state == Call.State.Error) {
@ -148,9 +151,10 @@ public class AndroidAudioManager {
} }
// Only register this one when a call is active // Only register this one when a call is active
if (mHeadsetReceiver != null) { if (mHeadsetReceiver != null && mHeadsetReceiverRegistered) {
Log.i("[Audio Manager] Unregistering headset receiver"); Log.i("[Audio Manager] Unregistering headset receiver");
mContext.unregisterReceiver(mHeadsetReceiver); mContext.unregisterReceiver(mHeadsetReceiver);
mHeadsetReceiverRegistered = false;
} }
TelephonyManager tm = TelephonyManager tm =
@ -595,5 +599,6 @@ public class AndroidAudioManager {
mHeadsetReceiver, new IntentFilter(AudioManager.ACTION_AUDIO_BECOMING_NOISY)); mHeadsetReceiver, new IntentFilter(AudioManager.ACTION_AUDIO_BECOMING_NOISY));
mContext.registerReceiver( mContext.registerReceiver(
mHeadsetReceiver, new IntentFilter(AudioManager.ACTION_HEADSET_PLUG)); mHeadsetReceiver, new IntentFilter(AudioManager.ACTION_HEADSET_PLUG));
mHeadsetReceiverRegistered = true;
} }
} }

2
app/src/main/res/layout-land/call.xml
View file

@ -20,7 +20,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent" />
<org.linphone.core.tools.AutoFitTextureView <org.linphone.mediastream.video.capture.CaptureTextureView
android:id="@+id/local_preview_texture" android:id="@+id/local_preview_texture"
android:layout_width="200dp" android:layout_width="200dp"
android:layout_height="200dp" android:layout_height="200dp"

2
app/src/main/res/layout/call.xml
View file

@ -20,7 +20,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"/> android:layout_height="match_parent"/>
<org.linphone.core.tools.AutoFitTextureView <org.linphone.mediastream.video.capture.CaptureTextureView
android:id="@+id/local_preview_texture" android:id="@+id/local_preview_texture"
android:layout_width="200dp" android:layout_width="200dp"
android:layout_height="200dp" android:layout_height="200dp"