make headset detection optional

vlc-android/res/values-fr/strings.xml

@@ -57,4 +57,6 @@
     <string name="enable_iomx">Activer le décodage matériel</string>
     <string name="advanced_debugging">Débogage avancé</string>
     <string name="quit">Quitter l\'application</string>
+    <string name="detect_headset">Détecter le casque</string>
+    <string name="detect_headset_detail">Pause lors du débranchement du casque, Reprise lors du branchement du casque</string>
 </resources>

vlc-android/res/values/strings.xml

@@ -59,4 +59,6 @@
     <string name="enable_iomx">Enable hardware accelerated decoding</string>
     <string name="advanced_debugging">Advanced Debugging</string>
     <string name="quit">Quit Application</string>
+    <string name="detect_headset">Detect headset</string>
+    <string name="detect_headset_detail">Pause on headset removed, Resume on headset inserted</string>
 </resources>

vlc-android/res/xml/preferences.xml

@@ -24,6 +24,11 @@
             android:key="enable_iomx"
             android:title="@string/enable_iomx">
         </CheckBoxPreference>
+        <CheckBoxPreference
+            android:key="enable_headset_detection"
+            android:title="@string/detect_headset"
+            android:summary="@string/detect_headset_detail">
+        </CheckBoxPreference>
         <PreferenceScreen android:title="@string/advanced_debugging">
             <Preference android:title="@string/quit" android:key="quit_app" android:enabled="true"/>
         </PreferenceScreen>

vlc-android/src/org/videolan/vlc/android/AudioPlayer.java

@@ -62,6 +62,8 @@ public interface AudioPlayer {
         void setRepeatType(RepeatType t);
 
         RepeatType getRepeatType();
+
+        void detectHeadset(boolean enable);
     }
 
 }

vlc-android/src/org/videolan/vlc/android/AudioService.java

@@ -61,6 +61,7 @@ public class AudioService extends Service {
     private Notification mNotification;
     private boolean mShuffling = false;
     private RepeatType mRepeating = RepeatType.None;
+    private boolean mDetectHeadset = false;
 
     @Override
     public void onStart(Intent intent, int startId) {
@@ -106,15 +107,17 @@ public class AudioService extends Service {
             String action = intent.getAction();
             int state = intent.getIntExtra("state", 0);
 
-            if (action.equalsIgnoreCase(AudioManager.ACTION_AUDIO_BECOMING_NOISY)) {
-                Log.i(TAG, "Headset Removed.");
-                if (mLibVLC.isPlaying() && mCurrentMedia != null)
-                    pause();
-            }
-            else if (action.equalsIgnoreCase(Intent.ACTION_HEADSET_PLUG) && state != 0) {
-                Log.i(TAG, "Headset Inserted.");
-                if (!mLibVLC.isPlaying() && mCurrentMedia != null)
-                    play();
+            if (mDetectHeadset) {
+                if (action.equalsIgnoreCase(AudioManager.ACTION_AUDIO_BECOMING_NOISY)) {
+                    Log.i(TAG, "Headset Removed.");
+                    if (mLibVLC.isPlaying() && mCurrentMedia != null)
+                        pause();
+                }
+                else if (action.equalsIgnoreCase(Intent.ACTION_HEADSET_PLUG) && state != 0) {
+                    Log.i(TAG, "Headset Inserted.");
+                    if (!mLibVLC.isPlaying() && mCurrentMedia != null)
+                        play();
+                }
             }
         }
     };
@@ -466,6 +469,11 @@ public class AudioService extends Service {
             else
                 return false;
         }
+
+        @Override
+        public void detectHeadset(boolean enable) throws RemoteException {
+            mDetectHeadset = enable;
+        }
     };
 
 }

vlc-android/src/org/videolan/vlc/android/AudioServiceController.java

@@ -378,4 +378,13 @@ public class AudioServiceController implements AudioPlayerControl {
             return RepeatType.None;
         }
     }
+
+    @Override
+    public void detectHeadset(boolean enable) {
+        try {
+            mAudioServiceBinder.detectHeadset(enable);
+        } catch (RemoteException e) {
+            Log.e(TAG, "remote procedure call failed: detectHeadset()");
+        }
+    }
 }

vlc-android/src/org/videolan/vlc/android/IAudioService.aidl

@@ -46,4 +46,5 @@ interface IAudioService {
     Bitmap getCover();
     void addAudioCallback(IAudioServiceCallback cb);
     void removeAudioCallback(IAudioServiceCallback cb);
+    void detectHeadset(boolean enable);
 }

vlc-android/src/org/videolan/vlc/android/PreferencesActivity.java

@@ -24,6 +24,7 @@ import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
+import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.Preference.OnPreferenceClickListener;
@@ -72,7 +73,18 @@ public class PreferencesActivity extends PreferenceActivity {
                         return true;
                     }
                 });
-        
+
+        // Headset detection option
+        CheckBoxPreference checkboxHS = (CheckBoxPreference) findPreference("enable_headset_detection");
+        checkboxHS.setOnPreferenceClickListener(
+                new OnPreferenceClickListener() {
+                    public boolean onPreferenceClick(Preference preference) {
+                        CheckBoxPreference checkboxHS = (CheckBoxPreference) preference;
+                        AudioServiceController.getInstance().detectHeadset(checkboxHS.isChecked());
+                        return true;
+                    }
+                });
+
         // Attach debugging items
         Preference quitAppPref = (Preference) findPreference("quit_app");
         quitAppPref.setOnPreferenceClickListener(