rename local "pause" definitions, these conflict with the useless

pause(3) function recently added to -current

6 files changed, 95 insertions, 8 deletions

diff --git a/audio/albumplayer/distinfo b/audio/albumplayer/distinfo
index b027da1e98b..654ea573048 100644
--- a/audio/albumplayer/distinfo
+++ b/audio/albumplayer/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2010/07/20 21:00:42 drochner Exp $
+$NetBSD: distinfo,v 1.6 2010/11/15 18:56:52 drochner Exp $
 
 SHA1 (albumplayer-0.3.1.tar.gz) = 9da99b02090a74bb133049bc7ff92ac0a66875a5
 RMD160 (albumplayer-0.3.1.tar.gz) = 332f4127e6832fa88fdf11b23ba8f1609ebcff29
 Size (albumplayer-0.3.1.tar.gz) = 200321 bytes
-SHA1 (patch-ad) = 8960d9e4c3119a93cfaed97c4075bc45d7be1744
+SHA1 (patch-ad) = 791364ae18ec8ca04170042e7554dba153be9f4a
diff --git a/audio/albumplayer/patches/patch-ad b/audio/albumplayer/patches/patch-ad
index 5274f03c8e2..82a6837d397 100644
--- a/audio/albumplayer/patches/patch-ad
+++ b/audio/albumplayer/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1 2009/09/09 16:54:13 drochner Exp $
+$NetBSD: patch-ad,v 1.2 2010/11/15 18:56:52 drochner Exp $
 
---- main.c.orig	2009-09-08 22:05:17.000000000 +0200
+--- main.c.orig	2010-06-23 08:37:56.000000000 +0000
 +++ main.c
 @@ -55,6 +55,7 @@ GdkPixbuf *questionmark;
  GdkPixbuf *coverlayer;
@@ -10,7 +10,30 @@ $NetBSD: patch-ad,v 1.1 2009/09/09 16:54:13 drochner Exp $
  
  GdkPixbuf* scale_width(GdkPixbuf* pb, float nw) {
    double width = gdk_pixbuf_get_width(pb);
-@@ -601,6 +602,8 @@ void pause_cb(gpointer seekbar) {
+@@ -352,7 +353,7 @@ guint64 pos_within_track(int tr) {
+   return secs;
+ }
+ 
+-void pause() {
++void ap_pause() {
+   GtkWidget* pausebutton = GTK_WIDGET(gtk_builder_get_object(builder, "tool_play"));
+ 
+   gst_element_set_state(pipeline, GST_STATE_PAUSED);
+@@ -577,7 +578,7 @@ void next_cb() {
+ }
+ 
+ void stop() {
+-  pause();
++  ap_pause();
+   gst_element_set_state(pipeline, GST_STATE_NULL);
+   jump_to_track(0, 0);
+ }
+@@ -597,10 +598,12 @@ void seek_cb (gpointer seekbar) {
+ 
+ void pause_cb(gpointer seekbar) {
+   if(!playing) play();
+-  else pause();
++  else ap_pause();
  }
  
  gboolean progress_timeout_cb(gpointer seekbar) {
@@ -19,7 +42,7 @@ $NetBSD: patch-ad,v 1.1 2009/09/09 16:54:13 drochner Exp $
    if(loaded) {
      g_signal_handlers_block_by_func(seekbar, seek_cb, seekbar);
  
-@@ -860,6 +863,7 @@ main (int argc, char *argv[])
+@@ -861,6 +864,7 @@ main (int argc, char *argv[])
      gst_element_set_state(pipeline, GST_STATE_NULL);
      gst_object_unref(GST_OBJECT(pipeline));
    }
diff --git a/audio/rhythmbox/distinfo b/audio/rhythmbox/distinfo
index 92a9c3f0f83..f65a02a6ad8 100644
--- a/audio/rhythmbox/distinfo
+++ b/audio/rhythmbox/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2010/05/20 21:15:54 drochner Exp $
+$NetBSD: distinfo,v 1.36 2010/11/15 18:56:52 drochner Exp $
 
 SHA1 (rhythmbox-0.12.8.tar.bz2) = 5d27923cc29b81d7bfbc73d867d7976a5295f964
 RMD160 (rhythmbox-0.12.8.tar.bz2) = 072d4fa06408ebc181b40147db1575d0ef4c99fe
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = a31b22483c63ee73bf32ca583afcc82c29e9562a
 SHA1 (patch-ad) = 367a6014863472ec73fccd47a32437632a4492a2
 SHA1 (patch-ae) = 95bc80c0b6e760613f2e1ad715e05de7b45af0bb
 SHA1 (patch-af) = 8babe8d7e5912f0fbd3a12d0c39dfecf75fef4af
+SHA1 (patch-ag) = de1b458b7a8510f9aded9763947e878597e28b43
diff --git a/audio/rhythmbox/patches/patch-ag b/audio/rhythmbox/patches/patch-ag
new file mode 100644
index 00000000000..4d5029efc38
--- /dev/null
+++ b/audio/rhythmbox/patches/patch-ag
@@ -0,0 +1,40 @@
+$NetBSD: patch-ag,v 1.5 2010/11/15 18:56:52 drochner Exp $
+
+--- remote/dbus/rb-client.c.orig	2010-03-25 00:10:14.000000000 +0000
++++ 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 rb_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, &rb_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 || rb_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 || rb_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);
diff --git a/audio/sound-juicer/distinfo b/audio/sound-juicer/distinfo
index cfcb5bd9509..b48b1a40526 100644
--- a/audio/sound-juicer/distinfo
+++ b/audio/sound-juicer/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2010/05/18 20:03:04 drochner Exp $
+$NetBSD: distinfo,v 1.11 2010/11/15 18:56:53 drochner Exp $
 
 SHA1 (sound-juicer-2.28.2.tar.gz) = 686d251a1cee27e9bb4d74f1b070409c3f09eba5
 RMD160 (sound-juicer-2.28.2.tar.gz) = 6479256a91d46b7470658e467cf1c784ba37d511
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = 6ebf792610b37c8a9c893205a56088c450065208
 SHA1 (patch-ac) = a84f8723708ac79d8dbacbac9c3745511eddcf4b
 SHA1 (patch-ad) = 6a908c4ed4aa8ca4890a9e0c445cb3f94ec6bb94
 SHA1 (patch-ae) = a0363fa03752f7d1c1d46b232ae3d4d08bd7b0a1
+SHA1 (patch-af) = 5b2ae061e8d6ebfe6049da2dd2ba46a54f911000
diff --git a/audio/sound-juicer/patches/patch-af b/audio/sound-juicer/patches/patch-af
new file mode 100644
index 00000000000..96ffb96a93c
--- /dev/null
+++ b/audio/sound-juicer/patches/patch-af
@@ -0,0 +1,22 @@
+$NetBSD: patch-af,v 1.1 2010/11/15 18:56:53 drochner Exp $
+
+--- src/sj-play.c.orig	2010-03-30 14:29:55.000000000 +0000
++++ src/sj-play.c
+@@ -96,7 +96,7 @@ play (void)
+  * Pause
+  */
+ static void
+-pause (void)
++sj_pause (void)
+ {
+   gst_element_set_state (pipeline, GST_STATE_PAUSED);
+ }
+@@ -440,7 +440,7 @@ on_play_activate (GtkWidget *button, gpo
+   GError *err = NULL;
+ 
+   if (is_playing ()) {
+-    pause ();
++    sj_pause ();
+     gtk_list_store_set (track_store, &current_iter,
+                         COLUMN_STATE, STATE_PAUSED, -1);
+  } else if (pipeline && GST_STATE (pipeline) == GST_STATE_PAUSED &&