From: Maksym Veremeyenko <verem@m1stereo.tv>
Date: Thu, 6 Oct 2011 10:49:42 +0000 (+0300)
Subject: fix item's IN normalization
X-Git-Url: http://research.m1stereo.tv/gitweb?a=commitdiff_plain;h=3d15fd27ad9b8265a0f7c8d034d1180f3241306a;p=omnplay

fix item's IN normalization
---

diff --git a/src/library.c b/src/library.c
index 148f720..ce0c181 100644
--- a/src/library.c
+++ b/src/library.c
@@ -57,28 +57,39 @@ 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
     {