X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fplaylist.c;h=35c639fcd3745360ec4efa9206ecf02dea79505b;hb=8a6207f6d27cdb27b9774e0c36e09e23e9ac6526;hp=4c47bf0febd07bad33db8513b2527406fe6e8a21;hpb=a0d2ee063233dc9e3388f0e51b7bccc20a1885a5;p=omnplay

diff --git a/src/playlist.c b/src/playlist.c
index 4c47bf0..35c639f 100644
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -87,12 +87,33 @@ static int load_file_ply(omnplay_instance_t* app, char* filename)
                         case 4: items[count].type = OMNPLAY_PLAYLIST_ITEM_LOOP_END; break;
                         case 6: items[count].type = OMNPLAY_PLAYLIST_ITEM_BLOCK_END; break;
                         case 0:
-                            if(!count || items[count - 1].type != OMNPLAY_PLAYLIST_ITEM_BLOCK_BODY)
+                            if(!count)
                                 items[count].type = OMNPLAY_PLAYLIST_ITEM_BLOCK_BEGIN;
-                            else
+                            else if(items[count - 1].type == OMNPLAY_PLAYLIST_ITEM_BLOCK_BEGIN ||
+                                    items[count - 1].type == OMNPLAY_PLAYLIST_ITEM_BLOCK_BODY)
                                 items[count].type = OMNPLAY_PLAYLIST_ITEM_BLOCK_BODY;
+                            else
+                                items[count].type = OMNPLAY_PLAYLIST_ITEM_BLOCK_BEGIN;
                             break;
                     };
+#if 0
+                    {
+                        char* n;
+                        switch(items[count].type)
+                        {
+                            case OMNPLAY_PLAYLIST_ITEM_BLOCK_BEGIN:       n = "BLOCK_BEGIN"; break;
+                            case OMNPLAY_PLAYLIST_ITEM_BLOCK_BODY:        n = "BLOCK_BODY"; break;
+                            case OMNPLAY_PLAYLIST_ITEM_BLOCK_END:         n = "BLOCK_END"; break;
+                            case OMNPLAY_PLAYLIST_ITEM_BLOCK_SINGLE:      n = "BLOCK_SINGLE"; break;
+                            case OMNPLAY_PLAYLIST_ITEM_LOOP_BEGIN:        n = "LOOP_BEGIN"; break;
+                            case OMNPLAY_PLAYLIST_ITEM_LOOP_BODY:         n = "LOOP_BODY"; break;
+                            case OMNPLAY_PLAYLIST_ITEM_LOOP_END:          n = "LOOP_END"; break;
+                            case OMNPLAY_PLAYLIST_ITEM_LOOP_SINGLE:       n = "LOOP_SINGLE"; break;
+                        };
+                        fprintf(stderr, "src=[%s]\ndst=[idx=%d,block=%s,block_id=%d,in=%d,out=%d]\n",
+                            l, count, n, items[count].type, items[count].in, items[count].dur);
+                    };
+#endif
 
                     count++;
                 }
@@ -191,8 +212,9 @@ void omnplay_playlist_draw(omnplay_instance_t* app)
             2, (0 == app->playlist.item[i].player)?"A":"B",
             3, app->playlist.item[i].id,
             4, frames2tc(app->playlist.item[i].in, 25.0, tc1),
-            5, frames2tc(app->playlist.item[i].in, 25.0, tc2),
+            5, frames2tc(app->playlist.item[i].dur, 25.0, tc2),
             6, app->playlist.item[i].title,
+            7, i,
             -1 );
     }
 
@@ -200,3 +222,86 @@ void omnplay_playlist_draw(omnplay_instance_t* app)
 
     pthread_mutex_unlock(&app->playlist.lock);
 };
+
+typedef struct omnplay_playlist_draw_item_desc
+{
+    GtkListStore *list_store;
+    omnplay_instance_t* app;
+    int idx;
+} omnplay_playlist_draw_item_t;
+
+static gboolean omnplay_playlist_draw_item_proc(
+    GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer user_data)
+{
+    int i;
+    char tc1[12], tc2[12];
+    omnplay_playlist_draw_item_t* item = (omnplay_playlist_draw_item_t*)user_data;
+    omnplay_instance_t* app = item->app;
+
+    gtk_tree_model_get(model, iter, 7, &i, -1);
+
+    if(i != item->idx) return FALSE;
+
+    gtk_list_store_set(item->list_store, iter,
+        0, "",
+        1, app->playlist.block_icons[app->playlist.item[i].type],
+        2, (0 == app->playlist.item[i].player)?"A":"B",
+        3, app->playlist.item[i].id,
+        4, frames2tc(app->playlist.item[i].in, 25.0, tc1),
+        5, frames2tc(app->playlist.item[i].dur, 25.0, tc2),
+        6, app->playlist.item[i].title,
+        7, i,
+        -1 );
+
+    return TRUE;
+};
+
+void omnplay_playlist_draw_item(omnplay_instance_t* app, int idx)
+{
+    GtkListStore *list_store;
+    omnplay_playlist_draw_item_t item;
+
+    list_store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(app->playlist_grid)));
+
+    pthread_mutex_lock(&app->playlist.lock);
+
+    item.idx = idx;
+    item.app = app;
+    item.list_store = list_store;
+    gtk_tree_model_foreach(GTK_TREE_MODEL(list_store), omnplay_playlist_draw_item_proc, &item);
+
+    pthread_mutex_unlock(&app->playlist.lock);
+};
+
+static gboolean omnplay_playlist_draw_item_rem_proc(
+    GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer user_data)
+{
+    int i;
+    void** args                 = (void**)user_data;
+    GtkListStore *list_store    = (GtkListStore *)args[1];
+    int idx                     = (int)args[2];
+    char* rem                   = (char*)args[3];
+
+    gtk_tree_model_get(model, iter, 7, &i, -1);
+
+    if(i != idx) return FALSE;
+
+    gtk_list_store_set(list_store, iter, 0, rem, -1);
+
+    return TRUE;
+};
+
+void omnplay_playlist_draw_item_rem(omnplay_instance_t* app, int idx, char* rem)
+{
+    void* item[4];
+    GtkListStore *list_store;
+
+    list_store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(app->playlist_grid)));
+
+    item[0] = (void*)app;
+    item[1] = (void*)list_store;
+    item[2] = (void*)idx;
+    item[3] = (void*)rem;
+
+    gtk_tree_model_foreach(GTK_TREE_MODEL(list_store), omnplay_playlist_draw_item_rem_proc, item);
+};