diff options
| author | drochner <drochner> | 2010-11-15 18:56:52 +0000 |
|---|---|---|
| committer | drochner <drochner> | 2010-11-15 18:56:52 +0000 |
| commit | 94363b2785ffcaa1747b1771274f232f755e334d (patch) | |
| tree | 3663f089b2b9614a7d62f6a6576a41c5e01cb4ee /audio/albumplayer | |
| parent | 91a8d110c59b0072df016637049d6bdda39361c1 (diff) | |
| download | pkgsrc-94363b2785ffcaa1747b1771274f232f755e334d.tar.gz | |
rename local "pause" definitions, these conflict with the useless
pause(3) function recently added to -current
Diffstat (limited to 'audio/albumplayer')
| -rw-r--r-- | audio/albumplayer/distinfo | 4 | ||||
| -rw-r--r-- | audio/albumplayer/patches/patch-ad | 31 |
2 files changed, 29 insertions, 6 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)); } |