justinzeus/Wholphin
1
0
Fork 0
mirror of https://github.com/JustinZeus/Wholphin.git synced 2026-07-08 15:50:16 +02:00
Code Issues Projects Packages Wiki Activity Actions

Add media session

Browse source
This commit is contained in:
Damontecres 2026-03-02 18:52:06 -05:00
parent dfed290125
commit 609f618642
No known key found for this signature in database
2 changed files with 37 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

36
app/src/main/java/com/github/damontecres/wholphin/services/MusicService.kt
View file

@ -12,6 +12,7 @@ import androidx.media3.common.util.UnstableApi
import androidx.media3.datasource.okhttp.OkHttpDataSource
import androidx.media3.exoplayer.ExoPlayer
import androidx.media3.exoplayer.source.DefaultMediaSourceFactory
import androidx.media3.session.MediaSession
import com.github.damontecres.wholphin.data.ServerRepository
import com.github.damontecres.wholphin.data.model.AudioItem
import com.github.damontecres.wholphin.data.model.BaseItem
@ -28,6 +29,8 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
import kotlinx.coroutines.withContext
import okhttp3.OkHttpClient
import org.jellyfin.sdk.api.client.ApiClient
@ -69,6 +72,34 @@ class MusicService
}
}
private val mutex = Mutex()
var mediaSession: MediaSession? = null
private set
suspend fun start() {
if (mediaSession == null) {
mutex.withLock {
if (mediaSession == null) {
Timber.i("Starting music MediaSession")
mediaSession = MediaSession.Builder(context, player).build()
}
}
}
onMain { player.play() }
}
suspend fun stop() {
mutex.withLock {
Timber.i("Stopping music")
if (mediaSession == null) {
Timber.w("Stopping but no MediaSession")
}
mediaSession?.release()
mediaSession = null
onMain { player.stop() }
}
}
/**
* Fetches instant mix items, replaces the queue, and begins playback
*/
@ -100,8 +131,8 @@ class MusicService
withContext(Dispatchers.Main) {
player.setMediaItems(emptyList())
player.shuffleModeEnabled = shuffled
player.play()
}
start()
addAllToQueue(items, startIndex)
}
@ -110,6 +141,7 @@ class MusicService
shuffled: Boolean,
) {
Timber.d("setQueue: %s items, shuffled=%s", items.size, shuffled)
start()
val mediaItems =
items
.filter { it.type == BaseItemKind.AUDIO }
@ -118,7 +150,6 @@ class MusicService
updateQueueSize()
player.setMediaItems(mediaItems)
player.shuffleModeEnabled = shuffled
player.play()
}
}
@ -202,6 +233,7 @@ class MusicService
it.copy(queueSize = player.mediaItemCount)
}
}
start()
}
suspend fun moveQueue(

3
app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackViewModel.kt
View file

@ -42,6 +42,7 @@ import com.github.damontecres.wholphin.preferences.UserPreferences
import com.github.damontecres.wholphin.services.DatePlayedService
import com.github.damontecres.wholphin.services.DeviceProfileService
import com.github.damontecres.wholphin.services.ImageUrlService
import com.github.damontecres.wholphin.services.MusicService
import com.github.damontecres.wholphin.services.NavigationManager
import com.github.damontecres.wholphin.services.PlayerFactory
import com.github.damontecres.wholphin.services.PlaylistCreationResult
@ -142,6 +143,7 @@ class PlaybackViewModel
private val userPreferencesService: UserPreferencesService,
private val imageUrlService: ImageUrlService,
private val screensaverService: ScreensaverService,
private val musicService: MusicService,
@Assisted private val destination: Destination,
) : ViewModel(),
Player.Listener,
@ -270,6 +272,7 @@ class PlaybackViewModel
* Initialize from the UI to start playback
*/
private suspend fun init() {
musicService.stop()
nextUp.setValueOnMain(null)
this.preferences = userPreferencesService.getCurrent()
if (preferences.appPreferences.playbackPreferences.refreshRateSwitching) {