X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fui.c;h=4be761f7cd9e9c0cfb31c90c8f2dd038a5d53b7b;hb=f8c05bd2d69d49990c1fe56fa4fd1517bdf82cf0;hp=53e0ed5ec91ae1f75f62d2fa749eb938cdaa8197;hpb=109541327bc3949fef357f8bbd75b2549c23e0de;p=omnplay

diff --git a/src/ui.c b/src/ui.c
index 53e0ed5..4be761f 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -99,7 +99,7 @@ static GtkWidget* pane_library_grid(GtkWidget* top, omnplay_instance_t* app)
         GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
     gtk_container_add (GTK_CONTAINER (scrolledwindow),
-        create_treeview(top, "treeview_library", columns));
+        app->library = create_treeview(top, "treeview_library", columns));
 
     return scrolledwindow;
 }
@@ -150,12 +150,71 @@ static GtkWidget* pane_library(GtkWidget* top, omnplay_instance_t* app)
 
 static GtkWidget* create_channel_status(GtkWidget* top, omnplay_instance_t* app, int idx)
 {
+    GtkWidget* vbox;
+    GtkWidget* hbox;
     GtkWidget* frame;
+    omnplay_player_t* player;
+
+    player = &app->players.item[idx];
 
-    frame = gtk_frame_new (app->players.item[idx].name);
-//    gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
+    frame = gtk_frame_new(player->name);
     gtk_widget_show(frame);
 
+    vbox = gtk_vbox_new(FALSE, 0);
+    gtk_container_add(GTK_CONTAINER(frame), vbox);
+    gtk_widget_show(vbox);
+
+    /* status label */
+    gtk_box_pack_start(GTK_BOX (vbox),
+        player->label_status = create_label(top, "OFFLINE", NULL, GTK_JUSTIFY_LEFT),
+            FALSE, FALSE, 0);
+
+    /* spacel label */
+    gtk_box_pack_start(GTK_BOX (vbox),
+        create_label(top, " ", NULL, GTK_JUSTIFY_CENTER),
+            FALSE, FALSE, 0);
+
+    /* clip label */
+    gtk_box_pack_start (GTK_BOX (vbox),
+        player->label_clip = create_label(top, "U0002323", NULL, GTK_JUSTIFY_LEFT),
+            FALSE, FALSE, 0);
+
+    /* block state/current timecode */
+    gtk_box_pack_start(GTK_BOX (vbox),
+        hbox = gtk_hbox_new(TRUE, 0),
+            FALSE, FALSE, 0);
+    gtk_widget_show(hbox);
+
+    {
+        /* clip state */
+        gtk_box_pack_start(GTK_BOX (hbox),
+            player->label_state = create_label(top, "PLAYING", NULL, GTK_JUSTIFY_LEFT),
+                TRUE, TRUE, 0);
+
+        /* current timecode */
+        gtk_box_pack_start(GTK_BOX (hbox),
+            player->label_tc_cur = create_label(top, "00:00:00:00", NULL, GTK_JUSTIFY_LEFT),
+                TRUE, TRUE, 0);
+    };
+
+    /* block remain label/remain timecode */
+    gtk_box_pack_start(GTK_BOX (vbox),
+        hbox = gtk_hbox_new(TRUE, 0),
+            FALSE, FALSE, 0);
+    gtk_widget_show (hbox);
+
+    {
+        /* label */
+        gtk_box_pack_start(GTK_BOX (hbox),
+            create_label(top, "remain:", NULL, GTK_JUSTIFY_LEFT),
+                TRUE, TRUE, 0);
+
+        /* remaining timecode */
+        gtk_box_pack_start(GTK_BOX (hbox),
+            player->label_tc_rem = create_label(top, "00:00:00:00", NULL, GTK_JUSTIFY_LEFT),
+                TRUE, TRUE, 0);
+    };
+
     return frame;
 }
 
@@ -259,7 +318,7 @@ static GtkWidget* pane_operate_grid(GtkWidget* top, omnplay_instance_t* app)
         GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
     gtk_container_add (GTK_CONTAINER (scrolledwindow),
-        create_treeview(top, "treeview_playlist", columns));
+        app->playlist = create_treeview(top, "treeview_playlist", columns));
 
     return scrolledwindow;
 }