fix item's IN normalization

[omnplay] / src / library.c

diff --git a/src/library.c b/src/library.c
index d2e73f3..ce0c181 100644 (file)
--- a/src/library.c
+++ b/src/library.c
@@ -57,28 +57,68 @@ 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;
+            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;
             item->in = lib->in;
-            r = 1;
+            r++;
+        };
+
+        if(!item->dur || (item->in + item->dur) > (lib->in + lib->dur))
+        {
+            item->dur = lib->dur;
+            r++;
         };
+
+        if(r)
+            g_warning("omnplay_library_normalize_item: [%s,%d,%d]->[%s,%d,%d]\n",
+                prev.title, prev.in, prev.dur, item->title, item->in, item->dur);
+    }
+    else
+    {
+        r = 1;
+        item->error = PLAYLIST_ITEM_ERROR_LIB;
+    };
+
+    pthread_mutex_unlock(&app->library.lock);
+
+    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
     {
@@ -128,7 +168,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;
 
@@ -158,7 +198,9 @@ int omnplay_library_load_file(playlist_item_t* items, int *pcount, char* filenam
 
                 /* insert item */
                 items[c++] = item;
-            };
+            }
+            else
+                g_warning("omnplay_library_load_file: ignored line [%s]\n", l);
         }
 
         fclose(f);
@@ -171,6 +213,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 +250,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,47 +268,36 @@ 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;
 
     gdk_threads_enter();
-
-    /* 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]));
-
+    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, 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);
 
-        gdk_threads_enter();
-        gtk_label_set_text(GTK_LABEL(refresh_ui[1]), "Setting library...");
-        gdk_flush();
-        gdk_threads_leave();
+        omnplay_set_status(app, "Setting library...");
 
         pthread_mutex_lock(&app->library.lock);
 
@@ -283,6 +316,8 @@ static void* omnplay_library_refresh_proc(void* data)
         gdk_threads_leave();
     };
 
+    omnplay_set_status(app, "Normalizing playlist...");
+
     free(items);
 
     gdk_threads_enter();
@@ -290,11 +325,14 @@ static void* omnplay_library_refresh_proc(void* data)
     gdk_flush();
     gdk_threads_leave();
 
+    omnplay_set_status(app, "");
+
     gdk_threads_enter();
-    gtk_widget_destroy(refresh_ui[0]);
+    gtk_widget_set_sensitive(app->window, TRUE);
     gdk_flush();
     gdk_threads_leave();
 
+
     return NULL;
 };