Updating branch refs/heads/master to 0b59cbffe41e539f763fd05978c54697e875676a (commit) from 8aa1d5eec7b7e089de47c0592e7d638a7e0e83c4 (commit)
commit 0b59cbffe41e539f763fd05978c54697e875676a Author: Sean Davis <smd.seanda...@gmail.com> Date: Sat Dec 7 08:30:15 2013 -0500 Fix GetCanSeek check and GetPosition src/parole-plugin-player.c | 3 ++- src/plugins/mpris2/mpris2-provider.c | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/parole-plugin-player.c b/src/parole-plugin-player.c index 121dc23..5966ed1 100644 --- a/src/parole-plugin-player.c +++ b/src/parole-plugin-player.c @@ -207,7 +207,8 @@ parole_plugin_player_get_stream_position (ParoleProviderPlayer *provider) position = parole_gst_get_stream_position (PAROLE_GST (player->priv->gst)); - return position; + /* Return as microseconds */ + return position*1000000.0; } static void parole_plugin_player_open_media_chooser (ParoleProviderPlayer *provider) diff --git a/src/plugins/mpris2/mpris2-provider.c b/src/plugins/mpris2/mpris2-provider.c index f707fe5..1fc8a7e 100644 --- a/src/plugins/mpris2/mpris2-provider.c +++ b/src/plugins/mpris2/mpris2-provider.c @@ -579,7 +579,6 @@ static GVariant* mpris_Player_get_CanGoPrevious (GError **error, Mpris2Provider static GVariant* mpris_Player_get_CanPlay (GError **error, Mpris2Provider *provider) { - // TODO: this can cause a UI-lock /* The CanPlay property should be true when the player is playing or paused. */ ParoleProviderPlayer *player = provider->player; gint state = parole_provider_player_get_state (player); @@ -588,7 +587,6 @@ static GVariant* mpris_Player_get_CanPlay (GError **error, Mpris2Provider *provi static GVariant* mpris_Player_get_CanPause (GError **error, Mpris2Provider *provider) { - // TODO: this can cause a UI-lock /* The CanPause property should be true when the player is playing or paused. */ ParoleProviderPlayer *player = provider->player; gint state = parole_provider_player_get_state (player); @@ -612,7 +610,6 @@ static GVariant* mpris_Player_get_CanSeek (GError **error, Mpris2Provider *provi static GVariant* mpris_Player_get_CanControl (GError **error, Mpris2Provider *provider) { - // always? return g_variant_new_boolean(TRUE); } @@ -656,6 +653,7 @@ static void parole_mpris_update_any (Mpris2Provider *provider) g_variant_builder_add (&b, "{sv}", "PlaybackStatus", mpris_Player_get_PlaybackStatus (NULL, provider)); g_variant_builder_add (&b, "{sv}", "CanPlay", mpris_Player_get_CanPlay(NULL, provider)); g_variant_builder_add (&b, "{sv}", "CanPause", mpris_Player_get_CanPause(NULL, provider)); + g_variant_builder_add (&b, "{sv}", "CanSeek", mpris_Player_get_CanSeek(NULL, provider)); } g_object_get (G_OBJECT (provider->conf), "repeat", &repeat, NULL); if(provider->saved_playbackstatus != repeat) _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits