From 78958ed478430bcbadb9de5c16bd40de1fbcd0ff Mon Sep 17 00:00:00 2001 From: DoumanAsh Date: Sat, 1 Jul 2023 17:03:48 +0900 Subject: [PATCH] audioplayers: Rename player-id to playerId as it should be --- src/plugins/audioplayers/player.c | 10 +++++----- src/plugins/audioplayers/plugin.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/plugins/audioplayers/player.c b/src/plugins/audioplayers/player.c index 20f847aa..c2c44d8f 100644 --- a/src/plugins/audioplayers/player.c +++ b/src/plugins/audioplayers/player.c @@ -219,7 +219,7 @@ void audio_player_on_media_error(struct audio_player *self, GError *error, gchar self->channel, "audio.onError", &STDMAP2( - STDSTRING("player_id"), + STDSTRING("playerId"), STDSTRING(self->player_id), STDSTRING("value"), STDSTRING(error_message) @@ -251,7 +251,7 @@ void audio_player_on_position_update(struct audio_player *self) { self->channel, "audio.onCurrentPosition", &STDMAP2( - STDSTRING("player_id"), + STDSTRING("playerId"), STDSTRING(self->player_id), STDSTRING("value"), STDINT64(audio_player_get_position(self)) @@ -269,7 +269,7 @@ void audio_player_on_duration_update(struct audio_player *self) { self->channel, "audio.onDuration", &STDMAP2( - STDSTRING("player_id"), + STDSTRING("playerId"), STDSTRING(self->player_id), STDSTRING("value"), STDINT64(audio_player_get_duration(self)) @@ -288,7 +288,7 @@ void audio_player_on_seek_completed(struct audio_player *self) { self->channel, "audio.onSeekComplete", &STDMAP2( - STDSTRING("player_id"), + STDSTRING("playerId"), STDSTRING(self->player_id), STDSTRING("value"), STDBOOL(true) @@ -310,7 +310,7 @@ void audio_player_on_playback_ended(struct audio_player *self) { self->channel, "audio.onComplete", &STDMAP2( - STDSTRING("player_id"), + STDSTRING("playerId"), STDSTRING(self->player_id), STDSTRING("value"), STDBOOL(true) diff --git a/src/plugins/audioplayers/plugin.c b/src/plugins/audioplayers/plugin.c index 17499abc..e62a264f 100644 --- a/src/plugins/audioplayers/plugin.c +++ b/src/plugins/audioplayers/plugin.c @@ -35,10 +35,10 @@ static int on_local_method_call(char *channel, struct platch_obj *object, Flutte return platch_respond_illegal_arg_std(responsehandle, "Expected `arg` to be a map."); } - tmp = stdmap_get_str(&object->std_arg, "player_id"); + tmp = stdmap_get_str(&object->std_arg, "playerId"); if (tmp == NULL || !STDVALUE_IS_STRING(*tmp)) { LOG_ERROR("Call missing mandatory parameter player_id.\n"); - return platch_respond_illegal_arg_std(responsehandle, "Expected `arg['player_id'] to be a string."); + return platch_respond_illegal_arg_std(responsehandle, "Expected `arg['playerId'] to be a string."); } player_id = STDVALUE_AS_STRING(*tmp); tmp = stdmap_get_str(args, "mode");