audlegacy: src/audacious/ui_equalizer.c comparison

comparison src/audacious/ui_equalizer.c @ 2514:7934ac463591 trunk

[svn] - removed unused function bmp_menu_translate() - removed playlist_file_selection_browser() and replaced it with make_filebrowser() - modified make_filebrowser() behaviour - adapted equalizer file loading/saving functions to new make_filebrowser()

author	mf0102
date	Tue, 13 Feb 2007 06:09:50 -0800
parents	204d1bab71f9
children	319b10203d7c

comparison

equal deleted inserted replaced

-:1e6d2d719876
+:7934ac463591
 }
 static void
 equalizerwin_delete_selected_presets(GtkTreeView *view, gchar *filename)
 {
-	gchar *text;
+gchar *text;
-	GtkTreeSelection *selection = gtk_tree_view_get_selection(view);
+GtkTreeSelection *selection = gtk_tree_view_get_selection(view);
-	GtkTreeModel *model = gtk_tree_view_get_model(view);
+GtkTreeModel *model = gtk_tree_view_get_model(view);
-	/*
+/*
-	 * first we are making a list of the selected rows, then we convert this
+* first we are making a list of the selected rows, then we convert this
-	 * list into a list of GtkTreeRowReferences, so that when you delete an
+* list into a list of GtkTreeRowReferences, so that when you delete an
-	 * item you can still access the other items
+* item you can still access the other items
-	 * finally we iterate through all GtkTreeRowReferences, convert them to
+* finally we iterate through all GtkTreeRowReferences, convert them to
-	 * GtkTreeIters and delete those one after the other
+* GtkTreeIters and delete those one after the other
-	 */
+*/
-	GList *list = gtk_tree_selection_get_selected_rows(selection, &model);
+GList *list = gtk_tree_selection_get_selected_rows(selection, &model);
-	GList *rrefs = NULL;
+GList *rrefs = NULL;
-	GList *litr;
+GList *litr;
-	for (litr = list; litr; litr = litr->next)
+for (litr = list; litr; litr = litr->next)
-	{
+{
-		GtkTreePath *path = litr->data;
+GtkTreePath *path = litr->data;
-		rrefs = g_list_append(rrefs, gtk_tree_row_reference_new(model, path));
+rrefs = g_list_append(rrefs, gtk_tree_row_reference_new(model, path));
-	}
+}
-	for (litr = rrefs; litr; litr = litr->next)
+for (litr = rrefs; litr; litr = litr->next)
-	{
+{
-		GtkTreeRowReference *ref = litr->data;
+GtkTreeRowReference *ref = litr->data;
-		GtkTreePath *path = gtk_tree_row_reference_get_path(ref);
+GtkTreePath *path = gtk_tree_row_reference_get_path(ref);
-		GtkTreeIter iter;
+GtkTreeIter iter;
-		gtk_tree_model_get_iter(model, &iter, path);
+gtk_tree_model_get_iter(model, &iter, path);
-		gtk_tree_model_get(model, &iter, 0, &text, -1);
+gtk_tree_model_get(model, &iter, 0, &text, -1);
-		if (filename == "eq.preset")
+if (filename == "eq.preset")
-			equalizer_presets = equalizerwin_delete_preset(equalizer_presets, text, filename);
+equalizer_presets = equalizerwin_delete_preset(equalizer_presets, text, filename);
-		else if (filename == "eq.auto_preset")
+else if (filename == "eq.auto_preset")
-			equalizer_auto_presets = equalizerwin_delete_preset(equalizer_auto_presets, text, filename);
+equalizer_auto_presets = equalizerwin_delete_preset(equalizer_auto_presets, text, filename);
-		gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
+gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
-	}
+}
 }
 static GList *
 import_winamp_eqf(VFSFile * file)
 gtk_widget_destroy(equalizerwin_save_window);
 }
 static void
 equalizerwin_save_select(GtkTreeView *treeview, GtkTreePath *path,
-						 GtkTreeViewColumn *col, gpointer data)
+GtkTreeViewColumn *col, gpointer data)
 {
 gchar *text;
-	GtkTreeSelection *selection = gtk_tree_view_get_selection(treeview);
+GtkTreeSelection *selection = gtk_tree_view_get_selection(treeview);
-	GtkTreeModel *model;
+GtkTreeModel *model;
-	GtkTreeIter iter;
+GtkTreeIter iter;
-	if (selection)
+if (selection)
-	{
+{
-		if (gtk_tree_selection_get_selected(selection, &model, &iter))
+if (gtk_tree_selection_get_selected(selection, &model, &iter))
-		{
+{
-			gtk_tree_model_get(model, &iter, 0, &text, -1);
+gtk_tree_model_get(model, &iter, 0, &text, -1);
-			gtk_entry_set_text(GTK_ENTRY(equalizerwin_save_entry), text);
+gtk_entry_set_text(GTK_ENTRY(equalizerwin_save_entry), text);
-			equalizerwin_save_ok(NULL, NULL);
+equalizerwin_save_ok(NULL, NULL);
-			g_free(text);
+g_free(text);
-		}
+}
-	}
+}
 }
 static void
 equalizerwin_load_ok(GtkWidget *widget, gpointer data)
 {
 gchar *text;
-	GtkTreeView* view = GTK_TREE_VIEW(data);
+GtkTreeView* view = GTK_TREE_VIEW(data);
-	GtkTreeSelection *selection = gtk_tree_view_get_selection(view);
+GtkTreeSelection *selection = gtk_tree_view_get_selection(view);
-	GtkTreeModel *model;
+GtkTreeModel *model;
-	GtkTreeIter iter;
+GtkTreeIter iter;
-	if (selection)
+if (selection)
-	{
+{
-		if (gtk_tree_selection_get_selected(selection, &model, &iter))
+if (gtk_tree_selection_get_selected(selection, &model, &iter))
-		{
+{
-			gtk_tree_model_get(model, &iter, 0, &text, -1);
+gtk_tree_model_get(model, &iter, 0, &text, -1);
-			equalizerwin_load_preset(equalizer_presets, text);
+equalizerwin_load_preset(equalizer_presets, text);
-			g_free(text);
+g_free(text);
-		}
+}
-	}
+}
 gtk_widget_destroy(equalizerwin_load_window);
 }
 static void
 equalizerwin_load_select(GtkTreeView *treeview, GtkTreePath *path,
-						 GtkTreeViewColumn *col, gpointer data)
+GtkTreeViewColumn *col, gpointer data)
 {
-	equalizerwin_load_ok(NULL, treeview);
+equalizerwin_load_ok(NULL, treeview);
 }
 static void
 equalizerwin_delete_delete(GtkWidget *widget, gpointer data)
 {
-	equalizerwin_delete_selected_presets(GTK_TREE_VIEW(data), "eq.preset");
+equalizerwin_delete_selected_presets(GTK_TREE_VIEW(data), "eq.preset");
 }
 static void
 equalizerwin_save_auto_ok(GtkWidget *widget, gpointer data)
 {
 gtk_widget_destroy(equalizerwin_save_auto_window);
 }
 static void
 equalizerwin_save_auto_select(GtkTreeView *treeview, GtkTreePath *path,
-							  GtkTreeViewColumn *col, gpointer data)
+GtkTreeViewColumn *col, gpointer data)
 {
 gchar *text;
-	GtkTreeSelection *selection = gtk_tree_view_get_selection(treeview);
+GtkTreeSelection *selection = gtk_tree_view_get_selection(treeview);
-	GtkTreeModel *model;
+GtkTreeModel *model;
-	GtkTreeIter iter;
+GtkTreeIter iter;
-	if (selection)
+if (selection)
-	{
+{
-		if (gtk_tree_selection_get_selected(selection, &model, &iter))
+if (gtk_tree_selection_get_selected(selection, &model, &iter))
-		{
+{
-			gtk_tree_model_get(model, &iter, 0, &text, -1);
+gtk_tree_model_get(model, &iter, 0, &text, -1);
-			gtk_entry_set_text(GTK_ENTRY(equalizerwin_save_auto_entry), text);
+gtk_entry_set_text(GTK_ENTRY(equalizerwin_save_auto_entry), text);
-			equalizerwin_save_auto_ok(NULL, NULL);
+equalizerwin_save_auto_ok(NULL, NULL);
-			g_free(text);
+g_free(text);
-		}
+}
-	}
+}
 }
 static void
 equalizerwin_load_auto_ok(GtkWidget *widget, gpointer data)
 {
 gchar *text;
-	GtkTreeView *view = GTK_TREE_VIEW(data);
+GtkTreeView *view = GTK_TREE_VIEW(data);
-	GtkTreeSelection *selection = gtk_tree_view_get_selection(view);
+GtkTreeSelection *selection = gtk_tree_view_get_selection(view);
-	GtkTreeModel *model;
+GtkTreeModel *model;
-	GtkTreeIter iter;
+GtkTreeIter iter;
-	if (selection)
+if (selection)
-	{
+{
-		if (gtk_tree_selection_get_selected(selection, &model, &iter))
+if (gtk_tree_selection_get_selected(selection, &model, &iter))
-		{
+{
-			gtk_tree_model_get(model, &iter, 0, &text, -1);
+gtk_tree_model_get(model, &iter, 0, &text, -1);
-			equalizerwin_load_preset(equalizer_auto_presets, text);
+equalizerwin_load_preset(equalizer_auto_presets, text);
-			g_free(text);
+g_free(text);
-		}
+}
-	}
+}
 gtk_widget_destroy(equalizerwin_load_auto_window);
 }
 static void
 equalizerwin_load_auto_select(GtkTreeView *treeview, GtkTreePath *path,
-							  GtkTreeViewColumn *col, gpointer data)
+GtkTreeViewColumn *col, gpointer data)
 {
-	equalizerwin_load_auto_ok(NULL, treeview);
+equalizerwin_load_auto_ok(NULL, treeview);
 }
 static void
 equalizerwin_delete_auto_delete(GtkWidget *widget, gpointer data)
 {
-	equalizerwin_delete_selected_presets(GTK_TREE_VIEW(data), "eq.auto_preset");
+equalizerwin_delete_selected_presets(GTK_TREE_VIEW(data), "eq.auto_preset");
 }
-typedef void (*ResponseHandler)(const gchar *filename);
-static void
-equalizerwin_file_chooser_on_response(GtkWidget * dialog,
-gint response,
-gpointer data)
-{
-GtkFileChooser *file_chooser = GTK_FILE_CHOOSER(dialog);
-ResponseHandler handler = (ResponseHandler) data;
-gchar *filename;
-gtk_widget_hide(dialog);
-switch (response)
-{
-case GTK_RESPONSE_ACCEPT:
-filename = gtk_file_chooser_get_filename(file_chooser);
-handler(filename);
-g_free(filename);
-break;
-case GTK_RESPONSE_REJECT:
-break;
-}
-gtk_widget_destroy(dialog);
-}
 static void
 load_preset_file(const gchar *filename)
 {
 const gchar *action_name,
 GCallback action_func,
 GCallback select_row_func)
 {
 GtkWidget *vbox, *scrolled_window, *bbox, *view;
-	GtkWidget *button_cancel, *button_action;
+GtkWidget *button_cancel, *button_action;
 GList *node;
-	GtkListStore *store;
+GtkListStore *store;
-	GtkTreeIter iter;
+GtkTreeIter iter;
-	GtkTreeModel *model;
+GtkTreeModel *model;
-	GtkCellRenderer *renderer;
+GtkCellRenderer *renderer;
-	GtkTreeSelection *selection;
+GtkTreeSelection *selection;
-	GtkTreeSortable *sortable;
+GtkTreeSortable *sortable;
 *window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 gtk_window_set_title(GTK_WINDOW(*window), title);
 scrolled_window = gtk_scrolled_window_new(NULL, NULL);
 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window),
 GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
-	/* fill the store with the names of all available presets */
+/* fill the store with the names of all available presets */
-	store = gtk_list_store_new(1, G_TYPE_STRING);
+store = gtk_list_store_new(1, G_TYPE_STRING);
-	for (node = preset_list; node; node = g_list_next(node))
+for (node = preset_list; node; node = g_list_next(node))
-	{
+{
-		gtk_list_store_append(store, &iter);
+gtk_list_store_append(store, &iter);
-		gtk_list_store_set(store, &iter,
+gtk_list_store_set(store, &iter,
-						   0, ((EqualizerPreset*)node->data)->name,
+0, ((EqualizerPreset*)node->data)->name,
-						   -1);
+-1);
-	}
+}
-	model = GTK_TREE_MODEL(store);
+model = GTK_TREE_MODEL(store);
-	sortable = GTK_TREE_SORTABLE(store);
+sortable = GTK_TREE_SORTABLE(store);
-	gtk_tree_sortable_set_sort_column_id(sortable, 0, GTK_SORT_ASCENDING);
+gtk_tree_sortable_set_sort_column_id(sortable, 0, GTK_SORT_ASCENDING);
-	view = gtk_tree_view_new();
+view = gtk_tree_view_new();
-	renderer = gtk_cell_renderer_text_new();
+renderer = gtk_cell_renderer_text_new();
-	gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(view), -1,
+gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(view), -1,
-												_("Presets"), renderer,
+_("Presets"), renderer,
-												"text", 0, NULL);
+"text", 0, NULL);
-	gtk_tree_view_set_model(GTK_TREE_VIEW(view), model);
+gtk_tree_view_set_model(GTK_TREE_VIEW(view), model);
-	g_object_unref(model);
+g_object_unref(model);
-	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(view));
+selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(view));
-	gtk_tree_selection_set_mode(selection, sel_mode);
+gtk_tree_selection_set_mode(selection, sel_mode);
-	gtk_container_add(GTK_CONTAINER(scrolled_window), view);
+gtk_container_add(GTK_CONTAINER(scrolled_window), view);
 gtk_box_pack_start(GTK_BOX(vbox), scrolled_window, TRUE, TRUE, 0);
 if (entry) {
 *entry = gtk_entry_new();
 g_signal_connect(*entry, "activate", action_func, NULL);
 button_action = gtk_button_new_from_stock(action_name);
 g_signal_connect(button_action, "clicked", G_CALLBACK(action_func), view);
 GTK_WIDGET_SET_FLAGS(button_action, GTK_CAN_DEFAULT);
-	if (select_row_func)
+if (select_row_func)
-		g_signal_connect(view, "row-activated", G_CALLBACK(select_row_func), NULL);
+g_signal_connect(view, "row-activated", G_CALLBACK(select_row_func), NULL);
 gtk_box_pack_start(GTK_BOX(bbox), button_action, TRUE, TRUE, 0);
 gtk_widget_grab_default(button_action);
 void
 action_equ_load_preset_file(void)
 {
 GtkWidget *dialog;
+gchar *filename;
 dialog = make_filebrowser(Q_("Load equalizer preset"), FALSE);
-g_signal_connect(dialog , "response",
+if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)
-G_CALLBACK(equalizerwin_file_chooser_on_response),
+{
-load_preset_file);
+filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
+load_preset_file(filename);
+g_free(filename);
+}
+gtk_widget_destroy(dialog);
 }
 void
 action_equ_load_preset_eqf(void)
 {
 GtkWidget *dialog;
+gchar *filename;
 dialog = make_filebrowser(Q_("Load equalizer preset"), FALSE);
-g_signal_connect(dialog, "response",
+if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)
-G_CALLBACK(equalizerwin_file_chooser_on_response),
+{
-load_winamp_file);
+filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
+load_winamp_file(filename);
+g_free(filename);
+}
+gtk_widget_destroy(dialog);
 }
 void
 action_equ_import_winamp_presets(void)
 {
 GtkWidget *dialog;
+gchar *filename;
 dialog = make_filebrowser(Q_("Load equalizer preset"), FALSE);
-g_signal_connect(dialog, "response",
+if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)
-G_CALLBACK(equalizerwin_file_chooser_on_response),
+{
-import_winamp_file);
+filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
+import_winamp_file(filename);
+g_free(filename);
+}
+gtk_widget_destroy(dialog);
 }
 void
 action_equ_save_preset(void)
 {
 }
 void
 action_equ_save_default_preset(void)
 {
-equalizer_presets = equalizerwin_save_preset(equalizer_presets, Q_("Default"),
+equalizer_presets =
-"eq.preset");
+equalizerwin_save_preset(equalizer_presets, Q_("Default"), "eq.preset");
 }
 void
 action_equ_save_preset_file(void)
 {
 GtkWidget *dialog;
+gchar *filename;
 gchar *songname;
 Playlist *playlist = playlist_get_active();
 dialog = make_filebrowser(Q_("Save equalizer preset"), TRUE);
-g_signal_connect(dialog, "response",
+if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)
-G_CALLBACK(equalizerwin_file_chooser_on_response),
+{
-save_preset_file);
+filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
+save_preset_file(filename);
+g_free(filename);
+}
 songname = playlist_get_filename(playlist, playlist_get_position(playlist));
 if (songname) {
 gchar *eqname = g_strdup_printf("%s.%s", songname,
 cfg.eqpreset_extension);
 g_free(songname);
 gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog),
 eqname);
 g_free(eqname);
 }
+gtk_widget_destroy(dialog);
 }
 void
 action_equ_save_preset_eqf(void)
 {
 GtkWidget *dialog;
+gchar *filename;
 dialog = make_filebrowser(Q_("Save equalizer preset"), TRUE);
-g_signal_connect(dialog, "response",
+if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)
-G_CALLBACK(equalizerwin_file_chooser_on_response),
+{
-save_winamp_file);
+filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
+save_winamp_file(filename);
+g_free(filename);
+}
+gtk_widget_destroy(dialog);
 }
 void
 action_equ_delete_preset(void)
 {

Mercurial > audlegacy

comparison src/audacious/ui_equalizer.c @ 2514:7934ac463591 trunk