X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Flibrary.c;h=665a108ec149d7644bb9b8169ac31606e3531703;hb=HEAD;hp=ab6cee7c2d34535ac46b9944d2e0f16df8a1b200;hpb=dbdc240caac90c4a20c3055f39be26b3d0cdf685;p=omnplay

diff --git a/src/library.c b/src/library.c
index ab6cee7..665a108 100644
--- a/src/library.c
+++ b/src/library.c
@@ -57,27 +57,49 @@ int omnplay_library_normalize_item(omnplay_instance_t* app, playlist_item_t* ite
 {
     int r = 0;
     playlist_item_t* lib;
+    playlist_item_t prev;
 
     pthread_mutex_lock(&app->library.lock);
 
+    prev = *item;
+
     lib = omnplay_library_find(app, item->id);
 
     item->error = 0;
 
     if(lib)
     {
-
         if(!item->title[0])
         {
             strcpy(item->title, lib->title);
-            r = 1;
+            g_warning("%s: [%s] title=[%s]->[%s]", __FUNCTION__, item->id, prev.title, item->title);
+            r++;
         };
 
-        if(!item->dur || item->in < lib->in || (item->in + item->dur) > (lib->in + lib->dur))
+        if(item->in < lib->in || item->in >= (lib->in + lib->dur))
         {
-            item->dur = lib->dur;
+            g_warning("%s: [%s] (item->in=[%d] < lib->in=[%d] || item->in=[%d] >= (lib->in=[%d] + lib->dur=[%d]))",
+                __FUNCTION__, item->id,
+                item->in, lib->in, item->in, lib->in, lib->dur);
+
             item->in = lib->in;
-            r = 1;
+
+            g_warning("%s: [%s] in=[%d]->[%d]", __FUNCTION__, item->id, prev.in, item->in);
+
+            r++;
+        };
+
+        if(!item->dur || (item->in + item->dur) > (lib->in + lib->dur))
+        {
+            g_warning("%s: [%s] (!item->dur=[%d] || (item->in=[%d] + item->dur=[%d]) > (lib->in=[%d] + lib->dur=[%d])",
+                __FUNCTION__, item->id,
+                item->dur, item->in, item->dur, lib->in, lib->dur);
+
+            item->dur = lib->in + lib->dur - item->in;
+
+            g_warning("%s: [%s] dur=[%d]->[%d]", __FUNCTION__, item->id, prev.dur, item->dur);
+
+            r++;
         };
     }
     else
@@ -91,6 +113,35 @@ int omnplay_library_normalize_item(omnplay_instance_t* app, playlist_item_t* ite
     return r;
 };
 
+int omnplay_library_relink_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)
+    {
+        r = 1;
+        strcpy(item->title, lib->title);
+        item->dur = lib->dur;
+        item->in = lib->in;
+    }
+    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)
 {
     int i, j, m;
@@ -128,7 +179,7 @@ int omnplay_library_load_file(playlist_item_t* items, int *pcount, char* filenam
     /* open and process file */
     if((f = fopen(filename, "rt")))
     {
-        while( !feof(f) && c < (limit -1))
+        while(!feof(f) && c < limit)
         {
             char *s, *sp_r, *sp_b;
 
@@ -145,8 +196,12 @@ int omnplay_library_load_file(playlist_item_t* items, int *pcount, char* filenam
             {
                 memset(&item, 0, sizeof(playlist_item_t));
 
+                g_warning("%s: [%s]", __FUNCTION__, l);
+
                 for(i = 0, sp_b = l; (NULL != (sp_r = strtok(sp_b, "\t"))); i++, sp_b = NULL)
                 {
+                    g_warning("%s: [%d]=[%s]", __FUNCTION__, i, sp_r);
+
                     switch(i)
                     {
                         case 0: strncpy(item.id, sp_r, PATH_MAX); break;
@@ -158,7 +213,10 @@ int omnplay_library_load_file(playlist_item_t* items, int *pcount, char* filenam
 
                 /* insert item */
                 items[c++] = item;
-            };
+                g_warning("%s: id=[%s], in=[%d], dur=[%d]", __FUNCTION__, item.id, item.in, item.dur);
+            }
+            else
+                g_warning("omnplay_library_load_file: ignored line [%s]\n", l);
         }
 
         fclose(f);
@@ -171,6 +229,8 @@ int omnplay_library_load_file(playlist_item_t* items, int *pcount, char* filenam
 
     *pcount = c;
 
+    g_warning("omnplay_library_load_file: loaded [%d] items from [%s] file, limit [%d]\n", c, filename, limit);
+
     return r;
 };
 
@@ -206,8 +266,8 @@ static void omnplay_library_save_file(playlist_item_t* item, int count, char* fi
                 frames2tc(item[i].in, 25.0, tc_in),
                 frames2tc(item[i].dur, 25.0, tc_dur),
                 item[i].title);
-
         fclose(f);
+        g_warning("omnplay_library_save_file: written [%d] lines to file [%s]\n", count, filename);
     };
 };
 
@@ -224,45 +284,37 @@ 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(data), item->id);
-    gdk_flush();
-    gdk_threads_leave();
+    if(!(app->library.id_display_idx % app->library.id_display_rate))
+        omnplay_set_status(app, item->id);
+    app->library.id_display_idx++;
 };
 
 static void* omnplay_library_refresh_proc(void* data)
 {
-    GtkWidget *refresh_ui[2];
     omnplay_instance_t* app = (omnplay_instance_t*)data;
     int count, i;
     playlist_item_t* items;
 
-#ifndef _WIN32
     gdk_threads_enter();
-#endif /* _WIN32 */
-    /* create UI for monitoring update */
-    ui_library_refresh(app, &refresh_ui[0], &refresh_ui[1]);
-    gtk_widget_show_all(refresh_ui[0]);
-    gtk_window_present(GTK_WINDOW(refresh_ui[0]));
-#ifndef _WIN32
+    gtk_widget_set_sensitive(app->window, FALSE);
     gdk_flush();
     gdk_threads_leave();
-#endif /* _WIN32 */
+
+    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, refresh_ui[1]);
+    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(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++)
@@ -280,6 +332,8 @@ static void* omnplay_library_refresh_proc(void* data)
         gdk_threads_leave();
     };
 
+    omnplay_set_status(app, "Normalizing playlist...");
+
     free(items);
 
     gdk_threads_enter();
@@ -287,26 +341,24 @@ static void* omnplay_library_refresh_proc(void* data)
     gdk_flush();
     gdk_threads_leave();
 
-#ifndef _WIN32
+    omnplay_set_status(app, "");
+
     gdk_threads_enter();
-#endif /* _WIN32 */
-    gtk_widget_destroy(refresh_ui[0]);
-#ifndef _WIN32
+    gtk_widget_set_sensitive(app->window, TRUE);
     gdk_flush();
     gdk_threads_leave();
-#endif /* _WIN32 */
+
 
     return NULL;
 };
 
 void omnplay_library_refresh(omnplay_instance_t* app)
 {
-    if(app->library.refresh_thread_r)
-        pthread_join(app->library.refresh_thread, NULL);
-    app->library.refresh_thread_r = 1;
+    if(app->library.refresh_thread)
+        g_thread_join(app->library.refresh_thread);
 
-    pthread_create(&app->library.refresh_thread, NULL,
-        omnplay_library_refresh_proc, app);
+    app->library.refresh_thread = g_thread_create(
+        omnplay_library_refresh_proc, app, TRUE, NULL);
 };
 
 void omnplay_library_draw(omnplay_instance_t* app)