Attachment 883426 Details for Bug 1084827 – Patch

[patch] Patch

0012-rename-pause-to-avoid-conflict.patch (text/plain), 2.10 KB, created by Phil Wyett on 2014-04-06 22:09:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Phil Wyett

Created: 2014-04-06 22:09:30 UTC

Size: 2.10 KB

patch

obsolete

>From bd389d8e8a2b1f3a914dcd4bb17e75fb8837d78a Mon Sep 17 00:00:00 2001
>From: Jonathan Matthew <jonathan@d14n.org>
>Date: Tue, 1 Jun 2010 10:55:27 +1000
>Subject: rb-client: rename 'pause' to avoid conflict with pause(2) (bug
> #620199)
>
>
>diff --git a/remote/dbus/rb-client.c b/remote/dbus/rb-client.c
>index 648dd2f..5bb34a2 100644
>--- a/remote/dbus/rb-client.c
>+++ b/remote/dbus/rb-client.c
>@@ -54,7 +54,7 @@ static gboolean previous = FALSE;
> static gboolean notify = FALSE;
> 
> static gboolean play = FALSE;
>-static gboolean pause = FALSE;
>+static gboolean do_pause = FALSE;
> static gboolean play_pause = FALSE;
> static gboolean stop = FALSE;
> 
>@@ -91,7 +91,7 @@ static GOptionEntry args[] = {
> 	{ "notify", 0, 0, G_OPTION_ARG_NONE, &notify, N_("Show notification of the playing song"), NULL },
> 
> 	{ "play", 0, 0, G_OPTION_ARG_NONE, &play, N_("Resume playback if currently paused"), NULL },
>-	{ "pause", 0, 0, G_OPTION_ARG_NONE, &pause, N_("Pause playback if currently playing"), NULL },
>+	{ "pause", 0, 0, G_OPTION_ARG_NONE, &do_pause, N_("Pause playback if currently playing"), NULL },
> 	{ "play-pause", 0, 0, G_OPTION_ARG_NONE, &play_pause, N_("Toggle play/pause mode"), NULL },
> /*	{ "stop", 0, 0, G_OPTION_ARG_NONE, &stop, N_("Stop playback"), NULL }, */
> 
>@@ -608,7 +608,7 @@ main (int argc, char **argv)
> 	if (next || previous ||
> 	    clear_queue ||
> 	    play_uri || other_stuff ||
>-	    play || pause || play_pause || stop ||
>+	    play || do_pause || play_pause || stop ||
> 	    print_playing || print_playing_format || notify ||
> 	    (set_volume > -0.01) || volume_up || volume_down || print_volume || mute || unmute || (set_rating > -0.01))
> 		no_present = TRUE;
>@@ -696,7 +696,7 @@ main (int argc, char **argv)
> 	org_gnome_Rhythmbox_Player_get_playing (player_proxy, &is_playing, &error);
> 	if (!annoy (&error)) {
> 		rb_debug ("playback state: %d", is_playing);
>-		if (play || pause || play_pause) {
>+		if (play || do_pause || play_pause) {
> 			if (is_playing != play || play_pause) {
> 				rb_debug ("calling playPause to change playback state");
> 				org_gnome_Rhythmbox_Player_play_pause (player_proxy, FALSE, &error);
>-- 
>cgit v0.10.1
>

Actions: View | Diff

Attachments on bug 1084827: 883426 | 883427