Merge pull request #43 from enteraname74/develop

v0.10.2
enteraname74 · Jan 3, 2025 · 71f4a3f · 71f4a3f
2 parents 3eb1017 + 54c1e8a
commit 71f4a3f
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 15 deletions.
diff --git a/desktopApp/io.github.enteraname74.soulsearching.yml b/desktopApp/io.github.enteraname74.soulsearching.yml
@@ -38,7 +38,7 @@ modules:
       - cp -ru * /app
     sources:
       - type: archive
-        path: build/distributions/soulsearching-0.10.0-linux.tar.gz
+        path: build/distributions/soulsearching-0.10.2-linux.tar.gz
       - type: file
         path: src/main/composeResources/drawable/app_icon_bg.png
       - type: file

diff --git a/...droidMain/kotlin/com/github/enteraname74/soulsearching/features/playback/PlayerService.kt b/...droidMain/kotlin/com/github/enteraname74/soulsearching/features/playback/PlayerService.kt
@@ -16,14 +16,11 @@ import org.koin.core.component.inject
  * Service used for the playback.
  */
 class PlayerService : Service(), KoinComponent {
-    private val musicNotification: SoulSearchingAndroidNotification by inject()
-
     override fun onBind(p0: Intent?): IBinder? {
         return null
     }
 
     @SuppressLint("UnspecifiedRegisterReceiverFlag")
-    @Suppress("Deprecation")
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         Log.i("Player service", "ON START COMMAND")
         ServiceCompat.startForeground(
@@ -65,7 +62,8 @@ class PlayerService : Service(), KoinComponent {
         }
     }
 
-    companion object {
+    companion object : KoinComponent {
+        private val musicNotification: SoulSearchingAndroidNotification by inject()
         const val RESTART_SERVICE = "RESTART_SERVICE"
         const val SERVICE_BROADCAST = "SERVICE_BROADCAST"
 

diff --git a/...hub/enteraname74/soulsearching/features/playback/player/SoulSearchingAndroidPlayerImpl.kt b/...hub/enteraname74/soulsearching/features/playback/player/SoulSearchingAndroidPlayerImpl.kt
@@ -12,6 +12,8 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import java.io.File
 
 /**
@@ -30,6 +32,7 @@ class SoulSearchingAndroidPlayerImpl(
     private var isOnlyLoadingMusic: Boolean = false
     private var positionToReachWhenLoadingMusic: Int = 0
     private val audioManager: PlayerAudioManager = PlayerAudioManager(context, this)
+    private val mutex = Mutex()
 //    private val normalizer: AndroidPlayerNormalizer = AndroidPlayerNormalizer()
 
     private val _state: MutableStateFlow<Boolean> = MutableStateFlow(false)
@@ -55,20 +58,24 @@ class SoulSearchingAndroidPlayerImpl(
         this.listener = listener
     }
 
-    override fun setMusic(music: Music) {
+    override suspend fun setMusic(music: Music) {
         try {
             player.stop()
             player.reset()
-        } catch (_: Exception) {
-        }
-        if (File(music.path).exists()) {
-            player.setDataSource(music.path)
+            if (File(music.path).exists()) {
+                mutex.withLock {
+                    player.setDataSource(music.path)
+                }
+
 //            CoroutineScope(Dispatchers.IO).launch {
 //                val volumeMultiplier: Float = normalizer.getVolumeMultiplier(music = music) ?: return@launch
 //                println("Multiplier: $volumeMultiplier")
 //                val newVolume: Float = 0.5f * volumeMultiplier
 //                setPlayerVolume(newVolume)
 //            }
+            }
+        } catch (e: Exception) {
+            Log.e("PLAYER", "UNABLE TO SET MUSIC. GOT ERROR: ${e.message}")
         }
     }
 

diff --git a/...kotlin/com/github/enteraname74/soulsearching/features/playback/manager/PlaybackManager.kt b/...kotlin/com/github/enteraname74/soulsearching/features/playback/manager/PlaybackManager.kt
@@ -134,7 +134,7 @@ class PlaybackManager : KoinComponent, SoulSearchingPlayer.Listener {
      * Load the current music of the player view model.
      * The music will not be played.
      */
-    fun onlyLoadMusic(seekTo: Int = 0, music: Music) {
+    private suspend fun onlyLoadMusic(seekTo: Int = 0, music: Music) {
         player.setMusic(music = music)
         player.onlyLoadMusic(seekTo = seekTo)
     }

diff --git a/...lin/com/github/enteraname74/soulsearching/features/playback/player/SoulSearchingPlayer.kt b/...lin/com/github/enteraname74/soulsearching/features/playback/player/SoulSearchingPlayer.kt
@@ -20,7 +20,7 @@ interface SoulSearchingPlayer {
     /**
      * Set a song to the player.
      */
-    fun setMusic(music: Music)
+    suspend fun setMusic(music: Music)
 
     /**
      * Load the current music without playing it.

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 accompanist = "0.28.0"
 accompanist-system-ui-controller = "0.30.1"
 agp = "8.5.2"
-android-version-code = "26"
+android-version-code = "27"
 android-target-sdk = "34"
 android-compile-sdk = "34"
 android-min-sdk = "26"
@@ -11,7 +11,7 @@ androidx-core = "1.13.1"
 androidx-lifecycle = "2.8.7"
 annotation = "1.9.1"
 appcompat = "1.7.0"
-application-version-name = "0.10.1"
+application-version-name = "0.10.2"
 coil = "3.0.0-alpha01"
 compose = "1.7.0"
 coroutines-core = "1.9.0"

diff --git a/...src/desktopMain/kotlin/com/github/enteraname74/soulsearching/domain/AppVersion.desktop.kt b/...src/desktopMain/kotlin/com/github/enteraname74/soulsearching/domain/AppVersion.desktop.kt
@@ -9,5 +9,5 @@ actual object AppVersion {
         ""
     }
 
-    actual val versionName = "0.10.1$suffix"
+    actual val versionName = "0.10.2$suffix"
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,5 +9,5 @@ actual object AppVersion { @@
             ""
         }
-        actual val versionName = "0.10.1$suffix"
+        actual val versionName = "0.10.2$suffix"
     }