Priority given to the transcoding mode. If set to "Direct play" the bitrate of the file will not be changed

This commit is contained in:
CappielloAntonio 2021-09-13 17:32:39 +02:00
parent 5d5a0eb653
commit 93d6aafbcc
2 changed files with 22 additions and 18 deletions

View file

@ -137,6 +137,10 @@ public class MusicUtil {
} }
private static String getBitratePreference(Context context, int connectionType) { private static String getBitratePreference(Context context, int connectionType) {
String audioTranscodeFormat = getTranscodingFormatPreference(context, connectionType);
if(audioTranscodeFormat.equals("0")) return "0";
switch (connectionType) { switch (connectionType) {
case ConnectivityManager.TYPE_WIFI: case ConnectivityManager.TYPE_WIFI:
return PreferenceUtil.getInstance(context).getMaxBitrateWifi(); return PreferenceUtil.getInstance(context).getMaxBitrateWifi();

View file

@ -72,24 +72,6 @@
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory app:title="@string/settings_title_transcoding"> <PreferenceCategory app:title="@string/settings_title_transcoding">
<ListPreference
app:defaultValue="0"
app:dialogTitle="@string/settings_max_bitrate_wifi"
app:entries="@array/max_bitrate_wifi_list_titles"
app:entryValues="@array/max_bitrate_wifi_list_values"
app:key="max_bitrate_wifi"
app:title="@string/settings_max_bitrate_wifi"
app:useSimpleSummaryProvider="true" />
<ListPreference
app:defaultValue="0"
app:dialogTitle="@string/settings_max_bitrate_mobile"
app:entries="@array/max_bitrate_mobile_list_titles"
app:entryValues="@array/max_bitrate_mobile_list_values"
app:key="max_bitrate_mobile"
app:title="@string/settings_max_bitrate_mobile"
app:useSimpleSummaryProvider="true" />
<ListPreference <ListPreference
app:defaultValue="raw" app:defaultValue="raw"
app:dialogTitle="@string/settings_audio_transcode_format_wifi" app:dialogTitle="@string/settings_audio_transcode_format_wifi"
@ -99,6 +81,15 @@
app:title="@string/settings_audio_transcode_format_wifi" app:title="@string/settings_audio_transcode_format_wifi"
app:useSimpleSummaryProvider="true" /> app:useSimpleSummaryProvider="true" />
<ListPreference
app:defaultValue="0"
app:dialogTitle="@string/settings_max_bitrate_wifi"
app:entries="@array/max_bitrate_wifi_list_titles"
app:entryValues="@array/max_bitrate_wifi_list_values"
app:key="max_bitrate_wifi"
app:title="@string/settings_max_bitrate_wifi"
app:useSimpleSummaryProvider="true" />
<ListPreference <ListPreference
app:defaultValue="raw" app:defaultValue="raw"
app:dialogTitle="@string/settings_audio_transcode_format_mobile" app:dialogTitle="@string/settings_audio_transcode_format_mobile"
@ -107,6 +98,15 @@
app:key="audio_transcode_format_mobile" app:key="audio_transcode_format_mobile"
app:title="@string/settings_audio_transcode_format_mobile" app:title="@string/settings_audio_transcode_format_mobile"
app:useSimpleSummaryProvider="true" /> app:useSimpleSummaryProvider="true" />
<ListPreference
app:defaultValue="0"
app:dialogTitle="@string/settings_max_bitrate_mobile"
app:entries="@array/max_bitrate_mobile_list_titles"
app:entryValues="@array/max_bitrate_mobile_list_values"
app:key="max_bitrate_mobile"
app:title="@string/settings_max_bitrate_mobile"
app:useSimpleSummaryProvider="true" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory app:title="@string/settings_about_title"> <PreferenceCategory app:title="@string/settings_about_title">