diff --git a/src/modules/media/media.c b/src/modules/media/media.c index 8bdf13889..98e6aef45 100644 --- a/src/modules/media/media.c +++ b/src/modules/media/media.c @@ -99,6 +99,9 @@ void ffPrintMedia(FFMediaOptions* options) FF_FORMAT_ARG(media->artist, "artist"), FF_FORMAT_ARG(media->album, "album"), FF_FORMAT_ARG(media->status, "status"), + FF_FORMAT_ARG(media->player, "player-name"), + FF_FORMAT_ARG(media->playerId, "player-id"), + FF_FORMAT_ARG(media->url, "url"), })); } } @@ -149,10 +152,17 @@ void ffGenerateMediaJsonResult(FF_MAYBE_UNUSED FFMediaOptions* options, yyjson_m } yyjson_mut_val* obj = yyjson_mut_obj_add_obj(doc, module, "result"); - yyjson_mut_obj_add_strbuf(doc, obj, "song", &media->song); - yyjson_mut_obj_add_strbuf(doc, obj, "artist", &media->artist); - yyjson_mut_obj_add_strbuf(doc, obj, "album", &media->album); - yyjson_mut_obj_add_strbuf(doc, obj, "status", &media->status); + + yyjson_mut_val* song = yyjson_mut_obj_add_obj(doc, obj, "song"); + yyjson_mut_obj_add_strbuf(doc, song, "name", &media->song); + yyjson_mut_obj_add_strbuf(doc, song, "artist", &media->artist); + yyjson_mut_obj_add_strbuf(doc, song, "album", &media->album); + yyjson_mut_obj_add_strbuf(doc, song, "status", &media->status); + + yyjson_mut_val* player = yyjson_mut_obj_add_obj(doc, obj, "player"); + yyjson_mut_obj_add_strbuf(doc, player, "name", &media->player); + yyjson_mut_obj_add_strbuf(doc, player, "id", &media->playerId); + yyjson_mut_obj_add_strbuf(doc, player, "url", &media->url); } static FFModuleBaseInfo ffModuleInfo = { diff --git a/src/modules/player/player.c b/src/modules/player/player.c index c462b3e2a..56f160149 100644 --- a/src/modules/player/player.c +++ b/src/modules/player/player.c @@ -118,18 +118,7 @@ void ffGeneratePlayerJsonConfig(FFPlayerOptions* options, yyjson_mut_doc* doc, y void ffGeneratePlayerJsonResult(FF_MAYBE_UNUSED FFMediaOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module) { - const FFMediaResult* media = ffDetectMedia(); - - if(media->error.length > 0) - { - yyjson_mut_obj_add_strbuf(doc, module, "error", &media->error); - return; - } - - yyjson_mut_val* obj = yyjson_mut_obj_add_obj(doc, module, "result"); - yyjson_mut_obj_add_strbuf(doc, obj, "player", &media->player); - yyjson_mut_obj_add_strbuf(doc, obj, "playerId", &media->playerId); - yyjson_mut_obj_add_strbuf(doc, obj, "url", &media->url); + yyjson_mut_obj_add_str(doc, module, "error", "Player module is an alias of Media module"); } static FFModuleBaseInfo ffModuleInfo = {