mirror of
https://github.com/CappielloAntonio/tempo.git
synced 2026-02-03 16:03:06 +00:00
Made public the methods for obtaining transcoding information
This commit is contained in:
@@ -22,8 +22,6 @@ public class MusicUtil {
|
|||||||
private static final String TAG = "MusicUtil";
|
private static final String TAG = "MusicUtil";
|
||||||
|
|
||||||
public static Uri getStreamUri(Context context, String id) {
|
public static Uri getStreamUri(Context context, String id) {
|
||||||
ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
|
|
||||||
|
|
||||||
Map<String, String> params = App.getSubsonicClientInstance(App.getInstance(), false).getParams();
|
Map<String, String> params = App.getSubsonicClientInstance(App.getInstance(), false).getParams();
|
||||||
|
|
||||||
StringBuilder uri = new StringBuilder();
|
StringBuilder uri = new StringBuilder();
|
||||||
@@ -39,10 +37,10 @@ public class MusicUtil {
|
|||||||
if(params.containsKey("c") && params.get("c") != null) uri.append("&c=").append(params.get("c"));
|
if(params.containsKey("c") && params.get("c") != null) uri.append("&c=").append(params.get("c"));
|
||||||
uri.append("&id=").append(id);
|
uri.append("&id=").append(id);
|
||||||
|
|
||||||
if (connectivityManager.getActiveNetworkInfo() != null) {
|
if (getConnectivityManager(context).getActiveNetworkInfo() != null) {
|
||||||
uri.append("&maxBitRate=")
|
uri.append("&maxBitRate=")
|
||||||
.append(getBitratePreference(context, connectivityManager.getActiveNetworkInfo().getType()))
|
.append(getBitratePreference(context))
|
||||||
.append("&format=").append(getTranscodingFormatPreference(context, connectivityManager.getActiveNetworkInfo().getType()));
|
.append("&format=").append(getTranscodingFormatPreference(context));
|
||||||
}
|
}
|
||||||
|
|
||||||
Log.d(TAG, "getStreamUri(): " + uri);
|
Log.d(TAG, "getStreamUri(): " + uri);
|
||||||
@@ -168,12 +166,12 @@ public class MusicUtil {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String getBitratePreference(Context context, int connectionType) {
|
public static String getBitratePreference(Context context) {
|
||||||
String audioTranscodeFormat = getTranscodingFormatPreference(context, connectionType);
|
String audioTranscodeFormat = getTranscodingFormatPreference(context);
|
||||||
|
|
||||||
if (audioTranscodeFormat.equals("0")) return "0";
|
if (audioTranscodeFormat.equals("0")) return "0";
|
||||||
|
|
||||||
switch (connectionType) {
|
switch (getConnectivityManager(context).getActiveNetworkInfo().getType()) {
|
||||||
case ConnectivityManager.TYPE_WIFI:
|
case ConnectivityManager.TYPE_WIFI:
|
||||||
return PreferenceUtil.getInstance(context).getMaxBitrateWifi();
|
return PreferenceUtil.getInstance(context).getMaxBitrateWifi();
|
||||||
case ConnectivityManager.TYPE_MOBILE:
|
case ConnectivityManager.TYPE_MOBILE:
|
||||||
@@ -183,8 +181,8 @@ public class MusicUtil {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String getTranscodingFormatPreference(Context context, int connectionType) {
|
public static String getTranscodingFormatPreference(Context context) {
|
||||||
switch (connectionType) {
|
switch (getConnectivityManager(context).getActiveNetworkInfo().getType()) {
|
||||||
case ConnectivityManager.TYPE_WIFI:
|
case ConnectivityManager.TYPE_WIFI:
|
||||||
return PreferenceUtil.getInstance(context).getAudioTranscodeFormatWifi();
|
return PreferenceUtil.getInstance(context).getAudioTranscodeFormatWifi();
|
||||||
case ConnectivityManager.TYPE_MOBILE:
|
case ConnectivityManager.TYPE_MOBILE:
|
||||||
@@ -193,4 +191,8 @@ public class MusicUtil {
|
|||||||
return PreferenceUtil.getInstance(context).getAudioTranscodeFormatWifi();
|
return PreferenceUtil.getInstance(context).getAudioTranscodeFormatWifi();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static ConnectivityManager getConnectivityManager(Context context) {
|
||||||
|
return (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user