X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Flibrary.c;h=8f0633706a58b9f09552d5675e183fa84b920201;hb=74f9ecca37415f1b1b025fc5b329bcfc7721946b;hp=7a1260346a364490de5000881fc75be9d8f41048;hpb=9db08a82d46068d480cd77ade3d568c80cc9990d;p=melted_gui diff --git a/src/library.c b/src/library.c index 7a12603..8f06337 100644 --- a/src/library.c +++ b/src/library.c @@ -1,6 +1,6 @@ /* - * playlist.c -- GTK+ 2 omnplay - * Copyright (C) 2011 Maksym Veremeyenko + * library.c -- GTK+ 2 melted gui + * Copyright (C) 2012 Maksym Veremeyenko * * 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,255 +21,437 @@ # include #endif +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif + #include #include #include #include #include #include +#include + +#include +#include -#include "omnplay.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); +extern GtkTargetEntry drag_targets[]; - for(i = 0; i < app->library.count && !item; i++) - if(!strcasecmp(id, app->library.item[i].id)) - item = &app->library.item[i]; +void library_release(instance_t* app) +{ + mvcp_close(app->library.handle[0]); + mvcp_parser_close(app->library.handle[1]); +}; - pthread_mutex_unlock(&app->library.lock); +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); +}; - return item; +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, ">", + 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; }; -void omnplay_library_normalize_item(omnplay_instance_t* app, playlist_item_t* item) +static void library_add_item(instance_t* app, GtkTreeStore *treestore, GtkTreeIter *iter, + mvcp_dir_entry e, mvcp_list_entry p) { - playlist_item_t* lib; + GtkTreeIter this, child; - pthread_mutex_lock(&app->library.lock); + if(e->dir) + { + gtk_tree_store_prepend(treestore, &this, iter); + + gtk_tree_store_set(treestore, &this, + 0, app->library.icons[0], + 1, "", + 2, e->name, + 3, e, + 4, NULL, + 5, FALSE, + 6, "red", + -1 ); - lib = omnplay_library_find(app, item->id); + 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, ""); + + 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 ); + }; +}; - item->error = 0; +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; - if(lib) + /* 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(!item->title[0]) - strcpy(item->title, lib->title); + 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); - if(!item->dur) + 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)) { - item->dur = lib->dur; - item->in = lib->in; + list_e = (mvcp_list_entry_t*)malloc(sizeof(mvcp_list_entry_t)); + *list_e = list_entry; }; - } - else - item->error = PLAYLIST_ITEM_ERROR_LIB; - pthread_mutex_unlock(&app->library.lock); + 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); }; -void omnplay_library_sort(omnplay_instance_t* app) +static void on_library_row_collapsed +( + GtkTreeView *treeview, + GtkTreeIter *iter, + GtkTreePath *path, + gpointer user_data +) { - int i, j, m; - playlist_item_t item; + GtkTreeModel *model; + GtkTreeIter child; +// g_warning("on_library_row_collapsed: HERE"); - for(i = 0; i < app->library.count; i++) + /* delete all items */ + model = gtk_tree_view_get_model(treeview); + while (gtk_tree_model_iter_children(GTK_TREE_MODEL(model), &child, iter)) { - /* 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 *e; + mvcp_list_entry_t *l; - if(m != i) - { - item = app->library.item[i]; - app->library.item[i] = app->library.item[m]; - app->library.item[m] = item; - }; + /* 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); }; -int omnplay_library_load_file(playlist_item_t* items, int *pcount, char* filename) +static void library_drag_data_get_cb(GtkWidget *widget, GdkDragContext *context, + GtkSelectionData *selection_data, guint info, guint time, gpointer userdata) { - int i, c = 0, r = 0; - FILE* f; - char *l; - int limit = *pcount; - playlist_item_t item; + int c; + playlist_item_t* items; + instance_t* app = (instance_t*)userdata; - /* allocate space for strings and items */ - l = malloc(PATH_MAX); + g_warning("library_drag_data_get_cb"); - *pcount = 0; + items = library_get_selected_items(app, &c); - /* open and process file */ - if((f = fopen(filename, "rt"))) + /* clear item */ + if(items) { - while( !feof(f) && c < (limit -1)) - { - 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; - - /* free data */ - free(l); - - *pcount = c; - - return r; + gtk_selection_data_set(selection_data, selection_data->target, 8, + (const guchar *)items, sizeof(playlist_item_t) * c); + free(items); + }; }; -void omnplay_library_load(omnplay_instance_t* app) +static void library_drag_begin_cb(GtkWidget *widget, GdkDragContext *context, gpointer userdata) { - pthread_mutex_lock(&app->library.lock); + g_warning("library_drag_begin_cb"); + gtk_drag_source_set_icon_stock(widget, GTK_STOCK_DND); +}; + - if(app->library.filename[0]) +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) { - app->library.count = MAX_LIBRARY_ITEMS; - omnplay_library_load_file(app->library.item, &app->library.count, app->library.filename); + g_warning("library_init: failed to connect to server %s:%d", + app->players.host, app->library.port); + return; }; - omnplay_library_sort(app); + /* 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"); - pthread_mutex_unlock(&app->library.lock); + /* load lib */ + library_init_load(app); + + /* allow drag source */ + gtk_drag_source_set(app->library_tree, GDK_BUTTON1_MASK, + drag_targets, 1, (GdkDragAction)(GDK_ACTION_COPY)); + + /* 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); - omnplay_library_draw(app); }; -static void omnplay_library_save_file(playlist_item_t* item, int count, char* filename) +static void library_get_selected_items_iter +( + GtkTreeModel *model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer data +) { - int i; - FILE* f; - - if((f = fopen(filename, "wt"))) + 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) { - char tc_in[32], tc_dur[32]; + /* allocate items */ + if(!items) + { + items = (playlist_item_t*)malloc(sizeof(playlist_item_t)); + memset(items, 0, sizeof(playlist_item_t)); + }; + + /* find numbers of items in list */ + for(l = 0; items[l].id[0]; l++); + g_warning("library_get_selected_items_iter: l=%d", l); - 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); + /* realloc items */ + items = (playlist_item_t*)realloc(items, (l + 2) * sizeof(playlist_item_t)); - fclose(f); + /* clean last item */ + memset(&items[l + 1], 0, sizeof(playlist_item_t)); + + /* 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; }; + + *pitems = items; }; -void omnplay_library_save(omnplay_instance_t* app) +playlist_item_t* library_get_selected_items(instance_t* app, int *count) { - pthread_mutex_lock(&app->library.lock); + int l = 0; + playlist_item_t* items = NULL; - if(app->library.filename[0]) - omnplay_library_save_file(app->library.item, app->library.count, - app->library.filename); + GtkTreeSelection *selection; - pthread_mutex_unlock(&app->library.lock); -}; + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(app->library_tree)); + if(selection) + { + gtk_tree_selection_selected_foreach( + selection, + library_get_selected_items_iter, + &items); -static void omnplay_get_content_cb(omnplay_instance_t* app, playlist_item_t* item, void* data) -{ - fprintf(stderr, "requested: id=[%s]\n", item->id); + if(items) + for(; items[l].id[0]; l++); + }; + + *count = l; + return items; }; -void omnplay_library_refresh(omnplay_instance_t* app) +int library_normalize_item(instance_t* app, playlist_item_t* item) { - int count, i; - playlist_item_t* items; - - - items = (playlist_item_t*)malloc(sizeof(playlist_item_t) * MAX_LIBRARY_ITEMS); +#if 0 + int r = 0; + playlist_item_t* lib; + playlist_item_t prev; - count = omnplay_get_content(app, items, MAX_LIBRARY_ITEMS, omnplay_get_content_cb, NULL); + pthread_mutex_lock(&app->library.lock); - if(count > 0) - { - if(app->library.whois[0]) - omnplay_whois_list(app, items, &count); + prev = *item; - pthread_mutex_lock(&app->library.lock); + lib = omnplay_library_find(app, item->id); - for(i = 0; i < count; i++) - app->library.item[i] = items[i]; + item->error = 0; - app->library.count = count; + if(lib) + { + if(!item->title[0]) + { + strcpy(item->title, lib->title); + r++; + }; - omnplay_library_sort(app); + if(item->in < lib->in || item->in >= (lib->in + lib->dur)) + { + item->in = lib->in; + r++; + }; - pthread_mutex_unlock(&app->library.lock); + if(!item->dur || (item->in + item->dur) > (lib->in + lib->dur)) + { + item->dur = lib->in + lib->dur - item->in; + r++; + }; - omnplay_library_draw(app); + 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; }; - free(items); + pthread_mutex_unlock(&app->library.lock); + + return r; +#else + return 0; +#endif }; -void omnplay_library_draw(omnplay_instance_t* app) +int library_relink_item(instance_t* app, playlist_item_t* item) { - 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); +#if 0 + int r = 0; + playlist_item_t* lib; pthread_mutex_lock(&app->library.lock); - for(i = 0;i < app->library.count; i++) + lib = omnplay_library_find(app, item->id); + + item->error = 0; + + if(lib) { - 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 ); + 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 r; +#else + return 0; +#endif +};