Skip to content

Commit e0f6a8a

Browse files
nift4nift4
committed
remove wrapper intended for test again
1 parent 74c6b68 commit e0f6a8a

File tree

1 file changed

+32
-34
lines changed

1 file changed

+32
-34
lines changed

‎app/src/main/kotlin/org/akanework/gramophone/logic/utils/AudioFormatDetector.kt‎

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ object AudioFormatDetector {
356356
private fun StringBuilder.prettyPrintAfFormatInfo(context: Context, format: AfFormatInfo) {
357357
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
358358
append("Device name: ${format.routedDeviceName} (ID: ${format.routedDeviceId})\n")
359-
append("Device type: ${format.routedDeviceType?.let { Util2.audioDeviceTypeToString(context, it) }}\n")
359+
append("Device type: ${format.routedDeviceType?.let { audioDeviceTypeToString(context, it) }}\n")
360360
}
361361
append("Mix port: ${format.mixPortName} (ID: ${format.mixPortId})\n")
362362
append("Mix port flags: ${mixPortFlagsToString(context, format.mixPortFlags)}\n")
@@ -517,41 +517,39 @@ object AudioFormatDetector {
517517
return str.joinToString(", ")
518518
}
519519

520-
private object Util2 {
521-
@RequiresApi(Build.VERSION_CODES.M)
522-
fun audioDeviceTypeToString(context: Context, type: Int?) =
523-
when (type) {
524-
AudioDeviceInfo.TYPE_BLUETOOTH_A2DP -> context.getString(R.string.device_type_bluetooth_a2dp)
525-
AudioDeviceInfo.TYPE_BUILTIN_SPEAKER -> context.getString(R.string.device_type_builtin_speaker)
526-
AudioDeviceInfo.TYPE_WIRED_HEADSET -> context.getString(R.string.device_type_wired_headset)
527-
AudioDeviceInfo.TYPE_WIRED_HEADPHONES -> context.getString(R.string.device_type_wired_headphones)
528-
AudioDeviceInfo.TYPE_HDMI -> context.getString(R.string.device_type_hdmi)
529-
AudioDeviceInfo.TYPE_USB_DEVICE -> context.getString(R.string.device_type_usb_device)
530-
AudioDeviceInfo.TYPE_USB_ACCESSORY -> context.getString(R.string.device_type_usb_accessory)
531-
AudioDeviceInfo.TYPE_DOCK -> context.getString(
532-
if (Build.VERSION.SDK_INT >=
533-
Build.VERSION_CODES.UPSIDE_DOWN_CAKE
534-
) R.string.device_type_dock_digital
535-
else R.string.device_type_dock
536-
)
520+
@RequiresApi(Build.VERSION_CODES.M)
521+
fun audioDeviceTypeToString(context: Context, type: Int?) =
522+
when (type) {
523+
AudioDeviceInfo.TYPE_BLUETOOTH_A2DP -> context.getString(R.string.device_type_bluetooth_a2dp)
524+
AudioDeviceInfo.TYPE_BUILTIN_SPEAKER -> context.getString(R.string.device_type_builtin_speaker)
525+
AudioDeviceInfo.TYPE_WIRED_HEADSET -> context.getString(R.string.device_type_wired_headset)
526+
AudioDeviceInfo.TYPE_WIRED_HEADPHONES -> context.getString(R.string.device_type_wired_headphones)
527+
AudioDeviceInfo.TYPE_HDMI -> context.getString(R.string.device_type_hdmi)
528+
AudioDeviceInfo.TYPE_USB_DEVICE -> context.getString(R.string.device_type_usb_device)
529+
AudioDeviceInfo.TYPE_USB_ACCESSORY -> context.getString(R.string.device_type_usb_accessory)
530+
AudioDeviceInfo.TYPE_DOCK -> context.getString(
531+
if (Build.VERSION.SDK_INT >=
532+
Build.VERSION_CODES.UPSIDE_DOWN_CAKE
533+
) R.string.device_type_dock_digital
534+
else R.string.device_type_dock
535+
)
537536

538-
AudioDeviceInfo.TYPE_DOCK_ANALOG -> context.getString(R.string.device_type_dock_analog)
539-
AudioDeviceInfo.TYPE_USB_HEADSET -> context.getString(R.string.device_type_usb_headset)
540-
AudioDeviceInfo.TYPE_HEARING_AID -> context.getString(R.string.device_type_hearing_aid)
541-
AudioDeviceInfo.TYPE_BLE_HEADSET -> context.getString(R.string.device_type_ble_headset)
542-
AudioDeviceInfo.TYPE_BLE_BROADCAST -> context.getString(R.string.device_type_ble_broadcast)
543-
AudioDeviceInfo.TYPE_BLE_SPEAKER -> context.getString(R.string.device_type_ble_speaker)
544-
AudioDeviceInfo.TYPE_LINE_DIGITAL -> context.getString(R.string.device_type_line_digital)
545-
AudioDeviceInfo.TYPE_LINE_ANALOG -> context.getString(R.string.device_type_line_analog)
546-
AudioDeviceInfo.TYPE_AUX_LINE -> context.getString(R.string.device_type_aux_line)
547-
AudioDeviceInfo.TYPE_HDMI_ARC -> context.getString(R.string.device_type_hdmi_arc)
548-
AudioDeviceInfo.TYPE_HDMI_EARC -> context.getString(R.string.device_type_hdmi_earc)
549-
else -> {
550-
Log.w("AudioFormatDetector", "unknown device type $type")
551-
context.getString(R.string.device_type_unknown)
552-
}
537+
AudioDeviceInfo.TYPE_DOCK_ANALOG -> context.getString(R.string.device_type_dock_analog)
538+
AudioDeviceInfo.TYPE_USB_HEADSET -> context.getString(R.string.device_type_usb_headset)
539+
AudioDeviceInfo.TYPE_HEARING_AID -> context.getString(R.string.device_type_hearing_aid)
540+
AudioDeviceInfo.TYPE_BLE_HEADSET -> context.getString(R.string.device_type_ble_headset)
541+
AudioDeviceInfo.TYPE_BLE_BROADCAST -> context.getString(R.string.device_type_ble_broadcast)
542+
AudioDeviceInfo.TYPE_BLE_SPEAKER -> context.getString(R.string.device_type_ble_speaker)
543+
AudioDeviceInfo.TYPE_LINE_DIGITAL -> context.getString(R.string.device_type_line_digital)
544+
AudioDeviceInfo.TYPE_LINE_ANALOG -> context.getString(R.string.device_type_line_analog)
545+
AudioDeviceInfo.TYPE_AUX_LINE -> context.getString(R.string.device_type_aux_line)
546+
AudioDeviceInfo.TYPE_HDMI_ARC -> context.getString(R.string.device_type_hdmi_arc)
547+
AudioDeviceInfo.TYPE_HDMI_EARC -> context.getString(R.string.device_type_hdmi_earc)
548+
else -> {
549+
Log.w("AudioFormatDetector", "unknown device type $type")
550+
context.getString(R.string.device_type_unknown)
553551
}
554-
}
552+
}
555553

556554
private fun determineQualityTier(
557555
sampleRate: Int?,

0 commit comments

Comments
 (0)