# HG changeset patch
# User giacomo
# Date 1169422400 28800
# Node ID be4cde738a73d811e9dbeb057358dc922ced95c2
# Parent  ce4efa148521aac672fdf9889b3f4b913e2b1d6b
[svn] flac 112 plugin: disabled built-in http stream support

diff -r ce4efa148521 -r be4cde738a73 ChangeLog
--- a/ChangeLog	Sun Jan 21 15:15:38 2007 -0800
+++ b/ChangeLog	Sun Jan 21 15:33:20 2007 -0800
@@ -1,3 +1,11 @@
+2007-01-21 23:15:38 +0000  Giacomo Lozito <james@develia.org>
+  revision [1064]
+  flac 112 plugin: playback and detection use vfs; current situation is pretty similar to the one of flac 113 plugin
+  trunk/src/flac112/plugin.c             |  247 ++++++++++++++++++++++++---------
+  trunk/src/flac112/plugin_common/tags.c |    5 
+  2 files changed, 191 insertions(+), 61 deletions(-)
+
+
 2007-01-21 19:17:52 +0000  Giacomo Lozito <james@develia.org>
   revision [1062]
   - flac 113 plugin: allow to do seek and other operations on http sources
diff -r ce4efa148521 -r be4cde738a73 src/flac112/configure.c
--- a/src/flac112/configure.c	Sun Jan 21 15:15:38 2007 -0800
+++ b/src/flac112/configure.c	Sun Jan 21 15:33:20 2007 -0800
@@ -289,7 +289,7 @@
 	GtkWidget *bbox, *ok, *cancel;
 	GList *list;
 
-	GtkWidget *streaming_vbox;
+	GtkWidget *streaming_vbox, *streaming_vbox_c;
 	GtkWidget *streaming_buf_frame, *streaming_buf_hbox;
 	GtkWidget *streaming_size_box, *streaming_size_label, *streaming_size_spin;
 	GtkWidget *streaming_pre_box, *streaming_pre_label, *streaming_pre_spin;
@@ -524,10 +524,15 @@
 	/* Streaming */
 
 	streaming_vbox = gtk_vbox_new(FALSE, 0);
+	streaming_vbox_c = gtk_vbox_new(FALSE, 0);
+
+        gtk_box_pack_start(GTK_BOX(streaming_vbox), gtk_label_new(
+          _("\n- THESE OPTIONS ARE CURRENTLY IGNORED BY AUDACIOUS -\n") ) , FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(streaming_vbox), streaming_vbox_c , TRUE , TRUE, 0);
 
 	streaming_buf_frame = gtk_frame_new(_("Buffering:"));
 	gtk_container_set_border_width(GTK_CONTAINER(streaming_buf_frame), 5);
-	gtk_box_pack_start(GTK_BOX(streaming_vbox), streaming_buf_frame, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(streaming_vbox_c), streaming_buf_frame, FALSE, FALSE, 0);
 
 	streaming_buf_hbox = gtk_hbox_new(TRUE, 5);
 	gtk_container_set_border_width(GTK_CONTAINER(streaming_buf_hbox), 5);
@@ -558,7 +563,7 @@
 	 */
 	streaming_save_frame = gtk_frame_new(_("Save stream to disk:"));
 	gtk_container_set_border_width(GTK_CONTAINER(streaming_save_frame), 5);
-	gtk_box_pack_start(GTK_BOX(streaming_vbox), streaming_save_frame, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(streaming_vbox_c), streaming_save_frame, FALSE, FALSE, 0);
 
 	streaming_save_vbox = gtk_vbox_new(FALSE, 5);
 	gtk_container_set_border_width(GTK_CONTAINER(streaming_save_vbox), 5);
@@ -585,7 +590,7 @@
 #ifdef FLAC_ICECAST
 	streaming_cast_frame = gtk_frame_new(_("SHOUT/Icecast:"));
 	gtk_container_set_border_width(GTK_CONTAINER(streaming_cast_frame), 5);
-	gtk_box_pack_start(GTK_BOX(streaming_vbox), streaming_cast_frame, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(streaming_vbox_c), streaming_cast_frame, FALSE, FALSE, 0);
 
 	streaming_cast_vbox = gtk_vbox_new(5, FALSE);
 	gtk_container_add(GTK_CONTAINER(streaming_cast_frame), streaming_cast_vbox);
@@ -598,6 +603,7 @@
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(streaming_udp_title), flac_cfg.stream.use_udp_channel);
 	gtk_box_pack_start(GTK_BOX(streaming_cast_vbox), streaming_udp_title, FALSE, FALSE, 0);
 #endif
+	gtk_widget_set_sensitive( GTK_WIDGET(streaming_vbox_c) , FALSE );
 
 	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), streaming_vbox, gtk_label_new(_("Streaming")));
 
diff -r ce4efa148521 -r be4cde738a73 src/flac112/plugin.c
--- a/src/flac112/plugin.c	Sun Jan 21 15:15:38 2007 -0800
+++ b/src/flac112/plugin.c	Sun Jan 21 15:33:20 2007 -0800
@@ -852,7 +852,11 @@
 
 static decoder_t source_to_decoder_type (const char *source)
 {
-	return strncasecmp(source, "http://", 7) ? DECODER_FILE : DECODER_HTTP;
+	/* NOTE: in Audacious, always use DECODER_FILE to pick files via VFS;
+                 http flac stream support is not used */
+	return DECODER_FILE;
+
+/*	return strncasecmp(source, "http://", 7) ? DECODER_FILE : DECODER_HTTP; */
 }
 
 static void change_decoder_if_needed (decoder_t new_decoder_type, void **decoderp, decoder_funcs_t const ** fntabp)