fix channel id display for multichannel conf

[omnplay] / src / playlist.c

diff --git a/src/playlist.c b/src/playlist.c
index 0644f7f..8edae98 100644 (file)
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -257,10 +257,13 @@ void omnplay_playlist_save(omnplay_instance_t* app)
 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);
 
@@ -268,12 +271,16 @@ 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),
@@ -286,6 +293,20 @@ void omnplay_playlist_draw(omnplay_instance_t* app)
 
     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);
 };