X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fplaylist.c;h=fcc4b0b2227bddb136fd248b202a1263dd1b271d;hb=ee9061a5a0c2551a337d809c7040ec5790b10e0d;hp=d7a86dfada1883375af66dfd88868c2e8897be56;hpb=7c1a2200d9071274ad16364be58bf82574748dd9;p=melted_gui diff --git a/src/playlist.c b/src/playlist.c index d7a86df..fcc4b0b 100644 --- a/src/playlist.c +++ b/src/playlist.c @@ -87,12 +87,33 @@ static int load_file_ply(omnplay_instance_t* app, char* filename) case 4: items[count].type = OMNPLAY_PLAYLIST_ITEM_LOOP_END; break; case 6: items[count].type = OMNPLAY_PLAYLIST_ITEM_BLOCK_END; break; case 0: - if(!count || items[count - 1].type != OMNPLAY_PLAYLIST_ITEM_BLOCK_BODY) + if(!count) items[count].type = OMNPLAY_PLAYLIST_ITEM_BLOCK_BEGIN; - else + else if(items[count - 1].type == OMNPLAY_PLAYLIST_ITEM_BLOCK_BEGIN || + items[count - 1].type == OMNPLAY_PLAYLIST_ITEM_BLOCK_BODY) items[count].type = OMNPLAY_PLAYLIST_ITEM_BLOCK_BODY; + else + items[count].type = OMNPLAY_PLAYLIST_ITEM_BLOCK_BEGIN; break; }; +#if 0 + { + char* n; + switch(items[count].type) + { + case OMNPLAY_PLAYLIST_ITEM_BLOCK_BEGIN: n = "BLOCK_BEGIN"; break; + case OMNPLAY_PLAYLIST_ITEM_BLOCK_BODY: n = "BLOCK_BODY"; break; + case OMNPLAY_PLAYLIST_ITEM_BLOCK_END: n = "BLOCK_END"; break; + case OMNPLAY_PLAYLIST_ITEM_BLOCK_SINGLE: n = "BLOCK_SINGLE"; break; + case OMNPLAY_PLAYLIST_ITEM_LOOP_BEGIN: n = "LOOP_BEGIN"; break; + case OMNPLAY_PLAYLIST_ITEM_LOOP_BODY: n = "LOOP_BODY"; break; + case OMNPLAY_PLAYLIST_ITEM_LOOP_END: n = "LOOP_END"; break; + case OMNPLAY_PLAYLIST_ITEM_LOOP_SINGLE: n = "LOOP_SINGLE"; break; + }; + fprintf(stderr, "src=[%s]\ndst=[idx=%d,block=%s,block_id=%d,in=%d,out=%d]\n", + l, count, n, items[count].type, items[count].in, items[count].dur); + }; +#endif count++; } @@ -107,7 +128,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); } @@ -171,4 +195,120 @@ void omnplay_playlist_save(omnplay_instance_t* app) void omnplay_playlist_draw(omnplay_instance_t* app) { + int i; + char tc1[12], tc2[12]; + GtkListStore *list_store; + GtkTreeIter iter; + + list_store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(app->playlist_grid))); + gtk_list_store_clear(list_store); + + pthread_mutex_lock(&app->playlist.lock); + + for(i = 0;i < app->playlist.count; i++) + { + 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", + 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; + + 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]; + 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; + + gtk_list_store_set(item->list_store, iter, + 0, "", + 1, app->playlist.block_icons[app->playlist.item[i].type], + 2, (0 == app->playlist.item[i].player)?"A":"B", + 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); };