diff options
author | grant <grant> | 2004-11-18 06:25:11 +0000 |
---|---|---|
committer | grant <grant> | 2004-11-18 06:25:11 +0000 |
commit | 798f7fb067cace731934e25587ac342b877100bb (patch) | |
tree | 8365d16386641f6fe5cce059e19c21e90fb69fe1 /audio | |
parent | 866ce53b23032b169fa6b351bc297ededfbadded (diff) | |
download | pkgsrc-798f7fb067cace731934e25587ac342b877100bb.tar.gz |
apply patches based on what is found at:
http://www.steve.org.uk/Software/xmms/
for command line volume control:
-l (louder)
-q (qieter)
bump PKGREVISION.
Diffstat (limited to 'audio')
-rw-r--r-- | audio/xmms/Makefile | 4 | ||||
-rw-r--r-- | audio/xmms/distinfo | 5 | ||||
-rw-r--r-- | audio/xmms/patches/patch-ah | 27 | ||||
-rw-r--r-- | audio/xmms/patches/patch-ai | 14 | ||||
-rw-r--r-- | audio/xmms/patches/patch-aj | 55 |
5 files changed, 102 insertions, 3 deletions
diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile index d248c389ea9..06d6ed15033 100644 --- a/audio/xmms/Makefile +++ b/audio/xmms/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.55 2004/10/03 00:13:10 tv Exp $ +# $NetBSD: Makefile,v 1.56 2004/11/18 06:25:11 grant Exp $ # -PKGREVISION= 1 +PKGREVISION= 2 .include "Makefile.common" diff --git a/audio/xmms/distinfo b/audio/xmms/distinfo index 6b273c22aa3..07509d77a0d 100644 --- a/audio/xmms/distinfo +++ b/audio/xmms/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.22 2004/05/19 06:09:25 minskim Exp $ +$NetBSD: distinfo,v 1.23 2004/11/18 06:25:11 grant Exp $ SHA1 (xmms-1.2.10.tar.bz2) = a3c3d3756d5263183c27b3c50a7f5404cba8bfaf Size (xmms-1.2.10.tar.bz2) = 2418265 bytes @@ -9,3 +9,6 @@ SHA1 (patch-ad) = 4b1856f43c4cd92418046afa3f9c91f6d0900328 SHA1 (patch-ae) = ee126d0744feea2e260a0080a6903ea49a0b12ec SHA1 (patch-af) = 9b97ab806c497533a0e4d116a072a5d7920a15a6 SHA1 (patch-ag) = d03063c53d2b04c0d172a3e420c5cb0319e4ae59 +SHA1 (patch-ah) = a49b667b145380f501ebd932185014d4a957e287 +SHA1 (patch-ai) = c0bb82e63e6fb96327b1ee1e9ec5617fe9b55b44 +SHA1 (patch-aj) = 67a69e2a05f343a5d7c22b3f1f1cf0c25d9aeb6d diff --git a/audio/xmms/patches/patch-ah b/audio/xmms/patches/patch-ah new file mode 100644 index 00000000000..e807429327f --- /dev/null +++ b/audio/xmms/patches/patch-ah @@ -0,0 +1,27 @@ +$NetBSD: patch-ah,v 1.8 2004/11/18 06:25:11 grant Exp $ + +--- libxmms/xmmsctrl.c.orig 2004-02-24 07:31:42.000000000 +1100 ++++ libxmms/xmmsctrl.c +@@ -382,6 +382,22 @@ void xmms_remote_play_pause(gint session + remote_cmd(session, CMD_PLAY_PAUSE); + } + ++void xmms_remote_main_volume_up(gint session) ++{ ++ gint vol = xmms_remote_get_main_volume(session); ++ vol += 5; ++ xmms_remote_set_main_volume(session, vol); ++} ++ ++void xmms_remote_main_volume_down(gint session) ++{ ++ gint vol = xmms_remote_get_main_volume(session); ++ vol -= 5; ++ if (vol < 0) ++ vol = 0; ++ xmms_remote_set_main_volume(session, vol); ++} ++ + gboolean xmms_remote_is_playing(gint session) + { + return remote_get_gboolean(session, CMD_IS_PLAYING); diff --git a/audio/xmms/patches/patch-ai b/audio/xmms/patches/patch-ai new file mode 100644 index 00000000000..3e6f0387beb --- /dev/null +++ b/audio/xmms/patches/patch-ai @@ -0,0 +1,14 @@ +$NetBSD: patch-ai,v 1.9 2004/11/18 06:25:11 grant Exp $ + +--- libxmms/xmmsctrl.h.orig 2003-06-12 04:44:17.000000000 +1000 ++++ libxmms/xmmsctrl.h +@@ -83,6 +83,9 @@ void xmms_remote_quit(gint session); + void xmms_remote_play_pause(gint session); + void xmms_remote_playlist_ins_url_string(gint session, gchar * string, gint pos); + ++void xmms_remote_main_volume_up(gint session ); ++void xmms_remote_main_volume_down(gint session ); ++ + + #ifdef __cplusplus + }; diff --git a/audio/xmms/patches/patch-aj b/audio/xmms/patches/patch-aj new file mode 100644 index 00000000000..2ef5d12c2d5 --- /dev/null +++ b/audio/xmms/patches/patch-aj @@ -0,0 +1,55 @@ +$NetBSD: patch-aj,v 1.3 2004/11/18 06:25:11 grant Exp $ + +--- xmms/main.c.orig 2004-02-24 07:31:43.000000000 +1100 ++++ xmms/main.c +@@ -3212,6 +3212,8 @@ static struct option long_options[] = + {"show-main-window", 0, NULL, 'm'}, + {"version", 0, NULL, 'v'}, + {"sm-client-id", 1, NULL, 'i'}, ++ {"vol-up", 0, NULL, 'l'}, ++ {"vol-down", 0, NULL, 'q'}, + {0, 0, 0, 0} + }; + +@@ -3263,7 +3265,7 @@ void display_usage(void) + struct cmdlineopt { + GList *filenames; + int session; +- gboolean play, stop, pause, fwd, rew, play_pause; ++ gboolean play, stop, pause, fwd, rew, play_pause, louder, quieter; + gboolean enqueue, mainwin, remote; + char *previous_session_id; + }; +@@ -3275,7 +3277,7 @@ void parse_cmd_line(int argc, char **arg + + memset(opt, 0, sizeof(struct cmdlineopt)); + opt->session = -1; +- while ((c = getopt_long(argc, argv, "hn:rpusfemvt", long_options, NULL)) != -1) ++ while ((c = getopt_long(argc, argv, "hn:rpusfemvtlq", long_options, NULL)) != -1) + { + switch (c) + { +@@ -3316,6 +3318,12 @@ void parse_cmd_line(int argc, char **arg + case 'i': + opt->previous_session_id = g_strdup(optarg); + break; ++ case 'l': ++ opt->louder = TRUE; ++ break; ++ case 'q': ++ opt->quieter = TRUE; ++ break; + } + } + for (i = optind; i < argc; i++) +@@ -3380,6 +3388,10 @@ void handle_cmd_line_options(struct cmdl + xmms_remote_play_pause(opt->session); + if (opt->mainwin) + xmms_remote_main_win_toggle(opt->session, TRUE); ++ if (opt->louder) ++ xmms_remote_main_volume_up(opt->session); ++ if (opt->quieter) ++ xmms_remote_main_volume_down(opt->session); + } + + void segfault_handler(int sig) |