Update server

toasterofbread · Mar 5, 2024 · f0f4c21 · f0f4c21
1 parent e4bf320
commit f0f4c21
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/.../src/commonMain/kotlin/com/toasterofbread/spmp/platform/playerservice/applyPlayerEvent.kt b/.../src/commonMain/kotlin/com/toasterofbread/spmp/platform/playerservice/applyPlayerEvent.kt
@@ -123,6 +123,18 @@ internal fun SpMsPlayerService.applyPlayerEvent(event: SpMsPlayerEvent) {
                 it.onEvents()
             }
         }
-        else -> throw NotImplementedError(event.toString())
+        SpMsPlayerEvent.Type.CLEARED -> {
+            for (i in playlist.indices.reversed()) {
+                playlist.removeAt(i)
+                listeners.forEach {
+                    it.onSongRemoved(i)
+                }
+            }
+            listeners.forEach {
+                it.onEvents()
+            }
+        }
+
+        SpMsPlayerEvent.Type.READY_TO_PLAY -> {}
     }
 }
diff --git a/.../src/commonMain/kotlin/com/toasterofbread/spmp/platform/playerservice/applyServerState.kt b/.../src/commonMain/kotlin/com/toasterofbread/spmp/platform/playerservice/applyServerState.kt
@@ -79,13 +79,6 @@ internal suspend fun SpMsPlayerService.applyServerState(
             it.onEvents()
         }
     }
-    if (state.volume != _volume) {
-        _volume = state.volume
-        listeners.forEach {
-            it.onVolumeChanged(_volume)
-            it.onEvents()
-        }
-    }
     if (state.repeat_mode != _repeat_mode) {
         _repeat_mode = state.repeat_mode
         listeners.forEach {

diff --git a/spmp-server b/spmp-server
+31 −3		src/commonMain/kotlin/cinterop/mpv/MpvClientImpl.kt
+1 −2		src/commonMain/kotlin/cinterop/mpv/MpvCommandInterface.kt
+17 −14		src/commonMain/kotlin/spms/client/player/PlayerClient.kt
+0 −1		src/commonMain/kotlin/spms/localisation/strings/CliLocalisation.kt
+0 −1		src/commonMain/kotlin/spms/localisation/strings/CliLocalisationEn.kt
+0 −1		src/commonMain/kotlin/spms/localisation/strings/CliLocalisationJa.kt
+3 −3		src/commonMain/kotlin/spms/localisation/strings/ServerActionLocalisation.kt
+3 −3		src/commonMain/kotlin/spms/localisation/strings/ServerActionLocalisationEn.kt
+3 −3		src/commonMain/kotlin/spms/localisation/strings/ServerActionLocalisationJa.kt
+29 −10		src/commonMain/kotlin/spms/player/HeadlessPlayer.kt
+1 −1		src/commonMain/kotlin/spms/player/Player.kt
+1 −1		src/commonMain/kotlin/spms/server/SpMsCommand.kt
+1 −1		src/commonMain/kotlin/spms/socketapi/server/ServerAction.kt
+0 −1		src/commonMain/kotlin/spms/socketapi/server/ServerActionGetStatus.kt
+28 −0		src/commonMain/kotlin/spms/socketapi/server/ServerActionSetRepeatMode.kt
+0 −27		src/commonMain/kotlin/spms/socketapi/server/ServerActionSetVolume.kt
+1 −2		src/commonMain/kotlin/spms/socketapi/shared/SpMsClientData.kt
+1 −1		src/commonMain/kotlin/spms/socketapi/shared/SpMsSocketApi.kt