add extra preference to the "Output" -> "ogg123" tab: "User options:" as per

the mpg123 tab.  this allows setting ogg123 options such as "--buffer 5000".

XXX:	i haven't patched any of the localisation stuff for this because i
	have NFC how to do it.

4 files changed, 138 insertions, 6 deletions

diff --git a/audio/gqmpeg/distinfo b/audio/gqmpeg/distinfo
index dec3d6dfa2c..1a46fc06975 100644
--- a/audio/gqmpeg/distinfo
+++ b/audio/gqmpeg/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.4 2001/08/16 11:37:47 rh Exp $
+$NetBSD: distinfo,v 1.5 2001/08/24 08:27:42 lukem Exp $
 
 SHA1 (gqmpeg-0.9.0.tar.gz) = ee19187ec6057f339206cf42c0e5dbdfb18d3a5b
 Size (gqmpeg-0.9.0.tar.gz) = 538514 bytes
 SHA1 (patch-aa) = ab5b8c9d994d0ee2a1401d3d9cb6eb2617af208c
 SHA1 (patch-ab) = 98f5a71298f23fd82cfca5b086b25bd784582f74
-SHA1 (patch-ac) = 6fb2a2bdd3610c5f4ef94b0c3ee7ad6d93f90826
+SHA1 (patch-ac) = c785ce1a8e248b21c696c66d71849ea0303720e7
 SHA1 (patch-ad) = 378854c95b4ca4a837a82cea607337dfb4ca01ef
+SHA1 (patch-ae) = e10060592a0031d876c0173d6eb0a32734249421
+SHA1 (patch-af) = 6060d77be24fd7c655f2619fca2fce58da258ab1
diff --git a/audio/gqmpeg/patches/patch-ac b/audio/gqmpeg/patches/patch-ac
index 8719eaa42b3..e667494bd45 100644
--- a/audio/gqmpeg/patches/patch-ac
+++ b/audio/gqmpeg/patches/patch-ac
@@ -1,8 +1,16 @@
-$NetBSD: patch-ac,v 1.3 2001/03/25 16:21:52 hubertf Exp $
+$NetBSD: patch-ac,v 1.4 2001/08/24 08:27:43 lukem Exp $
 
---- src/io_ogg123.c.orig	Fri Feb 16 03:53:18 2001
-+++ src/io_ogg123.c
-@@ -52,10 +52,15 @@
+--- src/io_ogg123.c.orig	Fri Feb 16 13:53:18 2001
++++ src/io_ogg123.c	Fri Aug 24 17:28:58 2001
+@@ -35,6 +35,7 @@ gint ogg123_enabled = FALSE;
+ 
+ gint ogg123_device = 0;
+ gchar *ogg123_device_options = NULL;
++gchar *ogg123_extra_options = NULL;
+ 
+ /* internal stuff */
+ static SongData *ogg123_current_sd = NULL;
+@@ -52,10 +53,15 @@ static int ogg123_pipe[2];
  
  static const gchar *ogg123_output_devices[] =
  {
@@ -18,3 +26,46 @@ $NetBSD: patch-ac,v 1.3 2001/03/25 16:21:52 hubertf Exp $
  	"wav",
  	NULL
  };
+@@ -332,11 +338,13 @@ static void ogg123_input_read_cb(gpointe
+  *-----------------------------------------------------------------------------
+  */
+ 
++#define OGG123_MAX_COMMANDS 32
++
+ static gint ogg123_child_run(SongData *sd, gint position)
+ {
+ 	pid_t frk_pid;
+-	char cmd_arguments[16][512];
+-	char *cmd_ptr[16];
++	char cmd_arguments[OGG123_MAX_COMMANDS][512];
++	char *cmd_ptr[OGG123_MAX_COMMANDS];
+ 	int cmd_cnt = 0;
+ 	gchar *exec_bin = OGG123_BINARY;
+ 
+@@ -370,6 +378,26 @@ static gint ogg123_child_run(SongData *s
+ 		sprintf(cmd_arguments[cmd_cnt], "--device-option=%s", ogg123_device_options);
+ 		cmd_ptr[cmd_cnt] = cmd_arguments[cmd_cnt];
+ 		cmd_cnt++;
++		}
++
++	if (ogg123_extra_options &&
++	    strlen(ogg123_extra_options) > 0 &&
++	    cmd_cnt + 2 < OGG123_MAX_COMMANDS)
++		{
++		gchar **vector;
++		gint i;
++
++		vector = g_strsplit(ogg123_extra_options, " ", OGG123_MAX_COMMANDS - 2 - cmd_cnt);
++		i = 0;
++
++		while(vector && vector[i] != NULL)
++			{
++			strcpy(cmd_arguments[cmd_cnt], vector[i]);
++			cmd_ptr[cmd_cnt] = cmd_arguments[cmd_cnt];
++			cmd_cnt++;
++			i++;
++			}
++		g_strfreev(vector);
+ 		}
+ 
+ 	strcpy(cmd_arguments[cmd_cnt], sd->path);
diff --git a/audio/gqmpeg/patches/patch-ae b/audio/gqmpeg/patches/patch-ae
new file mode 100644
index 00000000000..e4e83a1a856
--- /dev/null
+++ b/audio/gqmpeg/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2001/08/24 08:27:43 lukem Exp $
+
+--- src/io_ogg123.h.orig	Fri Feb 16 13:52:44 2001
++++ src/io_ogg123.h	Fri Aug 24 17:28:40 2001
+@@ -18,6 +18,7 @@ extern gint ogg123_enabled;
+ 
+ extern gint ogg123_device;
+ extern gchar *ogg123_device_options;
++extern gchar *ogg123_extra_options;
+ 
+ 
+ /*
diff --git a/audio/gqmpeg/patches/patch-af b/audio/gqmpeg/patches/patch-af
new file mode 100644
index 00000000000..c6a9514c65a
--- /dev/null
+++ b/audio/gqmpeg/patches/patch-af
@@ -0,0 +1,67 @@
+--- src/io_ogg123_cfg.c.orig	Fri Feb 16 13:53:38 2001
++++ src/io_ogg123_cfg.c	Fri Aug 24 17:56:24 2001
+@@ -17,6 +17,7 @@
+ 
+ static GtkWidget *ogg123_vbox = NULL;
+ static GtkWidget *ogg123_device_options_entry = NULL;
++static GtkWidget *ogg123_extra_options_entry = NULL;
+ 
+ gint c_ogg123_device;
+ 
+@@ -33,6 +34,8 @@ void ogg123_config_load(FILE *f, const g
+ 		"ogg123_device", value, ogg123_device);
+ 	ogg123_device_options = read_char_option(f, option,
+ 		"ogg123_device_options", value, ogg123_device_options);
++	ogg123_extra_options = read_char_option(f, option,
++		"ogg123_extra_options", value_all, ogg123_extra_options);
+ }
+ 
+ void ogg123_config_save(FILE *f)
+@@ -41,6 +44,7 @@ void ogg123_config_save(FILE *f)
+ 
+ 	write_int_option(f, "ogg123_device", ogg123_device);
+ 	write_char_option(f, "ogg123_device_options", ogg123_device_options);
++	write_char_option(f, "ogg123_extra_options", ogg123_extra_options);
+ }
+ 
+ /*
+@@ -61,6 +65,11 @@ void ogg123_config_apply(void)
+ 	if (buf && strlen(buf) > 0) ogg123_device_options = g_strdup(buf);
+ 
+ 	ogg123_device = c_ogg123_device;
++
++	g_free(ogg123_extra_options);
++	ogg123_extra_options = NULL;
++	buf = gtk_entry_get_text(GTK_ENTRY(ogg123_extra_options_entry));
++	if (buf && strlen(buf) > 0) ogg123_extra_options = g_strdup(buf);
+ }
+ 
+ void ogg123_config_close(void)
+@@ -154,6 +163,27 @@ GtkWidget *ogg123_config_init(void)
+ 	if (ogg123_device_options) gtk_entry_set_text(GTK_ENTRY(ogg123_device_options_entry), ogg123_device_options);
+ 	gtk_box_pack_start(GTK_BOX(hbox), ogg123_device_options_entry, TRUE, TRUE, 0);
+ 	gtk_widget_show(ogg123_device_options_entry);
++
++	hbox = gtk_hbox_new (FALSE, 5);
++	gtk_container_border_width (GTK_CONTAINER(hbox), 5);
++	gtk_box_pack_start(GTK_BOX(ogg123_vbox), hbox, FALSE, FALSE, 0);
++	gtk_widget_show(hbox);
++
++	label = gtk_label_new(_("User options:"));
++	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
++	gtk_widget_show(label);
++
++	ogg123_extra_options_entry = gtk_entry_new_with_max_length(255);
++	if (ogg123_extra_options)
++		{
++		gtk_entry_set_text(GTK_ENTRY(ogg123_extra_options_entry), ogg123_extra_options);
++		}
++	gtk_box_pack_start(GTK_BOX(hbox), ogg123_extra_options_entry, FALSE, FALSE, 0);
++	gtk_widget_show(ogg123_extra_options_entry);
++
++	label = gtk_label_new(_("ogg123 options do not take effect until the next song."));
++	gtk_box_pack_start(GTK_BOX(ogg123_vbox), label, FALSE, FALSE, 0);
++	gtk_widget_show (label);
+ 
+ 	if (!ogg123_enabled) gtk_widget_set_sensitive(ogg123_vbox, FALSE);
+ 	return ogg123_vbox;