X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Flibrary.c;h=ff7307bf8ace98dc3783b84e33b8ff63a63a6c0d;hb=a12bc94bf9e1527448c8407c66ff6272212b2455;hp=e547b5cca120c7c4852e6c20336ca1d855a582f4;hpb=1bbcc24cd35fbfc8e87abd7d6e5df7e70b411971;p=melted_gui

diff --git a/src/library.c b/src/library.c
index e547b5c..ff7307b 100644
--- a/src/library.c
+++ b/src/library.c
@@ -48,30 +48,42 @@ playlist_item_t* omnplay_library_find(omnplay_instance_t* app, char* id)
     return item;
 };
 
-void omnplay_library_normalize_item(omnplay_instance_t* app, playlist_item_t* item)
+int omnplay_library_normalize_item(omnplay_instance_t* app, playlist_item_t* item)
 {
+    int r = 0;
     playlist_item_t* lib;
 
     pthread_mutex_lock(&app->library.lock);
 
     lib = omnplay_library_find(app, item->id);
 
+    item->error = 0;
+
     if(lib)
     {
 
         if(!item->title[0])
+        {
             strcpy(item->title, lib->title);
+            r = 1;
+        };
 
-        if(!item->dur)
+        if(!item->dur || item->in < lib->in || (item->in + item->dur) > (lib->in + lib->dur))
         {
             item->dur = lib->dur;
             item->in = lib->in;
+            r = 1;
         };
     }
     else
+    {
+        r = 1;
         item->error = PLAYLIST_ITEM_ERROR_LIB;
+    };
 
     pthread_mutex_unlock(&app->library.lock);
+
+    return r;
 };
 
 void omnplay_library_sort(omnplay_instance_t* app)
@@ -207,21 +219,29 @@ void omnplay_library_save(omnplay_instance_t* app)
 
 static void omnplay_get_content_cb(omnplay_instance_t* app, playlist_item_t* item, void* data)
 {
-    fprintf(stderr, "requested: id=[%s]\n", item->id);
+    gdk_threads_enter();
+    gtk_label_set_text(GTK_LABEL(app->library.refresh_ui[1]), item->id);
+    gdk_flush();
+    gdk_threads_leave();
 };
 
-void omnplay_library_refresh(omnplay_instance_t* app)
+static void* omnplay_library_refresh_proc(void* data)
 {
+    omnplay_instance_t* app = (omnplay_instance_t*)data;
     int count, i;
     playlist_item_t* items;
 
-
     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();
+
         if(app->library.whois[0])
             omnplay_whois_list(app, items, &count);
 
@@ -236,10 +256,34 @@ void omnplay_library_refresh(omnplay_instance_t* app)
 
         pthread_mutex_unlock(&app->library.lock);
 
+        gdk_threads_enter();
         omnplay_library_draw(app);
+        gdk_flush();
+        gdk_threads_leave();
     };
 
     free(items);
+
+    gdk_threads_enter();
+    omnplay_playlist_normalize(app);
+    gtk_widget_destroy(app->library.refresh_ui[0]);
+    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);
+
 };
 
 void omnplay_library_draw(omnplay_instance_t* app)
@@ -263,9 +307,79 @@ void omnplay_library_draw(omnplay_instance_t* app)
             1, frames2tc(app->library.item[i].dur, 25.0, tc),
             2, app->library.item[i].title,
             3, i,
+            4, FALSE,
+            5, "red",
             -1 );
     }
 
     pthread_mutex_unlock(&app->library.lock);
 };
 
+static void get_selected_idx_library_proc(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
+{
+    int idx, *list = (int*)data;
+    gtk_tree_model_get(model, iter, 3, &idx, -1);
+    list[list[0] + 1] = idx;
+    list[0] = list[0] + 1;
+};
+
+static int* get_selected_idx_library(omnplay_instance_t* app)
+{
+    int* list = NULL;
+    GtkTreeSelection *selection;
+
+    selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(app->library_grid));
+    if(selection)
+    {
+        list = (int*)malloc(sizeof(int) * (MAX_LIBRARY_ITEMS + 1));
+        memset(list, 0, sizeof(int) * (MAX_LIBRARY_ITEMS + 1));
+
+        gtk_tree_selection_selected_foreach(
+            selection,
+            get_selected_idx_library_proc,
+            list);
+
+        if(!list[0])
+        {
+            free(list);
+            list = NULL;
+        };
+    };
+
+    return list;
+};
+
+
+playlist_item_t* omnplay_library_get_selected(omnplay_instance_t* app, int *count)
+{
+    int* idxs;
+    playlist_item_t* items = NULL;
+
+    pthread_mutex_lock(&app->library.lock);
+
+    *count = 0;
+
+    idxs = get_selected_idx_library(app);
+
+    if(idxs)
+    {
+        int i;
+
+        /* alloc items */
+        items = (playlist_item_t*)malloc(sizeof(playlist_item_t) * (idxs[0] + 1));
+
+        /* clear last item */
+        memset(&items[idxs[0]], 0, sizeof(playlist_item_t));
+
+        /* copy items */
+        for(i = 0; i < idxs[0]; i++)
+            items[i] = app->library.item[idxs[i + 1]];
+
+        *count = idxs[0];
+        free(idxs);
+    };
+
+    pthread_mutex_unlock(&app->library.lock);
+
+    return items;
+};