audio/rhythmbox/patches/patch-ag

   1 $NetBSD$
   2
   3 --- remote/dbus/rb-client.c.orig        2010-03-25 00:10:14.000000000 +0000
   4 +++ remote/dbus/rb-client.c
   5 @@ -54,7 +54,7 @@ static gboolean previous = FALSE;
   6  static gboolean notify = FALSE;
   7
   8  static gboolean play = FALSE;
   9 -static gboolean pause = FALSE;
  10 +static gboolean rb_pause = FALSE;
  11  static gboolean play_pause = FALSE;
  12  static gboolean stop = FALSE;
  13
  14 @@ -91,7 +91,7 @@ static GOptionEntry args[] = {
  15         { "notify", 0, 0, G_OPTION_ARG_NONE, &notify, N_("Show notification of the playing song"), NULL },
  16
  17         { "play", 0, 0, G_OPTION_ARG_NONE, &play, N_("Resume playback if currently paused"), NULL },
  18 -       { "pause", 0, 0, G_OPTION_ARG_NONE, &pause, N_("Pause playback if currently playing"), NULL },
  19 +       { "pause", 0, 0, G_OPTION_ARG_NONE, &rb_pause, N_("Pause playback if currently playing"), NULL },
  20         { "play-pause", 0, 0, G_OPTION_ARG_NONE, &play_pause, N_("Toggle play/pause mode"), NULL },
  21  /*     { "stop", 0, 0, G_OPTION_ARG_NONE, &stop, N_("Stop playback"), NULL }, */
  22
  23 @@ -608,7 +608,7 @@ main (int argc, char **argv)
  24         if (next || previous ||
  25             clear_queue ||
  26             play_uri || other_stuff ||
  27 -           play || pause || play_pause || stop ||
  28 +           play || rb_pause || play_pause || stop ||
  29             print_playing || print_playing_format || notify ||
  30             (set_volume > -0.01) || volume_up || volume_down || print_volume || mute || unmute || (set_rating > -0.01))
  31                 no_present = TRUE;
  32 @@ -696,7 +696,7 @@ main (int argc, char **argv)
  33         org_gnome_Rhythmbox_Player_get_playing (player_proxy, &is_playing, &error);
  34         if (!annoy (&error)) {
  35                 rb_debug ("playback state: %d", is_playing);
  36 -               if (play || pause || play_pause) {
  37 +               if (play || rb_pause || play_pause) {
  38                         if (is_playing != play || play_pause) {
  39                                 rb_debug ("calling playPause to change playback state");
  40                                 org_gnome_Rhythmbox_Player_play_pause (player_proxy, FALSE, &error);