1 files changed, 40 insertions, 0 deletions
diff --git a/LoopbackApp/app/src/main/java/org/drrickorang/loopback/SettingsActivity.java b/LoopbackApp/app/src/main/java/org/drrickorang/loopback/SettingsActivity.java
index 06d5299..f27361c 100644
--- a/LoopbackApp/app/src/main/java/org/drrickorang/loopback/SettingsActivity.java
+++ b/LoopbackApp/app/src/main/java/org/drrickorang/loopback/SettingsActivity.java
@@ -19,6 +19,7 @@ package org.drrickorang.loopback;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.media.AudioFormat;
 import android.media.AudioManager;
 import android.media.AudioRecord;
@@ -34,17 +35,21 @@ import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.AdapterView;
 import android.widget.NumberPicker;
 import android.widget.NumberPicker.OnValueChangeListener;
+import android.widget.TextView;
 
 public class SettingsActivity extends Activity implements OnItemSelectedListener,
 OnValueChangeListener {
     /**
      * Called with the activity is first created.
      */
+    Spinner mSpinnerMicSource;
     Spinner mSpinnerSamplingRate;
     Spinner mSpinnerAudioThreadType;
     NumberPicker mNumberPickerPlaybackBuffer;
     NumberPicker mNumberPickerRecordBuffer;
 
+    TextView mTextSettingsInfo;
+
     ArrayAdapter<CharSequence> adapterSamplingRate;
     int bytesPerFrame;
 
@@ -55,6 +60,25 @@ OnValueChangeListener {
         View view = getLayoutInflater().inflate(R.layout.settings_activity, null);
         setContentView(view);
 
+
+        mTextSettingsInfo = (TextView) findViewById(R.id.textSettingsInfo);
+
+
+        int micSource = getApp().getMicSource();
+        mSpinnerMicSource = (Spinner) findViewById(R.id.spinnerMicSource);
+        ArrayAdapter<CharSequence> adapterMicSource = ArrayAdapter.createFromResource(this,
+                R.array.mic_source_array, android.R.layout.simple_spinner_item);
+        // Specify the layout to use when the list of choices appears
+        adapterMicSource.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        // Apply the adapter to the spinner
+        mSpinnerMicSource.setAdapter(adapterMicSource);
+        //set current value
+//        String currentValue = String.valueOf(samplingRate);
+//        int nPosition = adapter.getPosition(currentValue);
+        mSpinnerMicSource.setSelection(micSource, false);
+        mSpinnerMicSource.setOnItemSelectedListener(this);
+
+
         bytesPerFrame = getApp().BYTES_PER_FRAME;
         int samplingRate = getApp().getSamplingRate();
         //init spinner, etc
@@ -135,6 +159,15 @@ OnValueChangeListener {
         String currentValue = String.valueOf(samplingRate);
         int nPosition = adapterSamplingRate.getPosition(currentValue);
         mSpinnerSamplingRate.setSelection(nPosition);
+
+
+        try {
+            int versionCode = getApplicationContext().getPackageManager().getPackageInfo(getApplicationContext().getPackageName(), 0).versionCode;
+            String versionName = getApplicationContext().getPackageManager().getPackageInfo(getApplicationContext().getPackageName(), 0).versionName;
+            mTextSettingsInfo.setText("SETTINGS - Ver. " +versionCode +"."+ versionName + " | " +Build.MODEL + " | " + Build.FINGERPRINT);
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
     }
      public void onItemSelected(AdapterView<?> parent, View view,
             int pos, long id) {
@@ -157,6 +190,13 @@ OnValueChangeListener {
                 log("AudioThreadType:" + audioThreadType);
                 refresh();
                 break;
+            case R.id.spinnerMicSource:
+                int micSource = mSpinnerMicSource.getSelectedItemPosition();
+                getApp().setMicSource(micSource);
+                settingsChanged();
+                log("mic Source:" + micSource);
+                refresh();
+                break;
         }
     }