X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fplaylist.c;h=fcc4b0b2227bddb136fd248b202a1263dd1b271d;hb=ee9061a5a0c2551a337d809c7040ec5790b10e0d;hp=9c095a4973c22cdaa4911644937b1c0430431a37;hpb=35dcbc1fa07c07c670ea7a242fdbc55d0becce15;p=melted_gui diff --git a/src/playlist.c b/src/playlist.c index 9c095a4..fcc4b0b 100644 --- a/src/playlist.c +++ b/src/playlist.c @@ -128,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); } @@ -215,6 +218,8 @@ void omnplay_playlist_draw(omnplay_instance_t* app) 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 ); } @@ -251,6 +256,8 @@ static gboolean omnplay_playlist_draw_item_proc( 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; @@ -272,3 +279,36 @@ void omnplay_playlist_draw_item(omnplay_instance_t* app, int idx) 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); +};