changeset 317:45a0d9a765be trunk

[svn] Begin resurrecting config dialog. It compiles. Basic functionality is available, but see debug spew for TODO list.

--- a/Plugins/Visualization/libvisual-proxy/Makefile.am	Sun Dec 18 06:41:22 2005 -0800
+++ b/Plugins/Visualization/libvisual-proxy/Makefile.am	Sun Dec 18 07:03:56 2005 -0800
@@ -8,7 +8,7 @@
 
 libdir = $(plugindir)/$(VISUALIZATION_PLUGIN_DIR)
 
-INCLUDES = $(GTK_CFLAGS) $(LIBVISUAL_CFLAGS) $(SDL_CFLAGS) $(all_includes)
+INCLUDES = $(GTK_CFLAGS) $(LIBVISUAL_CFLAGS) $(SDL_CFLAGS) $(all_includes) -I$(top_builddir)/intl 
 
 libvisual_proxy_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(GTK_LDFLAGS) $(LIBVISUAL_LDFLAGS) $(SDL_LDFLAGS)
 libvisual_proxy_la_LIBADD = $(GTK_LIBS) $(LIBVISUAL_LIBS) $(SDL_LIBS) -lGL

--- a/Plugins/Visualization/libvisual-proxy/config_gui.c	Sun Dec 18 06:41:22 2005 -0800
+++ b/Plugins/Visualization/libvisual-proxy/config_gui.c	Sun Dec 18 07:03:56 2005 -0800
@@ -5,6 +5,7 @@
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "config.h"
 
@@ -14,10 +15,11 @@
 static gchar *check_file_exists (const gchar *directory, const gchar *filename);
 static GtkWidget *create_pixmap (GtkWidget *widget, const gchar *filename);
 static GtkWidget *create_dummy_pixmap (GtkWidget *widget);
-/*static GtkWidget* lookup_widget (GtkWidget *widget, const gchar *widget_name);*/
+static GtkWidget* lookup_widget (GtkWidget *widget, const gchar *widget_name);
 static void add_pixmap_directory (const gchar *directory);
+#endif
 
-ConfigWin *lv_xmms_config_gui_new (void)
+ConfigWin *lv_bmp_config_gui_new (void)
 {
   ConfigWin *config_gui;
 
@@ -59,9 +61,11 @@
 
   tooltips = gtk_tooltips_new ();
 
+#if 0
   add_pixmap_directory (PACKAGE_DATADIR);
+#endif
   
-  window_main = gtk_window_new (GTK_WINDOW_DIALOG);
+  window_main = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_object_set_data (GTK_OBJECT (window_main), "window_main", window_main);
   gtk_window_set_title (GTK_WINDOW (window_main), _("LibVisual Audacious Plugin"));
   gtk_window_set_position (GTK_WINDOW (window_main), GTK_WIN_POS_CENTER);
@@ -333,6 +337,7 @@
   return config_gui;
 }
 
+#if 0
 /* This is a dummy pixmap we use when a pixmap can't be found. */
 static char *dummy_pixmap_xpm[] = {
 /* columns rows colors chars-per-pixel */
@@ -359,7 +364,9 @@
   gdk_bitmap_unref (mask);
   return pixmap;
 }
+#endif
 
+#if 0
 static GList *pixmaps_directories = NULL;
 
 static void add_pixmap_directory (const gchar *directory)
@@ -367,7 +374,9 @@
   pixmaps_directories = g_list_prepend (pixmaps_directories,
                                         g_strdup (directory));
 }
+#endif
 
+#if 0
 static GtkWidget *create_pixmap (GtkWidget *widget, const gchar *filename)
 {
   gchar *found_filename = NULL;
@@ -417,7 +426,9 @@
   gdk_bitmap_unref (mask);
   return pixmap;
 }
+#endif
 
+#if 0
 static gchar *check_file_exists (const gchar *directory, const gchar *filename)
 {
   gchar *full_filename;
@@ -436,8 +447,10 @@
   g_free (full_filename);
   return NULL;
 }
+#endif
 
-/*static GtkWidget* lookup_widget (GtkWidget *widget, const gchar *widget_name)
+#if 0
+static GtkWidget* lookup_widget (GtkWidget *widget, const gchar *widget_name)
 {
   GtkWidget *parent, *found_widget;
 
@@ -457,6 +470,5 @@
   if (!found_widget)
     g_warning ("Widget not found: %s", widget_name);
   return found_widget;
-}*/
-
+}
 #endif

--- a/Plugins/Visualization/libvisual-proxy/config_gui.h	Sun Dec 18 06:41:22 2005 -0800
+++ b/Plugins/Visualization/libvisual-proxy/config_gui.h	Sun Dec 18 07:03:56 2005 -0800
@@ -1,6 +1,8 @@
+#ifndef __LV_CONFIG_GUI_H__
+#define __LV_CONFIG_GUI_H__
+
 #include <gtk/gtk.h>
 
-
 typedef struct {
 	GtkWidget *window_main;
 
@@ -26,6 +28,6 @@
 	GtkWidget *button_cancel;
 } ConfigWin;
 
+ConfigWin *lv_bmp_config_gui_new (void);
 
-ConfigWin *lv_xmms_config_gui_new (void);
-
+#endif /* __LV_CONFIG_GUI_H__ */

--- a/Plugins/Visualization/libvisual-proxy/lv_bmp_config.c	Sun Dec 18 06:41:22 2005 -0800
+++ b/Plugins/Visualization/libvisual-proxy/lv_bmp_config.c	Sun Dec 18 07:03:56 2005 -0800
@@ -365,7 +365,6 @@
 
 void lv_bmp_config_window ()
 {
-#if 0
 	if (config_win != NULL) {
   		gtk_widget_grab_default (config_win->button_cancel);
 		gtk_widget_show (config_win->window_main);
@@ -410,7 +409,6 @@
 	config_win_load_morph_plugin_list ();
 
 	gtk_widget_show (config_win->window_main);
-#endif
 }
 
 static void on_checkbutton_fullscreen_toggled (GtkToggleButton *togglebutton, gpointer user_data)

--- a/Plugins/Visualization/libvisual-proxy/main.c	Sun Dec 18 06:41:22 2005 -0800
+++ b/Plugins/Visualization/libvisual-proxy/main.c	Sun Dec 18 07:03:56 2005 -0800
@@ -82,10 +82,10 @@
 	2,				/* Numbers of PCM channels wanted in the call to render_pcm */
 	0,				/* Numbers of freq channels wanted in the call to render_freq */
 	lv_bmp_init,			/* init */
-	lv_bmp_cleanup,		/* cleanup */
+	lv_bmp_cleanup,			/* cleanup */
 	NULL,				/* about */
-	NULL,				/* configure */
-	lv_bmp_disable,		/* disable plugin */
+	lv_bmp_config_window,		/* configure */
+	lv_bmp_disable,			/* disable plugin */
 	lv_bmp_playback_start,		/* playback start */
 	lv_bmp_playback_stop,		/* playback stop */
 	lv_bmp_render_pcm,		/* render pcm */