Merge commit 'eda37c026e272b2bc12c980b23f4b21a1ff7b526'

Author: timschneeb

libjamesdsp/subtree/Main/DSPManager/res/values-zh-rCN/strings.xml

@@ -85,7 +85,7 @@
   <string name="resamplererror">请先启用全域模式或者惯用模式来注册DSP，以便从音讯DSP中获取采样率</string>
   <string name="impfilefault">载入冲激响应失败\n请选择正确冲激响应档案</string>
   <string name="unmatchedsamplerate">冲激响应档案%1$s的采样率%2$d与DSP模组采样率%3$d不吻合\n目前正使用快速重采样器\n预先使用离线重采样器可改善冲激响应质量。</string>
-  <string name="basicinfo">缓冲区大小:%1$s\n动态容器容量:%2$d\n采样率:%3$d</string>
+  <string name="basicinfo">缓冲区大小:%1$s\n动态容器容量:%2$d</string>
   <string name="convolversuccess">成功载入冲激响应:%1$s\n声道:%2$s\n每声道样本总数:%3$d\n截短后的每声道样本总数:%4$d</string>
   <string name="limiter_threshold">压限器阈值[-60 到 -0.1 dB]</string>
   <string name="limiter_release">压限器时间常数[1.5 到 500 ms]</string>

libjamesdsp/subtree/Main/DSPManager/res/values-zh-rHK/strings.xml

@@ -85,7 +85,7 @@
   <string name="resamplererror">請先啟用全域模式或者慣用模式來註冊DSP，以便從音訊DSP中獲取採樣率</string>
   <string name="impfilefault">載入脈衝響應失敗\n請選擇正確脈衝響應檔案</string>
   <string name="unmatchedsamplerate">脈衝響應檔案%1$s的採樣率%2$d與DSP模組採樣率%3$d不吻合\n目前正使用快速重採樣器\n預先使用離線重採樣器可改善脈衝響應質量。</string>
-  <string name="basicinfo">緩衝區大小:%1$s\n動態容器容量:%2$d\n採樣率:%3$d</string>
+  <string name="basicinfo">緩衝區大小:%1$s\n動態容器容量:%2$d</string>
   <string name="convolversuccess">成功載入脈衝響應:%1$s\n聲道:%2$s\n每聲道樣本總數:%3$d\n截短後的每聲道樣本總數:%4$d</string>
   <string name="limiter_threshold">壓限器閾值[-60 到 -0.1 dB]</string>
   <string name="limiter_release">壓限器時間常數[1.5 到 500 ms]</string>

libjamesdsp/subtree/Main/DSPManager/res/values-zh-rTW/strings.xml

@@ -85,7 +85,7 @@
   <string name="resamplererror">請先啟用全域模式或者慣用模式來註冊DSP，以便從音訊DSP中獲取採樣率</string>
   <string name="impfilefault">載入脈衝響應失敗\n請選擇正確脈衝響應檔案</string>
   <string name="unmatchedsamplerate">脈衝響應檔案%1$s的採樣率%2$d與DSP模組採樣率%3$d不吻合\n目前正使用快速重採樣器\n預先使用離線重採樣器可改善脈衝響應質量。</string>
-  <string name="basicinfo">緩衝區大小:%1$s\n動態容器容量:%2$d\n採樣率:%3$d</string>
+  <string name="basicinfo">緩衝區大小:%1$s\n動態容器容量:%2$d</string>
   <string name="convolversuccess">成功載入脈衝響應:%1$s\n聲道:%2$s\n每聲道樣本總數:%3$d\n截短後的每聲道樣本總數:%4$d</string>
   <string name="limiter_threshold">壓限器閾值[-60 到 -0.1 dB]</string>
   <string name="limiter_release">壓限器時間常數[1.5 到 500 ms]</string>

libjamesdsp/subtree/Main/DSPManager/res/values/arrays.xml

@@ -93,6 +93,16 @@
     <item>18</item>
   </string-array>
 
+  <string-array name="compander_preset_modes" translatable="false">
+    <item>@string/eq_preset_flat</item>
+    <item>@string/eq_preset_custom</item>
+  </string-array>
+
+  <string-array name="compander_preset_values" translatable="false">
+    <item>95.0;200.0;400.0;800.0;1600.0;3400.0;7500.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0</item>
+    <item>custom</item>
+  </string-array>
+
   <string-array name="equalizer_preset_modes" translatable="false">
     <item>@string/eq_preset_flat</item>
     <item>@string/eq_preset_custom</item>
@@ -101,7 +111,6 @@
   <string-array name="equalizer_preset_values" translatable="false">
     <item>25.0;40.0;63.0;100.0;160.0;250.0;400.0;630.0;1000.0;1600.0;2500.0;4000.0;6300.0;10000.0;16000.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0</item>
     <item>custom</item>
-    <!-- Custom -->
   </string-array>
 
   <string-array name="equalizer_filtertype">

libjamesdsp/subtree/Main/DSPManager/res/values/strings.xml

@@ -83,7 +83,7 @@
   <string name="resamplererror">Please first register audio engine by enabling global effect or open a music player if using conventional mode in order to retrive sample rate from audio engine</string>
   <string name="impfilefault">Load impulse failed\nPlease choose right impulse response file!</string>
   <string name="unmatchedsamplerate">Impulse response %1$s sample rate (%2$d) is not matching with driver sample rate(%3$d)\nWill use low quality resampler to resample&#8230;\nUse Offline Resampler for higher qualtiy resampling!</string>
-  <string name="basicinfo">Buffer len: %1$s\nAllocated block size: %2$d\nSample rate: %3$d</string>
+  <string name="basicinfo">Buffer len: %1$s\nAllocated block size: %2$d</string>
   <string name="convolversuccess">Impulse response %1$s loaded\nChannel info:%2$s\nSamples per channel:%3$d\nSamples per channel(Truncated):%4$d</string>
   <string name="limiter_threshold">Limiter threshold [-60 &#8211; -0.1 dB]</string>
   <string name="limiter_release">Limiter release [1.5 &#8211; 500 ms]</string>

libjamesdsp/subtree/Main/DSPManager/res/xml/bluetooth_preferences.xml

@@ -58,12 +58,12 @@
         android:entryValues="@array/compression_tfresolution_values"
         android:title="@string/dialog_compression_tfresolution" />
     <james.dsp.preference.SummariedListPreference
-        android:entries="@array/equalizer_preset_modes"
+        android:entries="@array/compander_preset_modes"
         android:dialogTitle="@string/pref_equalizer_preset_title"
         android:key="dsp.compression.eq"
         android:defaultValue="95.0;200.0;400.0;800.0;1600.0;3400.0;7500.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0"
         android:title="@string/pref_equalizer_preset_title"
-        android:entryValues="@array/equalizer_preset_values" />
+        android:entryValues="@array/compander_preset_values" />
     <james.dsp.preference.CompanderPreference android:key="dsp.compression.eq.custom" />
   </PreferenceCategory>
 

libjamesdsp/subtree/Main/DSPManager/res/xml/headset_preferences.xml

@@ -58,12 +58,12 @@
         android:entryValues="@array/compression_tfresolution_values"
         android:title="@string/dialog_compression_tfresolution" />
     <james.dsp.preference.SummariedListPreference
-        android:entries="@array/equalizer_preset_modes"
+        android:entries="@array/compander_preset_modes"
         android:dialogTitle="@string/pref_equalizer_preset_title"
         android:key="dsp.compression.eq"
         android:defaultValue="95.0;200.0;400.0;800.0;1600.0;3400.0;7500.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0"
         android:title="@string/pref_equalizer_preset_title"
-        android:entryValues="@array/equalizer_preset_values" />
+        android:entryValues="@array/compander_preset_values" />
     <james.dsp.preference.CompanderPreference android:key="dsp.compression.eq.custom" />
   </PreferenceCategory>
 

libjamesdsp/subtree/Main/DSPManager/res/xml/speaker_preferences.xml

@@ -58,12 +58,12 @@
         android:entryValues="@array/compression_tfresolution_values"
         android:title="@string/dialog_compression_tfresolution" />
     <james.dsp.preference.SummariedListPreference
-        android:entries="@array/equalizer_preset_modes"
+        android:entries="@array/compander_preset_modes"
         android:dialogTitle="@string/pref_equalizer_preset_title"
         android:key="dsp.compression.eq"
         android:defaultValue="95.0;200.0;400.0;800.0;1600.0;3400.0;7500.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0"
         android:title="@string/pref_equalizer_preset_title"
-        android:entryValues="@array/equalizer_preset_values" />
+        android:entryValues="@array/compander_preset_values" />
     <james.dsp.preference.CompanderPreference android:key="dsp.compression.eq.custom" />
   </PreferenceCategory>
 

libjamesdsp/subtree/Main/DSPManager/src/james/dsp/service/HeadsetService.java

@@ -954,7 +954,7 @@ private void updateDsp(SharedPreferences preferences, JDSPModule session, boolea
 						session.setParameterShort(session.JamesDSP, 10004, (short)1); // Notify send array completed and resize array in native side
 						if (DSPManager.devMsgDisplay)
 						{
-							Toast.makeText(HeadsetService.this, getString(R.string.basicinfo, dspBufferLen, dspAllocatedBlockLen, dspModuleSamplingRate), Toast.LENGTH_SHORT).show();
+							Toast.makeText(HeadsetService.this, getString(R.string.basicinfo, dspBufferLen, dspAllocatedBlockLen), Toast.LENGTH_SHORT).show();
 							if (impinfo[0] == 1)
 								Toast.makeText(HeadsetService.this, getString(R.string.convolversuccess, mConvIRFileName, getString(R.string.mono_conv), impinfo[1], (int)impulseCutted), Toast.LENGTH_SHORT).show();
 							else if (impinfo[0] == 2)

libjamesdsp/subtree/Main/libjamesdsp/jni/jamesdsp/jamesdsp.c

@@ -202,7 +202,7 @@ int32_t EffectDSPMainCommand(EffectDSPMain *dspmain, uint32_t cmdCode, uint32_t
 				replyData->psize = 4;
 				replyData->vsize = 4;
 				replyData->cmd = 20001;
-				replyData->data = (int32_t)dspmain->jdsp.trueSampleRate;
+				replyData->data = (int32_t)dspmain->jdsp.fs;
 				*replySize = sizeof(reply1x4_1x4_t);
 				return 0;
 			}