X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Flibrary.c;h=db9ff24d8ebc0eebc00b1452fa6d41f100e85de6;hb=afc27123fb65aa16cf42fd0cc5f0ac12820f2e85;hp=4d73c564f87af2f4ba7975e87ac1de62590f530a;hpb=72c67392362784b4434e1136db4357f8355c6d50;p=omnplay

diff --git a/src/library.c b/src/library.c
index 4d73c56..db9ff24 100644
--- a/src/library.c
+++ b/src/library.c
@@ -224,10 +224,7 @@ void omnplay_library_save(omnplay_instance_t* app)
 
 static void omnplay_get_content_cb(omnplay_instance_t* app, playlist_item_t* item, void* data)
 {
-    gdk_threads_enter();
-    gtk_label_set_text(GTK_LABEL(app->library.refresh_ui[1]), item->id);
-    gdk_flush();
-    gdk_threads_leave();
+    omnplay_set_status(app, item->id);
 };
 
 static void* omnplay_library_refresh_proc(void* data)
@@ -236,20 +233,26 @@ static void* omnplay_library_refresh_proc(void* data)
     int count, i;
     playlist_item_t* items;
 
+    gdk_threads_enter();
+    gtk_widget_set_sensitive(app->window, FALSE);
+    gdk_flush();
+    gdk_threads_leave();
+
+    omnplay_set_status(app, "Updating library...");
+
     items = (playlist_item_t*)malloc(sizeof(playlist_item_t) * MAX_LIBRARY_ITEMS);
 
     count = omnplay_get_content(app, items, MAX_LIBRARY_ITEMS, omnplay_get_content_cb, NULL);
 
     if(count > 0)
     {
-        gdk_threads_enter();
-        gtk_label_set_text(GTK_LABEL(app->library.refresh_ui[1]), "Quering whois...");
-        gdk_flush();
-        gdk_threads_leave();
+        omnplay_set_status(app, "Quering whois...");
 
         if(app->library.whois[0])
             omnplay_whois_list(app, items, &count);
 
+        omnplay_set_status(app, "Setting library...");
+
         pthread_mutex_lock(&app->library.lock);
 
         for(i = 0; i < count; i++)
@@ -267,28 +270,33 @@ static void* omnplay_library_refresh_proc(void* data)
         gdk_threads_leave();
     };
 
+    omnplay_set_status(app, "Normalizing playlist...");
+
     free(items);
 
     gdk_threads_enter();
     omnplay_playlist_normalize(app);
-    gtk_widget_destroy(app->library.refresh_ui[0]);
     gdk_flush();
     gdk_threads_leave();
 
+    omnplay_set_status(app, "");
+
+    gdk_threads_enter();
+    gtk_widget_set_sensitive(app->window, TRUE);
+    gdk_flush();
+    gdk_threads_leave();
+
+
     return NULL;
 };
 
 void omnplay_library_refresh(omnplay_instance_t* app)
 {
-    if(app->library.refresh_ui[0])
-        pthread_join(app->library.refresh_thread, NULL);
-
-    /* create UI for monitoring update */
-    ui_library_refresh(app, &app->library.refresh_ui[0], &app->library.refresh_ui[1]);
-
-    pthread_create(&app->library.refresh_thread, NULL,
-        omnplay_library_refresh_proc, app);
+    if(app->library.refresh_thread)
+        g_thread_join(app->library.refresh_thread);
 
+    app->library.refresh_thread = g_thread_create(
+        omnplay_library_refresh_proc, app, TRUE, NULL);
 };
 
 void omnplay_library_draw(omnplay_instance_t* app)
@@ -394,6 +402,7 @@ void omnplay_library_search(omnplay_instance_t* app, int next)
     int idx = 0, i;
     int* idxs;
     const char *search;
+    GtkTreePath* path;
 
     pthread_mutex_lock(&app->library.lock);
 
@@ -402,6 +411,7 @@ void omnplay_library_search(omnplay_instance_t* app, int next)
     free(idxs);
 
     if(!next) idx = 0;
+    else idx++;
 
     search = gtk_entry_get_text(GTK_ENTRY(app->library.search));
 
@@ -414,8 +424,14 @@ void omnplay_library_search(omnplay_instance_t* app, int next)
 
         if(i < app->library.count)
         {
-            fprintf(stderr, "found at pos=%d\n", i);
-
+            g_warning("found at pos=%d\n", i);
+
+            /* select */
+            path = gtk_tree_path_new_from_indices(i, -1);
+            gtk_tree_selection_select_path(gtk_tree_view_get_selection(
+                GTK_TREE_VIEW(app->library_grid)), path);
+            gtk_tree_view_set_cursor(GTK_TREE_VIEW(app->library_grid), path, NULL, FALSE);
+            gtk_tree_path_free(path);
         };
     };