From bf50867b372b09ce8937eb652bed7818527cf1e0 Mon Sep 17 00:00:00 2001 From: Alexander Capehart Date: Thu, 29 Aug 2024 09:31:15 -0600 Subject: [PATCH] all: various cleanup --- .../music/service/MediaItemTranslation.kt | 7 +++++-- .../playback/service/MediaSessionHolder.kt | 7 +++---- .../playback/service/MediaSessionInterface.kt | 21 ++++++++++--------- ...ackActionHandler.kt => PlaybackActions.kt} | 2 +- 4 files changed, 20 insertions(+), 17 deletions(-) rename app/src/main/java/org/oxycblt/auxio/playback/service/{PlaybackActionHandler.kt => PlaybackActions.kt} (96%) diff --git a/app/src/main/java/org/oxycblt/auxio/music/service/MediaItemTranslation.kt b/app/src/main/java/org/oxycblt/auxio/music/service/MediaItemTranslation.kt index cc250c342..7cb6b4000 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/service/MediaItemTranslation.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/service/MediaItemTranslation.kt @@ -105,8 +105,11 @@ fun Category.toMediaItem(context: Context): MediaItem { return MediaItem(description.build(), MediaItem.FLAG_BROWSABLE) } -fun Song.toMediaDescription(context: Context, parent: MusicParent? = null, - vararg sugar: Sugar): MediaDescriptionCompat { +fun Song.toMediaDescription( + context: Context, + parent: MusicParent? = null, + vararg sugar: Sugar +): MediaDescriptionCompat { val mediaSessionUID = if (parent == null) { MediaSessionUID.SingleItem(uid) diff --git a/app/src/main/java/org/oxycblt/auxio/playback/service/MediaSessionHolder.kt b/app/src/main/java/org/oxycblt/auxio/playback/service/MediaSessionHolder.kt index a07c2ad30..c7b100792 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/service/MediaSessionHolder.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/service/MediaSessionHolder.kt @@ -21,8 +21,6 @@ package org.oxycblt.auxio.playback.system import android.annotation.SuppressLint import android.content.Context import android.graphics.Bitmap -import android.os.Bundle -import android.support.v4.media.MediaDescriptionCompat import android.support.v4.media.MediaMetadataCompat import android.support.v4.media.session.MediaSessionCompat import android.support.v4.media.session.PlaybackStateCompat @@ -43,7 +41,6 @@ import org.oxycblt.auxio.music.Song import org.oxycblt.auxio.music.resolveNames import org.oxycblt.auxio.music.service.MediaSessionUID import org.oxycblt.auxio.music.service.toMediaDescription -import org.oxycblt.auxio.music.service.toMediaItem import org.oxycblt.auxio.playback.ActionMode import org.oxycblt.auxio.playback.PlaybackSettings import org.oxycblt.auxio.playback.service.MediaSessionInterface @@ -306,7 +303,9 @@ private constructor( private fun updateQueue(queue: List) { val queueItems = queue.mapIndexed { i, song -> - val description = song.toMediaDescription(context, null, { putInt(MediaSessionInterface.KEY_QUEUE_POS, i) }) + val description = + song.toMediaDescription( + context, null, { putInt(MediaSessionInterface.KEY_QUEUE_POS, i) }) // Store the item index so we can then use the analogous index in the // playback state. MediaSessionCompat.QueueItem(description, i.toLong()) diff --git a/app/src/main/java/org/oxycblt/auxio/playback/service/MediaSessionInterface.kt b/app/src/main/java/org/oxycblt/auxio/playback/service/MediaSessionInterface.kt index 3ab8eaa1e..3f846ad4f 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/service/MediaSessionInterface.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/service/MediaSessionInterface.kt @@ -102,13 +102,13 @@ constructor( super.onAddQueueItem(description) val deviceLibrary = musicRepository.deviceLibrary ?: return val uid = MediaSessionUID.fromString(description.mediaId ?: return) ?: return - val song = + val songUid = when (uid) { - is MediaSessionUID.SingleItem -> deviceLibrary.findSong(uid.uid) - is MediaSessionUID.ChildItem -> deviceLibrary.findSong(uid.childUid) - else -> null + is MediaSessionUID.SingleItem -> uid.uid + is MediaSessionUID.ChildItem -> uid.childUid + else -> return } - ?: return + val song = deviceLibrary.songs.find { it.uid == songUid } ?: return playbackManager.addToQueue(song) } @@ -123,11 +123,12 @@ constructor( } // Non-queue item or queue item lost it's extras in transit, remove the first item val uid = MediaSessionUID.fromString(description.mediaId ?: return) ?: return - val songUid = when (uid) { - is MediaSessionUID.SingleItem -> uid.uid - is MediaSessionUID.ChildItem -> uid.childUid - else -> return - } + val songUid = + when (uid) { + is MediaSessionUID.SingleItem -> uid.uid + is MediaSessionUID.ChildItem -> uid.childUid + else -> return + } val firstAt = playbackManager.queue.indexOfFirst { it.uid == songUid } playbackManager.removeQueueItem(firstAt) } diff --git a/app/src/main/java/org/oxycblt/auxio/playback/service/PlaybackActionHandler.kt b/app/src/main/java/org/oxycblt/auxio/playback/service/PlaybackActions.kt similarity index 96% rename from app/src/main/java/org/oxycblt/auxio/playback/service/PlaybackActionHandler.kt rename to app/src/main/java/org/oxycblt/auxio/playback/service/PlaybackActions.kt index 441bf5253..484cb8541 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/service/PlaybackActionHandler.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/service/PlaybackActions.kt @@ -1,6 +1,6 @@ /* * Copyright (c) 2024 Auxio Project - * PlaybackActionHandler.kt is part of Auxio. + * PlaybackActions.kt is part of Auxio. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by