X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Flibrary.c;h=5915ed5f9fbdc8175f152064ebb54d9460dac702;hb=d31575c9e3f5dac1dc7596b4cb2a8457ea2bef6b;hp=ab6cee7c2d34535ac46b9944d2e0f16df8a1b200;hpb=dbdc240caac90c4a20c3055f39be26b3d0cdf685;p=melted_gui

diff --git a/src/library.c b/src/library.c
index ab6cee7..5915ed5 100644
--- a/src/library.c
+++ b/src/library.c
@@ -1,6 +1,6 @@
 /*
- * playlist.c -- GTK+ 2 omnplay
- * Copyright (C) 2011 Maksym Veremeyenko <verem@m1stereo.tv>
+ * library.c -- GTK+ 2 melted gui
+ * Copyright (C) 2012 Maksym Veremeyenko <verem@m1stereo.tv>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,10 +33,248 @@
 #include <pthread.h>
 #include <string.h>
 
-#include "omnplay.h"
+#include <mvcp/mvcp.h>
+#include <mvcp/mvcp_remote.h>
+
+#include "instance.h"
 #include "ui.h"
 #include "timecode.h"
+#include "support.h"
+
+void library_release(instance_t* app)
+{
+    mvcp_close(app->library.handle[0]);
+    mvcp_parser_close(app->library.handle[1]);
+};
+
+static void library_add_fake(instance_t* app, GtkTreeStore *tree_store, GtkTreeIter* parent)
+{
+    GtkTreeIter iter;
+    gtk_tree_store_append(tree_store, &iter, parent);
+    gtk_tree_store_set(tree_store, &iter, -1);
+};
+
+static int library_init_load(instance_t* app)
+{
+    GtkTreeIter iter;
+    GtkTreeStore *tree_store;
+
+    tree_store = GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(app->library_tree)));
+    gtk_tree_store_clear(tree_store);
+
+    gtk_tree_store_append(tree_store, &iter, NULL);
+    gtk_tree_store_set(tree_store, &iter,
+        0, app->library.icons[0],
+        1, "<dir>>",
+        2, "LIBRARY",
+        3, NULL,
+        4, NULL,
+        5, FALSE,
+        6, "red",
+        -1 );
+    library_add_fake(app, tree_store, &iter);
+
+    gtk_tree_view_collapse_all(GTK_TREE_VIEW(app->library_tree));
+
+    return 0;
+};
+
+static void library_add_item(instance_t* app, GtkTreeStore *treestore, GtkTreeIter *iter,
+    mvcp_dir_entry e, mvcp_list_entry p)
+{
+    GtkTreeIter this, child;
+
+    if(e->dir)
+    {
+        gtk_tree_store_prepend(treestore, &this, iter);
+
+        gtk_tree_store_set(treestore, &this,
+            0, app->library.icons[0],
+            1, "<dir>",
+            2, e->name,
+            3, e,
+            4, NULL,
+            5, FALSE,
+            6, "red",
+            -1 );
+
+        gtk_tree_store_append(treestore, &child, &this);
+        gtk_tree_store_set(treestore, &child, -1);
+    }
+    else
+    {
+        char dur[32];
+
+        if(p)
+            frames2tc(p->size, p->fps, dur);
+        else
+            strcpy(dur, "<file>");
+
+        gtk_tree_store_append(treestore, &this, iter);
+
+        gtk_tree_store_set(treestore, &this,
+            0, app->library.icons[1],
+            1, dur,
+            2, e->name,
+            3, e,
+            4, p,
+            5, FALSE,
+            6, "red",
+            -1 );
+    };
+};
+
+static void on_library_row_expanded
+(
+    GtkTreeView *treeview,
+    GtkTreeIter *iter,
+    GtkTreePath *path,
+    gpointer user_data
+)
+{
+    int i;
+    char* p;
+    GtkTreeIter fake;
+    GtkTreeModel *model;
+    GdkCursor* cursor;
+    mvcp_dir dir;
+    mvcp_dir_entry_t *e;
+    instance_t* app = (instance_t*)user_data;
+
+//    g_warning("on_library_row_expanded: HERE");
+
+    /* Set busy cursor */
+    cursor = gdk_cursor_new(GDK_WATCH);
+    gdk_window_set_cursor(gtk_widget_get_toplevel(GTK_WIDGET(treeview))->window, cursor);
+    gdk_cursor_unref(cursor);
+    gdk_flush();
+
+    model = gtk_tree_view_get_model(treeview);
+
+    /* save fake item */
+    gtk_tree_model_iter_children(GTK_TREE_MODEL(model), &fake, iter);
+
+    /* request mvcp entry */
+    gtk_tree_model_get(GTK_TREE_MODEL(model), iter,
+        3, &e,
+        -1);
+
+    /* setup root path */
+    if(!e)
+        p = "/";
+    else
+        p = e->full;
+
+    /* read dir */
+    dir = mvcp_dir_init(app->library.handle[0], p);
+    for (i = 0; i < mvcp_dir_count(dir); i++)
+    {
+        mvcp_dir_entry_t dir_entry;
+        mvcp_list_entry_t *list_e = NULL, list_entry;
+
+        if(mvcp_ok != mvcp_dir_get(dir, i, &dir_entry))
+            continue;
+
+//        g_warning("on_library_row_expanded: path=[%s], entry.dur=[%d], entry.full=[%s], entry.name[%s]",
+//            p, entry.dir, entry.full, entry.name);
+
+        e = (mvcp_dir_entry_t*)malloc(sizeof(mvcp_dir_entry_t));
+        *e = dir_entry;
+
+        if(!e->dir && mvcp_ok == mvcp_probe_clip( app->library.handle[0], e->full, &list_entry))
+        {
+            list_e = (mvcp_list_entry_t*)malloc(sizeof(mvcp_list_entry_t));
+            *list_e = list_entry;
+        };
+
+        library_add_item(app, GTK_TREE_STORE(model), iter, e, list_e);
+    };
+
+    /* restore cursor */
+    gdk_window_set_cursor(gtk_widget_get_toplevel(GTK_WIDGET(treeview))->window, NULL);
+
+    /* delete fake item */
+    gtk_tree_store_remove(GTK_TREE_STORE(model), &fake);
+};
+
+static void on_library_row_collapsed
+(
+    GtkTreeView *treeview,
+    GtkTreeIter *iter,
+    GtkTreePath *path,
+    gpointer user_data
+)
+{
+    GtkTreeModel *model;
+    GtkTreeIter child;
+//    g_warning("on_library_row_collapsed: HERE");
+
+    /* delete all items */
+    model = gtk_tree_view_get_model(treeview);
+    while (gtk_tree_model_iter_children(GTK_TREE_MODEL(model), &child, iter))
+    {
+        mvcp_dir_entry_t *e;
+        mvcp_list_entry_t *l;
+
+        /* request mvcp entry */
+        gtk_tree_model_get(GTK_TREE_MODEL(model), &child,
+            3, &e,
+            4, &l,
+            -1);
+
+        /* free entry */
+        if(e) free(e);
+        if(l) free(l);
+
+        gtk_tree_store_remove(GTK_TREE_STORE(model), &child);
+    };
+
+    /* add a fake element */
+    library_add_fake(user_data, GTK_TREE_STORE(model), iter);
+};
+
+void library_init(instance_t* app)
+{
+    /* connect to library */
+    app->library.handle[1] = mvcp_parser_init_remote(app->players.host, app->library.port);
+    app->library.handle[0] = mvcp_init(app->library.handle[1]);
+    if(mvcp_connect(app->library.handle[0]) != mvcp_ok)
+    {
+        g_warning("library_init: failed to connect to server %s", app->players.host);
+        return;
+    };
+
+    /* setup icons */
+    app->library.icons[0] = create_pixbuf("Axialis_Team_playlist_open_16x16.png");
+    app->library.icons[1] = create_pixbuf("Axialis_Team_playlist_save_16x16.png");
+
+    /* load lib */
+    library_init_load(app);
+
+    /* set handlers */
+    gtk_signal_connect(GTK_OBJECT(app->library_tree), "row-expanded",
+        GTK_SIGNAL_FUNC(on_library_row_expanded), app);
+    gtk_signal_connect(GTK_OBJECT(app->library_tree), "row-collapsed",
+        GTK_SIGNAL_FUNC(on_library_row_collapsed), app);
+
+#if 0
+    pthread_mutex_lock(&app->library.lock);
+
+    if(app->library.filename[0])
+    {
+        app->library.count = MAX_LIBRARY_ITEMS;
+        omnplay_library_load_file(app->library.item, &app->library.count, app->library.filename);
+    };
+
+    omnplay_library_sort(app);
+
+    pthread_mutex_unlock(&app->library.lock);
+
+    omnplay_library_draw(app);
+#endif
+};
 
+#if 0
 playlist_item_t* omnplay_library_find(omnplay_instance_t* app, char* id)
 {
     int i;
@@ -57,28 +295,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->in + lib->dur - item->in;
+            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 +406,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 +436,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,25 +451,11 @@ 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;
 };
 
-void omnplay_library_load(omnplay_instance_t* app)
-{
-    pthread_mutex_lock(&app->library.lock);
-
-    if(app->library.filename[0])
-    {
-        app->library.count = MAX_LIBRARY_ITEMS;
-        omnplay_library_load_file(app->library.item, &app->library.count, app->library.filename);
-    };
-
-    omnplay_library_sort(app);
-
-    pthread_mutex_unlock(&app->library.lock);
-
-    omnplay_library_draw(app);
-};
 
 static void omnplay_library_save_file(playlist_item_t* item, int count, char* filename)
 {
@@ -206,8 +472,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 +490,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 +538,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 +547,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)
@@ -447,3 +705,5 @@ void omnplay_library_search(omnplay_instance_t* app, int next)
 
     pthread_mutex_unlock(&app->library.lock);
 };
+
+#endif