Mercurial > audlegacy-plugins

changeset 420:810787dce408 trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] Replaced xmms_create_dir_browser
author mf0102
date Sat, 13 Jan 2007 15:22:28 -0800
parents 37a183b4ce60
children 1a82af4f13cf
files ChangeLog src/flac112/configure.c src/flac113/configure.c src/mpg123/configure.c
diffstat 4 files changed, 37 insertions(+), 97 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Jan 13 14:52:28 2007 -0800
+++ b/ChangeLog	Sat Jan 13 15:22:28 2007 -0800
@@ -1,3 +1,16 @@
+2007-01-13 22:52:28 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [922]
+  - rovascope: more randomization
+  - build system: same changes as audacious r3658
+  
+  trunk/configure.ac                |    7 
+  trunk/libtool.m4                  | 6248 --------------------------------------
+  trunk/missing                     |  360 --
+  trunk/mkinstalldirs               |  150 
+  trunk/src/rovascope/actuatorbin.c |   30 
+  5 files changed, 28 insertions(+), 6767 deletions(-)
+
+
 2007-01-13 16:27:42 +0000  Michael Hanselmann <hansmi@forkbomb.ch>
   revision [920]
   Copy Makevars from audacious-devel, fixes "make[1]: *** No rule to make target `depend'.  Stop."
--- a/src/flac112/configure.c	Sat Jan 13 14:52:28 2007 -0800
+++ b/src/flac112/configure.c	Sat Jan 13 15:22:28 2007 -0800
@@ -28,7 +28,6 @@
 #include <math.h>
 
 #include <audacious/configdb.h>
-#include <audacious/dirbrowser.h>
 #include <audacious/titlestring.h>
 #include <audacious/util.h>
 #include <audacious/plugin.h>
@@ -110,7 +109,7 @@
 static GtkWidget *resolution_replaygain_bps_out_radio_24bps;
 
 static GtkObject *streaming_size_adj, *streaming_pre_adj;
-static GtkWidget *streaming_save_use, *streaming_save_entry;
+static GtkWidget *streaming_save_use;
 #ifdef FLAC_ICECAST
 static GtkWidget *streaming_cast_title, *streaming_udp_title;
 #endif
@@ -154,7 +153,8 @@
 	if (flac_cfg.stream.save_http_path != NULL)
 		g_free(flac_cfg.stream.save_http_path);
 
-	flac_cfg.stream.save_http_path = g_strdup(gtk_entry_get_text(GTK_ENTRY(streaming_save_entry)));
+	flac_cfg.stream.save_http_path =
+		g_strdup(gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(streaming_save_dirbrowser)));
 
 #ifdef FLAC_ICECAST
 	flac_cfg.stream.cast_title_streaming = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(streaming_cast_title));
@@ -266,25 +266,6 @@
 	;
 }
 
-static void streaming_save_dirbrowser_cb(gchar * dir)
-{
-	gtk_entry_set_text(GTK_ENTRY(streaming_save_entry), dir);
-}
-
-static void streaming_save_browse_cb(GtkWidget * w, gpointer data)
-{
-	(void) w;
-	(void) data;
-	if (!streaming_save_dirbrowser)
-	{
-		streaming_save_dirbrowser = xmms_create_dir_browser(_("Select the directory where you want to store the MPEG streams:"),
-								    flac_cfg.stream.save_http_path, GTK_SELECTION_SINGLE, streaming_save_dirbrowser_cb);
-		gtk_signal_connect(GTK_OBJECT(streaming_save_dirbrowser), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), &streaming_save_dirbrowser);
-		gtk_window_set_transient_for(GTK_WINDOW(streaming_save_dirbrowser), GTK_WINDOW(flac_configurewin));
-		gtk_widget_show(streaming_save_dirbrowser);
-	}
-}
-
 static void streaming_save_use_cb(GtkWidget * w, gpointer data)
 {
 	gboolean save_stream;
@@ -595,13 +576,11 @@
 	streaming_save_label = gtk_label_new(_("Path:"));
 	gtk_box_pack_start(GTK_BOX(streaming_save_hbox), streaming_save_label, FALSE, FALSE, 0);
 
-	streaming_save_entry = gtk_entry_new();
-	gtk_entry_set_text(GTK_ENTRY(streaming_save_entry), flac_cfg.stream.save_http_path);
-	gtk_box_pack_start(GTK_BOX(streaming_save_hbox), streaming_save_entry, TRUE, TRUE, 0);
-
-	streaming_save_browse = gtk_button_new_with_label(_("Browse"));
-	gtk_signal_connect(GTK_OBJECT(streaming_save_browse), "clicked", GTK_SIGNAL_FUNC(streaming_save_browse_cb), NULL);
-	gtk_box_pack_start(GTK_BOX(streaming_save_hbox), streaming_save_browse, FALSE, FALSE, 0);
+	streaming_save_dirbrowser  =
+		gtk_file_chooser_button_new (_("Pick a folder"), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+	gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(streaming_save_dirbrowser),
+										flac_cfg.stream.save_http_path);
+	gtk_box_pack_start(GTK_BOX(streaming_save_hbox), streaming_save_dirbrowser, TRUE, TRUE, 0);
 
 #ifdef FLAC_ICECAST
 	streaming_cast_frame = gtk_frame_new(_("SHOUT/Icecast:"));
--- a/src/flac113/configure.c	Sat Jan 13 14:52:28 2007 -0800
+++ b/src/flac113/configure.c	Sat Jan 13 15:22:28 2007 -0800
@@ -28,7 +28,6 @@
 #include <math.h>
 
 #include <audacious/configdb.h>
-#include <audacious/dirbrowser.h>
 #include <audacious/titlestring.h>
 #include <audacious/util.h>
 #include <audacious/plugin.h>
@@ -110,7 +109,7 @@
 static GtkWidget *resolution_replaygain_bps_out_radio_24bps;
 
 static GtkObject *streaming_size_adj, *streaming_pre_adj;
-static GtkWidget *streaming_save_use, *streaming_save_entry;
+static GtkWidget *streaming_save_use;
 #ifdef FLAC_ICECAST
 static GtkWidget *streaming_cast_title, *streaming_udp_title;
 #endif
@@ -154,7 +153,8 @@
 	if (flac_cfg.stream.save_http_path != NULL)
 		g_free(flac_cfg.stream.save_http_path);
 
-	flac_cfg.stream.save_http_path = g_strdup(gtk_entry_get_text(GTK_ENTRY(streaming_save_entry)));
+	flac_cfg.stream.save_http_path =
+		g_strdup(gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(streaming_save_dirbrowser)));
 
 #ifdef FLAC_ICECAST
 	flac_cfg.stream.cast_title_streaming = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(streaming_cast_title));
@@ -266,25 +266,6 @@
 	;
 }
 
-static void streaming_save_dirbrowser_cb(gchar * dir)
-{
-	gtk_entry_set_text(GTK_ENTRY(streaming_save_entry), dir);
-}
-
-static void streaming_save_browse_cb(GtkWidget * w, gpointer data)
-{
-	(void) w;
-	(void) data;
-	if (!streaming_save_dirbrowser)
-	{
-		streaming_save_dirbrowser = xmms_create_dir_browser(_("Select the directory where you want to store the MPEG streams:"),
-								    flac_cfg.stream.save_http_path, GTK_SELECTION_SINGLE, streaming_save_dirbrowser_cb);
-		gtk_signal_connect(GTK_OBJECT(streaming_save_dirbrowser), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), &streaming_save_dirbrowser);
-		gtk_window_set_transient_for(GTK_WINDOW(streaming_save_dirbrowser), GTK_WINDOW(flac_configurewin));
-		gtk_widget_show(streaming_save_dirbrowser);
-	}
-}
-
 static void streaming_save_use_cb(GtkWidget * w, gpointer data)
 {
 	gboolean save_stream;
@@ -595,13 +576,12 @@
 	streaming_save_label = gtk_label_new(_("Path:"));
 	gtk_box_pack_start(GTK_BOX(streaming_save_hbox), streaming_save_label, FALSE, FALSE, 0);
 
-	streaming_save_entry = gtk_entry_new();
-	gtk_entry_set_text(GTK_ENTRY(streaming_save_entry), flac_cfg.stream.save_http_path);
-	gtk_box_pack_start(GTK_BOX(streaming_save_hbox), streaming_save_entry, TRUE, TRUE, 0);
+	streaming_save_dirbrowser  =
+		gtk_file_chooser_button_new (_("Pick a folder"), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+	gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(streaming_save_dirbrowser),
+										flac_cfg.stream.save_http_path);
+	gtk_box_pack_start(GTK_BOX(streaming_save_hbox), streaming_save_dirbrowser, TRUE, TRUE, 0);
 
-	streaming_save_browse = gtk_button_new_with_label(_("Browse"));
-	gtk_signal_connect(GTK_OBJECT(streaming_save_browse), "clicked", GTK_SIGNAL_FUNC(streaming_save_browse_cb), NULL);
-	gtk_box_pack_start(GTK_BOX(streaming_save_hbox), streaming_save_browse, FALSE, FALSE, 0);
 
 #ifdef FLAC_ICECAST
 	streaming_cast_frame = gtk_frame_new(_("SHOUT/Icecast:"));
--- a/src/mpg123/configure.c	Sat Jan 13 14:52:28 2007 -0800
+++ b/src/mpg123/configure.c	Sat Jan 13 15:22:28 2007 -0800
@@ -9,7 +9,6 @@
 #include <math.h>
 
 #include <audacious/configdb.h>
-#include <audacious/dirbrowser.h>
 #include <audacious/titlestring.h>
 
 
@@ -24,7 +23,7 @@
     *decode_freq_1to2, *decode_freq_1to4;
 
 static GtkObject *streaming_size_adj, *streaming_pre_adj;
-static GtkWidget *streaming_save_use, *streaming_save_entry;
+static GtkWidget *streaming_save_use;
 static GtkWidget *streaming_udp_title;
 static GtkWidget *streaming_save_dirbrowser;
 static GtkWidget *streaming_save_hbox, *title_id3_box, *title_tag_desc;
@@ -64,7 +63,7 @@
     if (mpgdec_cfg.save_http_path)
         g_free(mpgdec_cfg.save_http_path);
     mpgdec_cfg.save_http_path =
-        g_strdup(gtk_entry_get_text(GTK_ENTRY(streaming_save_entry)));
+		g_strdup(gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(streaming_save_dirbrowser)));
 
     mpgdec_cfg.use_udp_channel =
         gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(streaming_udp_title));
@@ -102,31 +101,6 @@
 }
 
 static void
-streaming_save_dirbrowser_cb(gchar * dir)
-{
-    gtk_entry_set_text(GTK_ENTRY(streaming_save_entry), dir);
-}
-
-static void
-streaming_save_browse_cb(GtkWidget * w, gpointer data)
-{
-    if (!streaming_save_dirbrowser) {
-        streaming_save_dirbrowser =
-            xmms_create_dir_browser(_
-                                    ("Select the directory where you want to store the MPEG streams:"),
-                                    mpgdec_cfg.save_http_path,
-                                    GTK_SELECTION_SINGLE,
-                                    streaming_save_dirbrowser_cb);
-        g_signal_connect(G_OBJECT(streaming_save_dirbrowser), "destroy",
-                         G_CALLBACK(gtk_widget_destroyed),
-                         &streaming_save_dirbrowser);
-        gtk_window_set_transient_for(GTK_WINDOW(streaming_save_dirbrowser),
-                                     GTK_WINDOW(mpgdec_configurewin));
-        gtk_widget_show(streaming_save_dirbrowser);
-    }
-}
-
-static void
 streaming_save_use_cb(GtkWidget * w, gpointer data)
 {
     gboolean save_stream;
@@ -150,8 +124,7 @@
 static void
 configure_destroy(GtkWidget * w, gpointer data)
 {
-    if (streaming_save_dirbrowser)
-        gtk_widget_destroy(streaming_save_dirbrowser);
+	// nothing at the moment?
 }
 
 void
@@ -364,17 +337,12 @@
     gtk_box_pack_start(GTK_BOX(streaming_save_hbox), streaming_save_label,
                        FALSE, FALSE, 0);
 
-    streaming_save_entry = gtk_entry_new();
-    gtk_entry_set_text(GTK_ENTRY(streaming_save_entry),
-                       mpgdec_cfg.save_http_path);
-    gtk_box_pack_start(GTK_BOX(streaming_save_hbox), streaming_save_entry,
-                       TRUE, TRUE, 0);
+	streaming_save_dirbrowser =
+		gtk_file_chooser_button_new (_("Pick a folder"), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+	gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(streaming_save_dirbrowser),
+										mpgdec_cfg.save_http_path);
+	gtk_box_pack_start(GTK_BOX(streaming_save_hbox), streaming_save_dirbrowser, TRUE, TRUE, 0);
 
-    streaming_save_browse = gtk_button_new_with_label(_("Browse"));
-    g_signal_connect(G_OBJECT(streaming_save_browse), "clicked",
-                     G_CALLBACK(streaming_save_browse_cb), NULL);
-    gtk_box_pack_start(GTK_BOX(streaming_save_hbox), streaming_save_browse,
-                       FALSE, FALSE, 0);
 
     streaming_cast_frame = gtk_frame_new(_("SHOUT/Icecast:"));
     gtk_container_set_border_width(GTK_CONTAINER(streaming_cast_frame), 5);