changeset 487:f541940d5475 trunk

[svn] - flac 113 plugin: placed a label in configure dialog, explaning that stream options are currently ignored
author giacomo
date Sun, 21 Jan 2007 11:00:54 -0800
parents 3e41d8efe752
children 5e375eca97da
files ChangeLog src/flac113/configure.c
diffstat 2 files changed, 18 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Jan 21 10:40:40 2007 -0800
+++ b/ChangeLog	Sun Jan 21 11:00:54 2007 -0800
@@ -1,3 +1,11 @@
+2007-01-21 18:40:40 +0000  Giacomo Lozito <james@develia.org>
+  revision [1058]
+  - flac 113 plugin: moved to vfs for file detection and playback; plays http files as well, but it does not use flac/http.c code to do it, so there's no metadata parsing and flac http options are ignored; flac tags are still read directly from stdio, with checks that prevents tag reading if file is not stdio-readable
+  trunk/src/flac113/plugin.c             |  215 ++++++++++++++++++++++++---------
+  trunk/src/flac113/plugin_common/tags.c |    5 
+  2 files changed, 165 insertions(+), 55 deletions(-)
+
+
 2007-01-21 12:51:28 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [1056]
   - turn debugging back off
--- a/src/flac113/configure.c	Sun Jan 21 10:40:40 2007 -0800
+++ b/src/flac113/configure.c	Sun Jan 21 11:00:54 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);
@@ -586,7 +591,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);
@@ -599,6 +604,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")));