add playlist normalization after library refresh

diff --git a/src/library.c b/src/library.c
index eefce46..700d5bf 100644 (file)
--- a/src/library.c
+++ b/src/library.c
@@ -48,8 +48,9 @@ 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);
@@ -62,18 +63,27 @@ void omnplay_library_normalize_item(omnplay_instance_t* app, playlist_item_t* it
     {
 
         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)
@@ -217,7 +227,6 @@ void omnplay_library_refresh(omnplay_instance_t* app)
     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);
@@ -242,6 +251,8 @@ void omnplay_library_refresh(omnplay_instance_t* app)
     };
 
     free(items);
+
+    omnplay_playlist_normalize(app);
 };
 
 void omnplay_library_draw(omnplay_instance_t* app)

diff --git a/src/omnplay.cpp b/src/omnplay.cpp
index fb0bf66..b9badfb 100644 (file)
--- a/src/omnplay.cpp
+++ b/src/omnplay.cpp
@@ -1117,3 +1117,13 @@ void omnplay_release(omnplay_instance_t* app)
     /* destroy library lock */
     pthread_mutex_destroy(&app->library.lock);
 };
+
+void omnplay_playlist_normalize(omnplay_instance_t* app)
+{
+    int i;
+
+    /* normalize playlist */
+    for(i = 0; i < app->playlist.count; i++)
+        if(omnplay_library_normalize_item(app, &app->playlist.item[i]))
+            omnplay_playlist_draw_item(app, i);
+};

diff --git a/src/omnplay.h b/src/omnplay.h
index 2c8165b..fc6b1d8 100644 (file)
--- a/src/omnplay.h
+++ b/src/omnplay.h
@@ -172,8 +172,9 @@ int omnplay_get_content(omnplay_instance_t* app, playlist_item_t *items, int lim
 int omnplay_whois_list(omnplay_instance_t* app, playlist_item_t *items, int* plimit);
 int omnplay_library_load_file(playlist_item_t* items, int *pcount, char* filename);
 playlist_item_t* omnplay_library_find(omnplay_instance_t* app, char* id);
-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);
 playlist_item_t* omnplay_library_get_selected(omnplay_instance_t* app, int *count);
+void omnplay_playlist_normalize(omnplay_instance_t* app);
 
 #ifdef __cplusplus
 };