Media (Linux): report player name

This commit is contained in:
Carter Li
2024-12-25 08:50:28 +08:00
parent d939f95c69
commit 28ec935c42
+9 -16
View File
@@ -112,10 +112,6 @@ static bool getBusProperties(FFDBusData* data, const char* busName, FFMediaResul
parseMprisMetadata(data, &dictIterator, result);
else if(ffStrEquals(key, "PlaybackStatus"))
ffDBusGetString(data, &dictIterator, &result->status);
else if(ffStrEquals(key, "Identity"))
ffDBusGetString(data, &dictIterator, &result->player);
else if(ffStrEquals(key, "DesktopEntry"))
ffDBusGetString(data, &dictIterator, &desktopIdentity);
FF_DBUS_ITER_CONTINUE(data, &arrayIterator)
}
@@ -128,18 +124,15 @@ static bool getBusProperties(FFDBusData* data, const char* busName, FFMediaResul
return false;
}
if (result->player.length == 0)
{
if (desktopIdentity.length > 0)
{
ffStrbufDestroy(&result->player);
ffStrbufInitMove(&result->player, &desktopIdentity);
}
else
{
ffStrbufAppend(&result->player, &result->playerId);
}
}
//Set short bus name
ffStrbufAppendS(&result->playerId, busName + sizeof(FF_DBUS_MPRIS_PREFIX) - 1);
//We found a song, get the player name
ffDBusGetPropertyString(data, busName, "/org/mpris/MediaPlayer2", "org.mpris.MediaPlayer2", "Identity", &result->player);
if(result->player.length == 0)
ffDBusGetPropertyString(data, busName, "/org/mpris/MediaPlayer2", "org.mpris.MediaPlayer2", "DesktopEntry", &result->player);
if(result->player.length == 0)
ffStrbufAppend(&result->player, &result->playerId);
data->lib->ffdbus_message_unref(reply);