X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fplaylist.c;h=59af44ed99f158490d65c79786e51b7c0d08be44;hb=2f6977742c11282474158a3e7bc27a7ecae5c0d0;hp=ffe75243d10416d2e1baf985ff5cd8b4e14b704b;hpb=386a21c04d1086d643ae1b23e5e7cfd92b15b3e7;p=omnplay diff --git a/src/playlist.c b/src/playlist.c index ffe7524..59af44e 100644 --- a/src/playlist.c +++ b/src/playlist.c @@ -74,12 +74,13 @@ static int load_file_ply(omnplay_instance_t* app, char* filename) if (6 != sscanf(l, "%128[^,],%128[^,],%128[^,],%128[^,],%128[^,],%128[^,],%s", ID, CH, B, IN, OUT, DUR, REST)) { + int b = atol(B); /* setup item */ tc2frames(IN, 25.0, &items[count].in); tc2frames(DUR, 25.0, &items[count].dur); strncpy(items[count].id, ID, PATH_MAX); items[count].player = atol(CH) - 1; - switch(atol(B)) + switch(b) { case 1: items[count].type = OMNPLAY_PLAYLIST_ITEM_BLOCK_SINGLE; break; case 2: items[count].type = OMNPLAY_PLAYLIST_ITEM_LOOP_BEGIN; break; @@ -95,6 +96,9 @@ static int load_file_ply(omnplay_instance_t* app, char* filename) else items[count].type = OMNPLAY_PLAYLIST_ITEM_BLOCK_BEGIN; break; + default: + if(b >= 1024) + items[count].type = b - 1024; }; #if 0 { @@ -128,7 +132,10 @@ static int load_file_ply(omnplay_instance_t* app, char* filename) { pthread_mutex_lock(&app->playlist.lock); for(i = 0; i < count && app->playlist.count + 1 < MAX_PLAYLIST_ITEMS; i++) + { + omnplay_library_normalize_item(app, &items[i]); app->playlist.item[app->playlist.count++] = items[i]; + }; app->playlist.ver_curr++; pthread_mutex_unlock(&app->playlist.lock); } @@ -186,17 +193,77 @@ void omnplay_playlist_load(omnplay_instance_t* app) gtk_widget_destroy (dialog); }; +static int save_file_ply(omnplay_instance_t* app, char* filename) +{ + int i; + FILE* f; + char tc1[12], tc2[12], tc3[12]; + + if((f = fopen(filename, "wt"))) + { + for(i = 0; i < app->playlist.count; i++) + fprintf(f, "%s,%d,%d,%s,%s,%s,,,,,,,,\n", + app->playlist.item[i].id, + app->playlist.item[i].player + 1, + app->playlist.item[i].type + 1024, + frames2tc(app->playlist.item[i].in, 25.0, tc1), + frames2tc(app->playlist.item[i].in + app->playlist.item[i].dur, 25.0, tc2), + frames2tc(app->playlist.item[i].dur, 25.0, tc3)); + }; + + return 0; +}; + void omnplay_playlist_save(omnplay_instance_t* app) { + int r; + GtkWidget *dialog; + + dialog = gtk_file_chooser_dialog_new("Save File", + GTK_WINDOW (app->window), + GTK_FILE_CHOOSER_ACTION_SAVE, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, + NULL); + + gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog), TRUE); + + gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), + (app->playlist.path)?app->playlist.path:getenv("HOME")); + + r = gtk_dialog_run(GTK_DIALOG(dialog)); + + if(r == GTK_RESPONSE_ACCEPT) + { + char *filename; + + filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); + + r = save_file_ply(app, filename); + + if(app->playlist.path) + g_free(app->playlist.path); + if((app->playlist.path = filename)) + { + char* e = strrchr(app->playlist.path, '/'); + if(e) *e = 0; + } + } + + gtk_widget_destroy (dialog); + }; void omnplay_playlist_draw(omnplay_instance_t* app) { int i; + int* sels; char tc1[12], tc2[12]; GtkListStore *list_store; GtkTreeIter iter; + sels = omnplay_selected_idxs_playlist(app); + list_store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(app->playlist_grid))); gtk_list_store_clear(list_store); @@ -204,25 +271,129 @@ void omnplay_playlist_draw(omnplay_instance_t* app) for(i = 0;i < app->playlist.count; i++) { + char ch[3]; + + snprintf(ch, sizeof(ch), "%c", 'A' + app->playlist.item[i].player); + gtk_list_store_append(list_store, &iter); gtk_list_store_set(list_store, &iter, 0, "", 1, app->playlist.block_icons[app->playlist.item[i].type], - 2, (0 == app->playlist.item[i].player)?"A":"B", + 2, ch, 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, + 8, (app->playlist.item[i].error != 0), + 9, (app->playlist.item[i].error & PLAYLIST_ITEM_ERROR_LIB)?"red":"orange", -1 ); } app->playlist.ver_prev = app->playlist.ver_curr; + if(sels) + { + GtkTreePath *path; + + /* select */ + path = gtk_tree_path_new_from_indices(sels[1], -1); + gtk_tree_selection_select_path(gtk_tree_view_get_selection(GTK_TREE_VIEW(app->playlist_grid)), path); + gtk_tree_view_set_cursor(GTK_TREE_VIEW(app->playlist_grid), path, NULL, FALSE); + gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(app->playlist_grid), path, NULL, FALSE, 0, 0); + gtk_tree_path_free(path); + + free(sels); + }; + 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]; + char ch[3]; + 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; + + snprintf(ch, sizeof(ch), "%c", 'A' + app->playlist.item[i].player); + + gtk_list_store_set(item->list_store, iter, + 0, "", + 1, app->playlist.block_icons[app->playlist.item[i].type], + 2, ch, + 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, + 8, (app->playlist.item[i].error != 0), + 9, (app->playlist.item[i].error & PLAYLIST_ITEM_ERROR_LIB)?"red":"orange", + -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); };