audlegacy: src/audacious/ui_jumptotrack.c comparison

comparison src/audacious/ui_jumptotrack.c @ 4029:76da6fe8cb39

- Branch merge

author	Ralf Ertzinger <ralf@skytale.net>
date	Wed, 28 Nov 2007 16:55:02 +0100
parents	c2b2828186ba
children	008708425c83

comparison

equal deleted inserted replaced

-:bb709f82068b
+:76da6fe8cb39
 #include "visualization.h"
 #include "ui_skinned_window.h"
 static GtkWidget *jump_to_track_win = NULL;
+static gulong serial = 0;
 static void
 change_song(guint pos)
 {
 if (playback_get_playing())
 playback_stop();
 playlist_set_position(playlist_get_active(), pos);
 playback_initiate();
+}
+void
+ui_jump_to_track_hide(void)
+{
+g_return_if_fail(jump_to_track_win);
+gtk_widget_hide(jump_to_track_win);
 }
 static void
 ui_jump_to_track_jump(GtkTreeView * treeview)
 {
 gtk_tree_model_get(model, &iter, 0, &pos, -1);
 change_song(pos - 1);
-/* FIXME: should only hide window */
+if(cfg.close_jtf_dialog)
-if(cfg.close_jtf_dialog){
+ui_jump_to_track_hide();
-gtk_widget_destroy(jump_to_track_win);
-jump_to_track_win = NULL;
-}
 }
 static void
 ui_jump_to_track_toggle_cb(GtkWidget * toggle)
 {
 GdkEventKey * event,
 gpointer data)
 {
 switch (event->keyval) {
 case GDK_Escape:
-/* FIXME: show only hide window */
+ui_jump_to_track_hide();
-gtk_widget_destroy(jump_to_track_win);
-jump_to_track_win = NULL;
 return TRUE;
 case GDK_KP_Enter:
 ui_jump_to_track_queue_cb(NULL, data);
 return TRUE;
 default:
 }
 return rv;
 }
-/* FIXME: Clear the entry when the list gets updated */
 void
 ui_jump_to_track_update(GtkWidget * widget, gpointer user_data)
 {
-/* FIXME: Is not in sync with playlist due to delayed extinfo
-* reading */
 guint row;
 GList *playlist_glist;
 gchar *desc_buf = NULL;
 GtkTreeIter iter;
 GtkTreeSelection *selection;
 Playlist *playlist;
 GtkTreeModel *store;
+GtkTreeView *tree = GTK_TREE_VIEW(g_object_get_data(user_data, "treeview"));
+GtkEntry *edit = g_object_get_data(user_data, "edit");
 if (!jump_to_track_win)
 return;
-store = gtk_tree_view_get_model(GTK_TREE_VIEW(user_data));
+/* clear edit widget */
+if(edit){
+gtk_entry_set_text(edit, "\0");
+}
+store = gtk_tree_view_get_model(tree);
 gtk_list_store_clear(GTK_LIST_STORE(store));
 row = 1;
 playlist = playlist_get_active();
 for (playlist_glist = playlist->entries; playlist_glist;
 g_free(desc_buf);
 desc_buf = NULL;
 }
 gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter);
-selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(user_data));
+selection = gtk_tree_view_get_selection(tree);
 gtk_tree_selection_select_iter(selection, &iter);
+serial = playlist->serial; // important. --yaz
 }
 static void
 ui_jump_to_track_edit_cb(GtkEntry * entry, gpointer user_data)
 {
 gtk_tree_view_set_model( GTK_TREE_VIEW(treeview), NULL );
 gtk_list_store_clear(jtf_store);
 row = 1;
 playlist = playlist_get_active();
 PLAYLIST_LOCK(playlist);
 for (playlist_glist = playlist->entries; playlist_glist;
 playlist_glist = g_list_next(playlist_glist)) {
 PlaylistEntry *entry = PLAYLIST_ENTRY(playlist_glist->data);
 gtk_list_store_append(GTK_LIST_STORE(jtf_store), &iter);
 gtk_list_store_set(GTK_LIST_STORE(jtf_store), &iter,
 0, row, 1, desc_buf, -1);
 row++;
-if (desc_buf) {
+g_free(desc_buf);
-g_free(desc_buf);
+desc_buf = NULL;
-desc_buf = NULL;
+}
-}
-}
 PLAYLIST_UNLOCK(playlist);
 /* attach liststore to treeview */
 gtk_tree_view_set_model(GTK_TREE_VIEW(treeview), GTK_TREE_MODEL(jtf_store));
 g_object_unref(jtf_store);
+serial = playlist->serial;
 return FALSE;
+}
+static gboolean
+watchdog(gpointer storage)
+{
+GtkWidget *widget;
+Playlist *playlist = playlist_get_active();
+if(serial == playlist->serial)
+return TRUE;
+widget = g_object_get_data(storage, "widget");
+ui_jump_to_track_update(widget, storage);
+return TRUE;
 }
 void
 ui_jump_to_track(void)
 {
 GtkWidget *scrollwin;
 GtkWidget *vbox, *bbox, *sep;
 GtkWidget *toggle;
-GtkWidget *jump, *queue, *cancel;
+GtkWidget *jump, *queue, *close;
 GtkWidget *rescan, *edit;
 GtkWidget *search_label, *hbox;
-GtkWidget *treeview;
+GtkWidget *treeview = NULL;
 GtkListStore *jtf_store;
 GtkCellRenderer *renderer;
 GtkTreeViewColumn *column;
+gpointer storage;
 if (jump_to_track_win) {
 gtk_window_present(GTK_WINDOW(jump_to_track_win));
 return;
 }
 G_CALLBACK(ui_jump_to_track_selection_changed_cb),
 queue);
 rescan = gtk_button_new_from_stock(GTK_STOCK_REFRESH);
 gtk_box_pack_start(GTK_BOX(bbox), rescan, FALSE, FALSE, 0);
+/* pack to container */
+storage = g_object_new(G_TYPE_OBJECT, NULL);
+g_object_set_data(storage, "widget", rescan);
+g_object_set_data(storage, "treeview", treeview);
+g_object_set_data(storage, "edit", edit);
 g_signal_connect(rescan, "clicked",
-G_CALLBACK(ui_jump_to_track_update), treeview);
+G_CALLBACK(ui_jump_to_track_update), storage);
 GTK_WIDGET_SET_FLAGS(rescan, GTK_CAN_DEFAULT);
 gtk_widget_grab_default(rescan);
 jump = gtk_button_new_from_stock(GTK_STOCK_JUMP_TO);
 gtk_box_pack_start(GTK_BOX(bbox), jump, FALSE, FALSE, 0);
 treeview);
 GTK_WIDGET_SET_FLAGS(jump, GTK_CAN_DEFAULT);
 gtk_widget_grab_default(jump);
-cancel = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+close = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-gtk_box_pack_start(GTK_BOX(bbox), cancel, FALSE, FALSE, 0);
+gtk_box_pack_start(GTK_BOX(bbox), close, FALSE, FALSE, 0);
-g_signal_connect_swapped(cancel, "clicked",
+/*     g_signal_connect_swapped(close, "clicked", */
-G_CALLBACK(gtk_widget_destroy),
+/*                              G_CALLBACK(gtk_widget_destroy), */
-jump_to_track_win);
+/*                              jump_to_track_win); */
-GTK_WIDGET_SET_FLAGS(cancel, GTK_CAN_DEFAULT);
+g_signal_connect_swapped(close, "clicked",
+G_CALLBACK(gtk_widget_hide),
+jump_to_track_win); // just hide --yaz
+GTK_WIDGET_SET_FLAGS(close, GTK_CAN_DEFAULT);
 g_timeout_add(100, (GSourceFunc)ui_jump_to_track_fill, treeview);
+g_timeout_add(500, (GSourceFunc)watchdog, storage);
 gtk_widget_show_all(jump_to_track_win);
 gtk_widget_grab_focus(edit);
 }

Mercurial > audlegacy

comparison src/audacious/ui_jumptotrack.c @ 4029:76da6fe8cb39