X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Flibrary.c;h=c42838a6ab8013d20f4a3420c10d396162c54344;hb=f543c7010b6b82412fd429c9e492c65638935444;hp=eefce46050a53bd464a38b17e5db84623b3db8f1;hpb=a4397d674b2f7ea33653ff1137193835c668c7de;p=melted_gui

diff --git a/src/library.c b/src/library.c
index eefce46..c42838a 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
@@ -21,323 +21,436 @@
 #  include <config.h>
 #endif
 
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <pthread.h>
+#include <string.h>
 
-#include "omnplay.h"
+#include <mvcp/mvcp.h>
+#include <mvcp/mvcp_remote.h>
+
+#include "library.h"
 #include "ui.h"
 #include "timecode.h"
+#include "support.h"
 
-playlist_item_t* omnplay_library_find(omnplay_instance_t* app, char* id)
-{
-    int i;
-    playlist_item_t* item = NULL;
-
-    pthread_mutex_lock(&app->library.lock);
-
-    for(i = 0; i < app->library.count && !item; i++)
-        if(!strcasecmp(id, app->library.item[i].id))
-            item = &app->library.item[i];
+extern GtkTargetEntry drag_targets[];
 
-    pthread_mutex_unlock(&app->library.lock);
-
-    return item;
+void library_release(instance_t* app)
+{
+    mvcp_close(app->library.handle[0]);
+    mvcp_parser_close(app->library.handle[1]);
 };
 
-void omnplay_library_normalize_item(omnplay_instance_t* app, playlist_item_t* item)
+static void library_add_fake(instance_t* app, GtkTreeStore *tree_store, GtkTreeIter* parent)
 {
-    playlist_item_t* lib;
-
-    pthread_mutex_lock(&app->library.lock);
+    GtkTreeIter iter;
+    gtk_tree_store_append(tree_store, &iter, parent);
+    gtk_tree_store_set(tree_store, &iter, -1);
+};
 
-    lib = omnplay_library_find(app, item->id);
+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;
+};
 
-    item->error = 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(lib)
+    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 );
 
-        if(!item->title[0])
-            strcpy(item->title, lib->title);
-
-        if(!item->dur)
-        {
-            item->dur = lib->dur;
-            item->in = lib->in;
-        };
+        gtk_tree_store_append(treestore, &child, &this);
+        gtk_tree_store_set(treestore, &child, -1);
     }
     else
-        item->error = PLAYLIST_ITEM_ERROR_LIB;
-
-    pthread_mutex_unlock(&app->library.lock);
+    {
+        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 );
+    };
 };
 
-void omnplay_library_sort(omnplay_instance_t* app)
+static void on_library_row_expanded
+(
+    GtkTreeView *treeview,
+    GtkTreeIter *iter,
+    GtkTreePath *path,
+    gpointer user_data
+)
 {
-    int i, j, m;
-    playlist_item_t item;
+    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;
 
-    for(i = 0; i < app->library.count; i++)
+    /* read dir */
+    dir = mvcp_dir_init(app->library.handle[0], p);
+    for (i = 0; i < mvcp_dir_count(dir); i++)
     {
-        /* find max */
-        for(j = i + 1, m = i; j < app->library.count; j++)
-            if(strcasecmp(app->library.item[j].id, app->library.item[m].id) < 0)
-                m = j;
+        mvcp_dir_entry_t dir_entry;
+        mvcp_list_entry_t *list_e = NULL, list_entry;
 
-        if(m != i)
-        {
-            item = app->library.item[i];
-            app->library.item[i] = app->library.item[m];
-            app->library.item[m] = item;
-        };
-    };
-};
+        if(mvcp_ok != mvcp_dir_get(dir, i, &dir_entry))
+            continue;
 
-int omnplay_library_load_file(playlist_item_t* items, int *pcount, char* filename)
-{
-    int i, c = 0, r = 0;
-    FILE* f;
-    char *l;
-    int limit = *pcount;
-    playlist_item_t item;
+//        g_warning("on_library_row_expanded: path=[%s], entry.dur=[%d], entry.full=[%s], entry.name[%s]",
+//            p, entry.dir, entry.full, entry.name);
 
-    /* allocate space for strings and items */
-    l = malloc(PATH_MAX);
+        e = (mvcp_dir_entry_t*)malloc(sizeof(mvcp_dir_entry_t));
+        *e = dir_entry;
 
-    *pcount = 0;
-
-    /* open and process file */
-    if((f = fopen(filename, "rt")))
-    {
-        while( !feof(f) && c < (limit -1))
+        if(!e->dir && mvcp_ok == mvcp_probe_clip( app->library.handle[0], e->full, &list_entry))
         {
-            char *s, *sp_r, *sp_b;
-
-            /* load string */
-            memset(l, 0, PATH_MAX);
-            fgets(l, PATH_MAX, f);
-
-            /* remove newlines */
-            if( (s = strchr(l, '\n')) ) *s = 0;
-            if( (s = strchr(l, '\r')) ) *s = 0;
-
-            /* check for empty line */
-            if(l[0] && l[0] != '#' && l[0] != '|')
-            {
-                memset(&item, 0, sizeof(playlist_item_t));
-
-                for(i = 0, sp_b = l; (NULL != (sp_r = strtok(sp_b, "\t"))); i++, sp_b = NULL)
-                {
-                    switch(i)
-                    {
-                        case 0: strncpy(item.id, sp_r, PATH_MAX); break;
-                        case 1: tc2frames(sp_r, 25.0, &item.in); break;
-                        case 2: tc2frames(sp_r, 25.0, &item.dur); break;
-                        case 3: strncpy(item.title, sp_r, PATH_MAX); break;
-                    };
-                };
-
-                /* insert item */
-                items[c++] = item;
-            };
-        }
-
-        fclose(f);
-    }
-    else
-        r = -1;
+            list_e = (mvcp_list_entry_t*)malloc(sizeof(mvcp_list_entry_t));
+            *list_e = list_entry;
+        };
 
-    /* free data */
-    free(l);
+        library_add_item(app, GTK_TREE_STORE(model), iter, e, list_e);
+    };
 
-    *pcount = c;
+    /* restore cursor */
+    gdk_window_set_cursor(gtk_widget_get_toplevel(GTK_WIDGET(treeview))->window, NULL);
 
-    return r;
+    /* delete fake item */
+    gtk_tree_store_remove(GTK_TREE_STORE(model), &fake);
 };
 
-void omnplay_library_load(omnplay_instance_t* app)
+static void on_library_row_collapsed
+(
+    GtkTreeView *treeview,
+    GtkTreeIter *iter,
+    GtkTreePath *path,
+    gpointer user_data
+)
 {
-    pthread_mutex_lock(&app->library.lock);
+    GtkTreeModel *model;
+    GtkTreeIter child;
+//    g_warning("on_library_row_collapsed: HERE");
 
-    if(app->library.filename[0])
+    /* delete all items */
+    model = gtk_tree_view_get_model(treeview);
+    while (gtk_tree_model_iter_children(GTK_TREE_MODEL(model), &child, iter))
     {
-        app->library.count = MAX_LIBRARY_ITEMS;
-        omnplay_library_load_file(app->library.item, &app->library.count, app->library.filename);
-    };
+        mvcp_dir_entry_t *e;
+        mvcp_list_entry_t *l;
 
-    omnplay_library_sort(app);
+        /* request mvcp entry */
+        gtk_tree_model_get(GTK_TREE_MODEL(model), &child,
+            3, &e,
+            4, &l,
+            -1);
 
-    pthread_mutex_unlock(&app->library.lock);
+        /* free entry */
+        if(e) free(e);
+        if(l) free(l);
 
-    omnplay_library_draw(app);
+        gtk_tree_store_remove(GTK_TREE_STORE(model), &child);
+    };
+
+    /* add a fake element */
+    library_add_fake(user_data, GTK_TREE_STORE(model), iter);
 };
 
-static void omnplay_library_save_file(playlist_item_t* item, int count, char* filename)
+static void library_drag_data_get_cb(GtkWidget *widget, GdkDragContext *context,
+    GtkSelectionData *selection_data, guint info, guint time, gpointer userdata)
 {
-    int i;
-    FILE* f;
+    int c;
+    playlist_item_t* items;
+    instance_t* app = (instance_t*)userdata;
 
-    if((f = fopen(filename, "wt")))
-    {
-        char tc_in[32], tc_dur[32];
+    g_warning("library_drag_data_get_cb");
 
-        for(i = 0; i < count; i++)
-            fprintf(f, "%s\t%s\t%s\t%s\n",
-                item[i].id,
-                frames2tc(item[i].in, 25.0, tc_in),
-                frames2tc(item[i].dur, 25.0, tc_dur),
-                item[i].title);
+    items = library_get_selected_items(app, &c);
 
-        fclose(f);
+    /* clear item */
+    if(items)
+    {
+        gtk_selection_data_set(selection_data, selection_data->target, 8,
+            (const guchar *)items, sizeof(playlist_item_t) * c);
+        free(items);
     };
 };
 
-void omnplay_library_save(omnplay_instance_t* app)
+static void library_drag_begin_cb(GtkWidget *widget, GdkDragContext *context, gpointer userdata)
 {
-    pthread_mutex_lock(&app->library.lock);
-
-    if(app->library.filename[0])
-        omnplay_library_save_file(app->library.item, app->library.count,
-            app->library.filename);
-
-    pthread_mutex_unlock(&app->library.lock);
+    g_warning("library_drag_begin_cb");
+    gtk_drag_source_set_icon_stock(widget, GTK_STOCK_DND);
 };
 
-static void omnplay_get_content_cb(omnplay_instance_t* app, playlist_item_t* item, void* data)
-{
-    fprintf(stderr, "requested: id=[%s]\n", item->id);
-};
 
-void omnplay_library_refresh(omnplay_instance_t* app)
+void library_init(instance_t* app)
 {
-    int count, i;
-    playlist_item_t* items;
+    /* 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");
 
-    items = (playlist_item_t*)malloc(sizeof(playlist_item_t) * MAX_LIBRARY_ITEMS);
+    /* load lib */
+    library_init_load(app);
 
-    count = omnplay_get_content(app, items, MAX_LIBRARY_ITEMS, omnplay_get_content_cb, NULL);
+    /* allow drag source */
+    gtk_drag_source_set(app->library_tree, GDK_BUTTON1_MASK,
+        drag_targets, 1, (GdkDragAction)(GDK_ACTION_COPY));
 
-    if(count > 0)
-    {
-        if(app->library.whois[0])
-            omnplay_whois_list(app, items, &count);
+    /* 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);
+    g_signal_connect(GTK_OBJECT(app->library_tree), "drag_data_get",
+        G_CALLBACK(library_drag_data_get_cb), app);
+    g_signal_connect(GTK_OBJECT(app->library_tree), "drag_begin",
+        G_CALLBACK(library_drag_begin_cb), app);
 
-        pthread_mutex_lock(&app->library.lock);
+};
 
-        for(i = 0; i < count; i++)
-            app->library.item[i] = items[i];
+static void library_get_selected_items_iter
+(
+    GtkTreeModel *model,
+    GtkTreePath *path,
+    GtkTreeIter *iter,
+    gpointer data
+)
+{
+    int l;
+    mvcp_dir_entry_t *dir;
+    mvcp_list_entry_t *list;
+    playlist_item_t** pitems = (playlist_item_t**)data;
+    playlist_item_t* items = *pitems;
+
+    /* request pointers to list and dir entries of library items */
+    gtk_tree_model_get(model, iter,
+        3, &dir,
+        4, &list,
+        -1);
+
+    /* check if defined */
+    if(dir && list)
+    {
+        /* allocate items */
+        if(!items)
+        {
+            items = (playlist_item_t*)malloc(sizeof(playlist_item_t));
+            memset(items, 0, sizeof(playlist_item_t));
+        };
 
-        app->library.count = count;
+        /* find numbers of items in list */
+        for(l = 0; items[l].id[0]; l++);
+        g_warning("library_get_selected_items_iter: l=%d", l);
 
-        omnplay_library_sort(app);
+        /* realloc items */
+        items = (playlist_item_t*)realloc(items, (l + 2) * sizeof(playlist_item_t));
 
-        pthread_mutex_unlock(&app->library.lock);
+        /* clean last item */
+        memset(&items[l + 1], 0, sizeof(playlist_item_t));
 
-        omnplay_library_draw(app);
+        /* setup items */
+        memset(&items[l + 0], 0, sizeof(playlist_item_t));
+        strncpy(items[l].title, dir->name, PATH_MAX);
+        strncpy(items[l].id, dir->full, PATH_MAX);
+        items[l].dur = list->size;
     };
 
-    free(items);
+    *pitems = items;
 };
 
-void omnplay_library_draw(omnplay_instance_t* app)
+playlist_item_t* library_get_selected_items(instance_t* app, int *count)
 {
-    int i;
-    char tc[12];
-    GtkListStore *list_store;
-    GtkTreeIter iter;
-
-    list_store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(app->library_grid)));
-    gtk_list_store_clear(list_store);
+    int l = 0;
+    playlist_item_t* items = NULL;
 
-    pthread_mutex_lock(&app->library.lock);
+    GtkTreeSelection *selection;
 
-    for(i = 0;i < app->library.count; i++)
+    selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(app->library_tree));
+    if(selection)
     {
-        gtk_list_store_append(list_store, &iter);
-
-        gtk_list_store_set(list_store, &iter,
-            0, app->library.item[i].id,
-            1, frames2tc(app->library.item[i].dur, 25.0, tc),
-            2, app->library.item[i].title,
-            3, i,
-            4, FALSE,
-            5, "red",
-            -1 );
-    }
+        gtk_tree_selection_selected_foreach(
+            selection,
+            library_get_selected_items_iter,
+            &items);
 
-    pthread_mutex_unlock(&app->library.lock);
-};
+        if(items)
+            for(; items[l].id[0]; l++);
+    };
 
-static void get_selected_idx_library_proc(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
-{
-    int idx, *list = (int*)data;
-    gtk_tree_model_get(model, iter, 3, &idx, -1);
-    list[list[0] + 1] = idx;
-    list[0] = list[0] + 1;
+    *count = l;
+    return items;
 };
 
-static int* get_selected_idx_library(omnplay_instance_t* app)
+int library_normalize_item(instance_t* app, playlist_item_t* item)
 {
-    int* list = NULL;
-    GtkTreeSelection *selection;
+#if 0
+    int r = 0;
+    playlist_item_t* lib;
+    playlist_item_t prev;
 
-    selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(app->library_grid));
-    if(selection)
+    pthread_mutex_lock(&app->library.lock);
+
+    prev = *item;
+
+    lib = omnplay_library_find(app, item->id);
+
+    item->error = 0;
+
+    if(lib)
     {
-        list = (int*)malloc(sizeof(int) * (MAX_LIBRARY_ITEMS + 1));
-        memset(list, 0, sizeof(int) * (MAX_LIBRARY_ITEMS + 1));
+        if(!item->title[0])
+        {
+            strcpy(item->title, lib->title);
+            r++;
+        };
 
-        gtk_tree_selection_selected_foreach(
-            selection,
-            get_selected_idx_library_proc,
-            list);
+        if(item->in < lib->in || item->in >= (lib->in + lib->dur))
+        {
+            item->in = lib->in;
+            r++;
+        };
 
-        if(!list[0])
+        if(!item->dur || (item->in + item->dur) > (lib->in + lib->dur))
         {
-            free(list);
-            list = NULL;
+            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;
     };
 
-    return list;
-};
+    pthread_mutex_unlock(&app->library.lock);
 
+    return r;
+#else
+    return 0;
+#endif
+};
 
-playlist_item_t* omnplay_library_get_selected(omnplay_instance_t* app, int *count)
+int library_relink_item(instance_t* app, playlist_item_t* item)
 {
-    int* idxs;
-    playlist_item_t* items = NULL;
+#if 0
+    int r = 0;
+    playlist_item_t* lib;
 
     pthread_mutex_lock(&app->library.lock);
 
-    *count = 0;
+    lib = omnplay_library_find(app, item->id);
 
-    idxs = get_selected_idx_library(app);
+    item->error = 0;
 
-    if(idxs)
+    if(lib)
     {
-        int i;
-
-        /* alloc items */
-        items = (playlist_item_t*)malloc(sizeof(playlist_item_t) * (idxs[0] + 1));
-
-        /* clear last item */
-        memset(&items[idxs[0]], 0, sizeof(playlist_item_t));
-
-        /* copy items */
-        for(i = 0; i < idxs[0]; i++)
-            items[i] = app->library.item[idxs[i + 1]];
-
-        *count = idxs[0];
-        free(idxs);
+        r = 1;
+        strcpy(item->title, lib->title);
+        item->dur = lib->dur;
+        item->in = lib->in;
+    }
+    else
+    {
+        r = 1;
+        item->error = PLAYLIST_ITEM_ERROR_LIB;
     };
 
     pthread_mutex_unlock(&app->library.lock);
 
-    return items;
+    return r;
+#else
+    return 0;
+#endif
 };