X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Flibrary.c;h=ce0c181e6eb687fc219ba9857509bad69ddea76b;hb=3d15fd27ad9b8265a0f7c8d034d1180f3241306a;hp=ff7307bf8ace98dc3783b84e33b8ff63a63a6c0d;hpb=a12bc94bf9e1527448c8407c66ff6272212b2455;p=omnplay diff --git a/src/library.c b/src/library.c index ff7307b..ce0c181 100644 --- a/src/library.c +++ b/src/library.c @@ -21,12 +21,17 @@ # include #endif +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif + #include #include #include #include #include #include +#include #include "omnplay.h" #include "ui.h" @@ -52,28 +57,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->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 + { + 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 { @@ -123,7 +168,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; @@ -153,7 +198,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); @@ -166,6 +213,8 @@ 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; }; @@ -201,8 +250,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); }; }; @@ -219,10 +268,9 @@ 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(app->library.refresh_ui[1]), 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) @@ -231,20 +279,26 @@ static void* omnplay_library_refresh_proc(void* data) int count, i; playlist_item_t* items; + gdk_threads_enter(); + gtk_widget_set_sensitive(app->window, FALSE); + gdk_flush(); + gdk_threads_leave(); + + 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, NULL); if(count > 0) { - gdk_threads_enter(); - gtk_label_set_text(GTK_LABEL(app->library.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++) @@ -262,28 +316,33 @@ static void* omnplay_library_refresh_proc(void* data) gdk_threads_leave(); }; + omnplay_set_status(app, "Normalizing playlist..."); + free(items); gdk_threads_enter(); omnplay_playlist_normalize(app); - gtk_widget_destroy(app->library.refresh_ui[0]); gdk_flush(); gdk_threads_leave(); + omnplay_set_status(app, ""); + + gdk_threads_enter(); + gtk_widget_set_sensitive(app->window, TRUE); + gdk_flush(); + gdk_threads_leave(); + + return NULL; }; void omnplay_library_refresh(omnplay_instance_t* app) { - if(app->library.refresh_ui[0]) - pthread_join(app->library.refresh_thread, NULL); - - /* create UI for monitoring update */ - ui_library_refresh(app, &app->library.refresh_ui[0], &app->library.refresh_ui[1]); - - pthread_create(&app->library.refresh_thread, NULL, - omnplay_library_refresh_proc, app); + if(app->library.refresh_thread) + g_thread_join(app->library.refresh_thread); + app->library.refresh_thread = g_thread_create( + omnplay_library_refresh_proc, app, TRUE, NULL); }; void omnplay_library_draw(omnplay_instance_t* app) @@ -383,3 +442,44 @@ playlist_item_t* omnplay_library_get_selected(omnplay_instance_t* app, int *coun return items; }; + +void omnplay_library_search(omnplay_instance_t* app, int next) +{ + int idx = 0, i; + int* idxs; + const char *search; + GtkTreePath* path; + + pthread_mutex_lock(&app->library.lock); + + idxs = get_selected_idx_library(app); + if(idxs) idx = idxs[1]; + free(idxs); + + if(!next) idx = 0; + else idx++; + + search = gtk_entry_get_text(GTK_ENTRY(app->library.search)); + + if(search[0]) + { + for(i = idx; i < app->library.count; i++) + if( strcasestr(app->library.item[i].id, search) || + strcasestr(app->library.item[i].title, search)) + break; + + if(i < app->library.count) + { + g_warning("found at pos=%d\n", i); + + /* select */ + path = gtk_tree_path_new_from_indices(i, -1); + gtk_tree_selection_select_path(gtk_tree_view_get_selection( + GTK_TREE_VIEW(app->library_grid)), path); + gtk_tree_view_set_cursor(GTK_TREE_VIEW(app->library_grid), path, NULL, FALSE); + gtk_tree_path_free(path); + }; + }; + + pthread_mutex_unlock(&app->library.lock); +};