colin/playerctl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a crash when players use certain MPRIS interfaces

Browse Source 
Some players, including VLC, will try to message playerctld on
the following interfaces:
* org.mpris.MediaPlayer2.TrackLis
* org.mpris.MediaPlayer2.Playlists
These are standard-compliant, but playerctld did not know about them
and would crash on receiving such messages.
This commit is contained in:
Sara Johnsson
2020-12-29 16:27:23 +01:00
parent 94b4694a7e
commit edb76160f9
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
playerctl/playerctl-daemon.c
View File

@@ -9,6 +9,8 @@
#define DBUS_PATH "/org/freedesktop/DBus" #define DBUS_PATH "/org/freedesktop/DBus"
#define PLAYER_INTERFACE "org.mpris.MediaPlayer2.Player" #define PLAYER_INTERFACE "org.mpris.MediaPlayer2.Player"
#define ROOT_INTERFACE "org.mpris.MediaPlayer2" #define ROOT_INTERFACE "org.mpris.MediaPlayer2"
#define PLAYLISTS_INTERFACE "org.mpris.MediaPlayer2.Playlists"
#define TRACKLIST_INTERFACE "org.mpris.MediaPlayer2.TrackList"
#define PROPERTIES_INTERFACE "org.freedesktop.DBus.Properties" #define PROPERTIES_INTERFACE "org.freedesktop.DBus.Properties"
#define PLAYERCTLD_INTERFACE "com.github.altdesktop.playerctld" #define PLAYERCTLD_INTERFACE "com.github.altdesktop.playerctld"
@@ -85,13 +87,15 @@ static gboolean player_update_properties(struct Player *player, const char *inte
GVariantDict cached_properties; GVariantDict cached_properties;
GVariantIter iter; GVariantIter iter;
GVariant *child; GVariant *child;
bool is_player_interface = false; // otherwise, the root interface bool is_root_interface = false;
if (g_strcmp0(interface_name, PLAYER_INTERFACE) == 0) { if (g_strcmp0(interface_name, PLAYER_INTERFACE) == 0 ||
g_strcmp0(interface_name, TRACKLIST_INTERFACE) == 0 ||
g_strcmp0(interface_name, PLAYLISTS_INTERFACE) == 0) {
g_variant_dict_init(&cached_properties, player->player_properties); g_variant_dict_init(&cached_properties, player->player_properties);
is_player_interface = true;
} else if (g_strcmp0(interface_name, ROOT_INTERFACE) == 0) { } else if (g_strcmp0(interface_name, ROOT_INTERFACE) == 0) {
g_variant_dict_init(&cached_properties, player->root_properties); g_variant_dict_init(&cached_properties, player->root_properties);
is_root_interface = true;
} else { } else {
g_error("cannot update properties for unknown interface: %s", interface_name); g_error("cannot update properties for unknown interface: %s", interface_name);
assert(false); assert(false);
@@ -108,7 +112,7 @@ static gboolean player_update_properties(struct Player *player, const char *inte
GVariant *prop_variant = g_variant_get_child_value(child, 1); GVariant *prop_variant = g_variant_get_child_value(child, 1);
GVariant *prop_value = g_variant_get_variant(prop_variant); GVariant *prop_value = g_variant_get_variant(prop_variant);
// g_debug("key=%s, value=%s", key, g_variant_print(prop_value, TRUE)); // g_debug("key=%s, value=%s", key, g_variant_print(prop_value, TRUE));
if (is_player_interface && g_strcmp0(key, "Position") == 0) { if ( ! is_root_interface && g_strcmp0(key, "Position") == 0) {
// gets cached separately (never counts as changed) // gets cached separately (never counts as changed)
player->position = g_variant_get_int64(prop_value); player->position = g_variant_get_int64(prop_value);
goto loop_out; goto loop_out;