fix display channel in omnplay_playlist_draw_item_proc
[omnplay] / src / playlist.c
index aec310d..59af44e 100644 (file)
@@ -271,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),
@@ -297,6 +301,7 @@ void omnplay_playlist_draw(omnplay_instance_t* app)
         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);
@@ -317,6 +322,7 @@ static gboolean omnplay_playlist_draw_item_proc(
 {
     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;
 
@@ -324,10 +330,12 @@ static gboolean omnplay_playlist_draw_item_proc(
 
     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, (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),