音声チャンネルのデフォルトを 2 に変更

音声チャンネルのUIをステレオ、モノラルの文言に変更

Author: nobuo-kobayashi

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/activity/recorder/settings/SettingsAudioFragment.java

@@ -32,7 +32,6 @@ public void onBindService() {
         setPreviewSampleRate(mMediaRecorder.getSettings());
         setPreviewAudioCoefficient(mMediaRecorder.getSettings());
         setInputTypeNumber("preview_audio_bitrate");
-        setInputTypeNumber("preview_audio_channel");
     }
 
     /**

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/recorder/HostMediaRecorder.java

@@ -2375,7 +2375,7 @@ public void setPreviewSampleRate(Integer sampleRate) {
          * @return プレビュー音声のチャンネル数
          */
         public int getPreviewChannel() {
-            return mProperty.getInteger("preview_audio_channel", 1);
+            return mProperty.getInteger("preview_audio_channel", 2);
         }
 
         /**

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/recorder/audio/HostAudioRecorder.java

@@ -79,7 +79,7 @@ private void initSettings() {
             mSettings.setPreviewAudioSource(AudioSource.DEFAULT);
             mSettings.setPreviewAudioBitRate(128 * 1024);
             mSettings.setPreviewSampleRate(48000);
-            mSettings.setPreviewChannel(1);
+            mSettings.setPreviewChannel(2);
             mSettings.setUseAEC(true);
 
             // 各サーバ設定

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/recorder/camera/Camera2Recorder.java

@@ -222,7 +222,7 @@ private void initSupportedSettings() {
             mSettings.setPreviewAudioSource(null);
             mSettings.setPreviewAudioBitRate(128 * 1024);
             mSettings.setPreviewSampleRate(48000);
-            mSettings.setPreviewChannel(1);
+            mSettings.setPreviewChannel(2);
             mSettings.setUseAEC(true);
 
             // 各サーバ設定

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/recorder/screen/ScreenCastRecorder.java

@@ -142,7 +142,7 @@ private void initSupportedSettings() {
             mSettings.setPreviewAudioSource(null);
             mSettings.setPreviewAudioBitRate(128 * 1024);
             mSettings.setPreviewSampleRate(48000);
-            mSettings.setPreviewChannel(1);
+            mSettings.setPreviewChannel(2);
             mSettings.setUseAEC(true);
 
             // プレビュー配信サーバ設定

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/res/values/arrays.xml

@@ -286,4 +286,14 @@
         <item>7350</item>
     </string-array>
 
+    <string name="settings_audio_channel">2</string>
+    <string-array name="settings_audio_channel_names">
+        <item>モノラル</item>
+        <item>ステレオ</item>
+    </string-array>
+    <string-array name="settings_audio_channel_values">
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
 </resources>

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/res/xml/settings_host_recorder_audio.xml

@@ -39,10 +39,11 @@
             app:iconSpaceReserved="false"
             app:useSimpleSummaryProvider="true" />
 
-        <EditTextPreference
-            android:defaultValue="1"
+        <ListPreference
+            android:defaultValue="@string/settings_audio_channel"
+            android:entries="@array/settings_audio_channel_names"
+            android:entryValues="@array/settings_audio_channel_values"
             android:key="preview_audio_channel"
-            android:singleLine="true"
             android:title="@string/host_recorder_settings_audio_channel"
             app:iconSpaceReserved="false"
             app:useSimpleSummaryProvider="true" />