[rhythmbox] shell-player: remove unused parameter to rb_shell_player_playpause



commit 7c24ec4936a84b1a8e5f3ebec8eccfd49f95cc5e
Author: Jonathan Matthew <jonathan d14n org>
Date:   Sat Mar 19 20:07:16 2016 +1000

    shell-player: remove unused parameter to rb_shell_player_playpause
    
    This hasn't been part of a dbus interface for a while now

 plugins/daap/rb-dacp-player.c                 |    2 +-
 plugins/lirc/rb-lirc-plugin.c                 |    4 ++--
 plugins/mmkeys/rb-mmkeys-plugin.c             |    4 ++--
 plugins/mpris/rb-mpris-plugin.c               |    2 +-
 plugins/notification/rb-notification-plugin.c |    2 +-
 plugins/visualizer/rb-visualizer-fullscreen.c |    2 +-
 shell/rb-shell-player.c                       |    7 ++-----
 shell/rb-shell-player.h                       |    2 +-
 shell/rb-shell.c                              |    2 +-
 9 files changed, 12 insertions(+), 15 deletions(-)
---
diff --git a/plugins/daap/rb-dacp-player.c b/plugins/daap/rb-dacp-player.c
index 2d20072..3c5aaa0 100644
--- a/plugins/daap/rb-dacp-player.c
+++ b/plugins/daap/rb-dacp-player.c
@@ -314,7 +314,7 @@ rb_dacp_player_now_playing_artwork (DACPPlayer *player, guint width, guint heigh
 static void
 rb_dacp_player_play_pause (DACPPlayer *player)
 {
-       rb_shell_player_playpause (RB_DACP_PLAYER (player)->priv->shell_player, FALSE, NULL);
+       rb_shell_player_playpause (RB_DACP_PLAYER (player)->priv->shell_player, NULL);
 }
 
 static void
diff --git a/plugins/lirc/rb-lirc-plugin.c b/plugins/lirc/rb-lirc-plugin.c
index fc27c98..b69c4fa 100644
--- a/plugins/lirc/rb-lirc-plugin.c
+++ b/plugins/lirc/rb-lirc-plugin.c
@@ -128,11 +128,11 @@ rb_lirc_plugin_read_code (GIOChannel *source,
                        gboolean playing;
                        rb_shell_player_get_playing (plugin->shell_player, &playing, NULL);
                        if (playing == FALSE)
-                               rb_shell_player_playpause (plugin->shell_player, FALSE, NULL);
+                               rb_shell_player_playpause (plugin->shell_player, NULL);
                } else if (strcmp (str, RB_IR_COMMAND_PAUSE) == 0) {
                        rb_shell_player_pause (plugin->shell_player, NULL);
                } else if (strcmp (str, RB_IR_COMMAND_PLAYPAUSE) == 0) {
-                       rb_shell_player_playpause (plugin->shell_player, FALSE, NULL);
+                       rb_shell_player_playpause (plugin->shell_player, NULL);
                } else if (strcmp (str, RB_IR_COMMAND_STOP) == 0) {
                        rb_shell_player_stop (plugin->shell_player);
                } else if (strcmp (str, RB_IR_COMMAND_SHUFFLE) == 0) {
diff --git a/plugins/mmkeys/rb-mmkeys-plugin.c b/plugins/mmkeys/rb-mmkeys-plugin.c
index 29b79ba..9ea35eb 100644
--- a/plugins/mmkeys/rb-mmkeys-plugin.c
+++ b/plugins/mmkeys/rb-mmkeys-plugin.c
@@ -115,7 +115,7 @@ media_player_key_pressed (GDBusProxy *proxy,
        }
 
        if (strcmp (key, "Play") == 0) {
-               rb_shell_player_playpause (plugin->shell_player, FALSE, NULL);
+               rb_shell_player_playpause (plugin->shell_player, NULL);
        } else if (strcmp (key, "Pause") == 0) {
                rb_shell_player_pause (plugin->shell_player, NULL);
        } else if (strcmp (key, "Stop") == 0) {
@@ -272,7 +272,7 @@ filter_mmkeys (GdkXEvent *xevent,
        display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
 
        if (XKeysymToKeycode (display, XF86XK_AudioPlay) == key->keycode) {
-               rb_shell_player_playpause (player, FALSE, NULL);
+               rb_shell_player_playpause (player, NULL);
                return GDK_FILTER_REMOVE;
        } else if (XKeysymToKeycode (display, XF86XK_AudioPause) == key->keycode) {
                rb_shell_player_pause (player, NULL);
diff --git a/plugins/mpris/rb-mpris-plugin.c b/plugins/mpris/rb-mpris-plugin.c
index 3d9b8ee..a51735b 100644
--- a/plugins/mpris/rb-mpris-plugin.c
+++ b/plugins/mpris/rb-mpris-plugin.c
@@ -643,7 +643,7 @@ handle_player_method_call (GDBusConnection *connection,
                ret = rb_shell_player_pause (plugin->player, &error);
                handle_result (invocation, ret, error);
        } else if (g_strcmp0 (method_name, "PlayPause") == 0) {
-               ret = rb_shell_player_playpause (plugin->player, TRUE, &error);
+               ret = rb_shell_player_playpause (plugin->player, &error);
                handle_result (invocation, ret, error);
        } else if (g_strcmp0 (method_name, "Stop") == 0) {
                rb_shell_player_stop (plugin->player);
diff --git a/plugins/notification/rb-notification-plugin.c b/plugins/notification/rb-notification-plugin.c
index 9303121..e42064b 100644
--- a/plugins/notification/rb-notification-plugin.c
+++ b/plugins/notification/rb-notification-plugin.c
@@ -111,7 +111,7 @@ notification_playpause_cb (NotifyNotification *notification,
                           RBNotificationPlugin *plugin)
 {
        rb_debug ("notification action: %s", action);
-       rb_shell_player_playpause (plugin->shell_player, FALSE, NULL);
+       rb_shell_player_playpause (plugin->shell_player, NULL);
 }
 
 static void
diff --git a/plugins/visualizer/rb-visualizer-fullscreen.c b/plugins/visualizer/rb-visualizer-fullscreen.c
index f575e66..37b3560 100644
--- a/plugins/visualizer/rb-visualizer-fullscreen.c
+++ b/plugins/visualizer/rb-visualizer-fullscreen.c
@@ -453,7 +453,7 @@ static void
 playpause_clicked_cb (MxButton *button, RBShellPlayer *player)
 {
        clutter_threads_leave ();
-       rb_shell_player_playpause (player, FALSE, NULL);
+       rb_shell_player_playpause (player, NULL);
        clutter_threads_enter ();
 }
 
diff --git a/shell/rb-shell-player.c b/shell/rb-shell-player.c
index 7ee0975..8d5933b 100644
--- a/shell/rb-shell-player.c
+++ b/shell/rb-shell-player.c
@@ -1329,11 +1329,9 @@ rb_shell_player_play_entry (RBShellPlayer *player,
        }
 }
 
-/* unused parameter can't be removed without breaking dbus interface compatibility */
 /**
  * rb_shell_player_playpause:
  * @player: the #RBShellPlayer
- * @unused: nothing
  * @error: returns error information
  *
  * Toggles between playing and paused state.  If there is no playing
@@ -1344,7 +1342,6 @@ rb_shell_player_play_entry (RBShellPlayer *player,
  */
 gboolean
 rb_shell_player_playpause (RBShellPlayer *player,
-                          gboolean unused,
                           GError **error)
 {
        gboolean ret;
@@ -2169,7 +2166,7 @@ rb_shell_player_pause (RBShellPlayer *player,
                       GError **error)
 {
        if (rb_player_playing (player->priv->mmplayer))
-               return rb_shell_player_playpause (player, FALSE, error);
+               return rb_shell_player_playpause (player, error);
        else
                return TRUE;
 }
@@ -2774,7 +2771,7 @@ play_action_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data)
        GError *error = NULL;
 
        rb_debug ("play!");
-       if (rb_shell_player_playpause (player, FALSE, &error) == FALSE) {
+       if (rb_shell_player_playpause (player, &error) == FALSE) {
                rb_error_dialog (NULL,
                                 _("Couldn't start playback"),
                                 "%s", (error) ? error->message : "(null)");
diff --git a/shell/rb-shell-player.h b/shell/rb-shell-player.h
index 3b8a5f7..01a5092 100644
--- a/shell/rb-shell-player.h
+++ b/shell/rb-shell-player.h
@@ -106,7 +106,7 @@ void                        rb_shell_player_play_entry      (RBShellPlayer *player,
                                                         RBSource *source);
 gboolean               rb_shell_player_play            (RBShellPlayer *player, GError **error);
 gboolean               rb_shell_player_pause           (RBShellPlayer *player, GError **error);
-gboolean                rb_shell_player_playpause      (RBShellPlayer *player, gboolean unused, GError 
**error);
+gboolean                rb_shell_player_playpause      (RBShellPlayer *player, GError **error);
 void                   rb_shell_player_stop            (RBShellPlayer *player);
 gboolean                rb_shell_player_do_previous    (RBShellPlayer *player, GError **error);
 gboolean               rb_shell_player_do_next         (RBShellPlayer *player, GError **error);
diff --git a/shell/rb-shell.c b/shell/rb-shell.c
index 4f34aad..39e0082 100644
--- a/shell/rb-shell.c
+++ b/shell/rb-shell.c
@@ -2068,7 +2068,7 @@ rb_shell_activate_source (RBShell *shell, RBSource *source, guint play, GError *
                /* fall through */
        case RB_SHELL_ACTIVATION_ALWAYS_PLAY:
                rb_shell_player_set_playing_source (shell->priv->player_shell, source);
-               return rb_shell_player_playpause (shell->priv->player_shell, FALSE, error);
+               return rb_shell_player_playpause (shell->priv->player_shell, error);
 
        default:
                return FALSE;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]