X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fui.c;h=c3d75d219290c541ddc24ccbd3fe602ea98d089b;hb=888b62e244add3b4b495427cd3e789b9e4dca70e;hp=ef4311f773149acf6a2cff037c37fe6a7a10dca4;hpb=1c89c188a41c41440a606b17b3baae58c0dbc793;p=melted_gui

diff --git a/src/ui.c b/src/ui.c
index ef4311f..c3d75d2 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -1,6 +1,6 @@
 /*
- * ui.c -- GTK+ 2 omnplay
- * Copyright (C) 2011 Maksym Veremeyenko <verem@m1stereo.tv>
+ * ui.c -- GTK+ 2 melted gui
+ * Copyright (C) 2012 Maksym Veremeyenko <verem@m1stereo.tv>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -192,7 +192,7 @@ static GtkWidget* create_treeview(GtkWidget* top, char* name, const column_desc_
     return treeview;
 };
 
-static GtkWidget* pane_library_grid(GtkWidget* top, omnplay_instance_t* app)
+static GtkWidget* pane_library_grid(GtkWidget* top, instance_t* app)
 {
     GtkWidget *scrolledwindow;
 
@@ -207,7 +207,7 @@ static GtkWidget* pane_library_grid(GtkWidget* top, omnplay_instance_t* app)
     return scrolledwindow;
 }
 
-static GtkWidget* pane_library_buttons(GtkWidget* top, omnplay_instance_t* app)
+static GtkWidget* pane_library_buttons(GtkWidget* top, instance_t* app)
 {
     GtkWidget* hbox;
 
@@ -230,7 +230,7 @@ static GtkWidget* pane_library_buttons(GtkWidget* top, omnplay_instance_t* app)
     return hbox;
 }
 
-static GtkWidget* pane_library_search_buttons(GtkWidget* top, omnplay_instance_t* app)
+static GtkWidget* pane_library_search_buttons(GtkWidget* top, instance_t* app)
 {
     GtkWidget* hbox;
 
@@ -254,7 +254,7 @@ static GtkWidget* pane_library_search_buttons(GtkWidget* top, omnplay_instance_t
     return hbox;
 }
 
-static GtkWidget* pane_library(GtkWidget* top, omnplay_instance_t* app)
+static GtkWidget* pane_library(GtkWidget* top, instance_t* app)
 {
     GtkWidget* vbox;
 
@@ -280,17 +280,17 @@ static GtkWidget* pane_library(GtkWidget* top, omnplay_instance_t* app)
     return vbox;
 }
 
-static GtkWidget* create_channel_status(GtkWidget* top, omnplay_instance_t* app, int idx)
+static GtkWidget* create_channel_status(GtkWidget* top, instance_t* app, int idx)
 {
     GtkWidget* vbox;
     GtkWidget* hbox;
     GtkWidget* frame;
     char name[PATH_MAX];
-    omnplay_player_t* player;
+    player_t* player;
 
     player = &app->players.item[idx];
 
-    snprintf(name, sizeof(name), "%c [%s]", idx + 'A', player->name);
+    snprintf(name, sizeof(name), "unit %d [%c]", player->unit, idx + 'A');
 
     frame = gtk_frame_new(name);
     gtk_widget_show(frame);
@@ -353,7 +353,7 @@ static GtkWidget* create_channel_status(GtkWidget* top, omnplay_instance_t* app,
     return frame;
 }
 
-static GtkWidget* pane_operate_status(GtkWidget* top, omnplay_instance_t* app)
+static GtkWidget* pane_operate_status(GtkWidget* top, instance_t* app)
 {
     int i;
     GtkWidget* vbox;
@@ -382,7 +382,7 @@ static GtkWidget* pane_operate_status(GtkWidget* top, omnplay_instance_t* app)
     return vbox;
 }
 
-static GtkWidget* pane_operate_buttons_playlist(GtkWidget* top, omnplay_instance_t* app)
+static GtkWidget* pane_operate_buttons_playlist(GtkWidget* top, instance_t* app)
 {
     GtkWidget* hbox;
 
@@ -452,7 +452,7 @@ static GtkWidget* pane_operate_buttons_playlist(GtkWidget* top, omnplay_instance
     return hbox;
 }
 
-static GtkWidget* pane_operate_grid(GtkWidget* top, omnplay_instance_t* app)
+static GtkWidget* pane_operate_grid(GtkWidget* top, instance_t* app)
 {
     GtkWidget *scrolledwindow;
 
@@ -467,7 +467,7 @@ static GtkWidget* pane_operate_grid(GtkWidget* top, omnplay_instance_t* app)
     return scrolledwindow;
 }
 
-static GtkWidget* pane_operate_buttons_operate(GtkWidget* top, omnplay_instance_t* app)
+static GtkWidget* pane_operate_buttons_operate(GtkWidget* top, instance_t* app)
 {
     GtkWidget* hbox;
 
@@ -501,7 +501,7 @@ static GtkWidget* pane_operate_buttons_operate(GtkWidget* top, omnplay_instance_
     return hbox;
 }
 
-static GtkWidget* pane_operate_operate(GtkWidget* top, omnplay_instance_t* app)
+static GtkWidget* pane_operate_operate(GtkWidget* top, instance_t* app)
 {
     GtkWidget* vbox;
 
@@ -527,7 +527,7 @@ static GtkWidget* pane_operate_operate(GtkWidget* top, omnplay_instance_t* app)
 
 }
 
-static GtkWidget* pane_operate(GtkWidget* top, omnplay_instance_t* app)
+static GtkWidget* pane_operate(GtkWidget* top, instance_t* app)
 {
     GtkWidget* hbox;
 
@@ -548,7 +548,7 @@ static GtkWidget* pane_operate(GtkWidget* top, omnplay_instance_t* app)
 
 };
 
-static GtkWidget* pane_top(GtkWidget* top, omnplay_instance_t* app)
+static GtkWidget* pane_top(GtkWidget* top, instance_t* app)
 {
     GtkWidget* pane;
 
@@ -568,15 +568,15 @@ static GtkWidget* pane_top(GtkWidget* top, omnplay_instance_t* app)
     return pane;
 }
 
-GtkWidget* ui_omnplay (omnplay_instance_t* app)
+GtkWidget* ui_create(instance_t* app)
 {
     GtkWidget *wnd;
     GtkWidget* vbox;
 
     wnd = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-    GLADE_HOOKUP_OBJECT_NO_REF (wnd, wnd, "omnplay_window");
+    GLADE_HOOKUP_OBJECT_NO_REF (wnd, wnd, PACKAGE "_window");
 
-    gtk_window_set_title (GTK_WINDOW (wnd), _("Omneon Player"));
+    gtk_window_set_title (GTK_WINDOW (wnd), _(PRODUCT_NAME));
     gtk_window_set_default_size (GTK_WINDOW (wnd), 1024, 768);
 
     vbox = gtk_vbox_new(FALSE, 0);
@@ -588,30 +588,30 @@ GtkWidget* ui_omnplay (omnplay_instance_t* app)
         pane_top(wnd, app),
         TRUE, TRUE, 0);
     gtk_box_pack_start (GTK_BOX (vbox),
-        app->status_label = create_label(wnd, "omnplay started", NULL, GTK_JUSTIFY_LEFT),
+        app->status_label = create_label(wnd, "started", NULL, GTK_JUSTIFY_LEFT),
         FALSE, FALSE, 0);
 
-    app->playlist.block_icons[OMNPLAY_PLAYLIST_ITEM_BLOCK_BEGIN] =
+    app->playlist.block_icons[PLAYLIST_ITEM_BLOCK_BEGIN] =
         create_pixbuf("block_type_block_start_16x16.png");
-    app->playlist.block_icons[OMNPLAY_PLAYLIST_ITEM_BLOCK_BODY] =
+    app->playlist.block_icons[PLAYLIST_ITEM_BLOCK_BODY] =
         create_pixbuf("block_type_block_middle_16x16.png");
-    app->playlist.block_icons[OMNPLAY_PLAYLIST_ITEM_BLOCK_END] =
+    app->playlist.block_icons[PLAYLIST_ITEM_BLOCK_END] =
         create_pixbuf("block_type_block_end_16x16.png");
-    app->playlist.block_icons[OMNPLAY_PLAYLIST_ITEM_BLOCK_SINGLE] =
+    app->playlist.block_icons[PLAYLIST_ITEM_BLOCK_SINGLE] =
         create_pixbuf("block_type_block_single_16x16.png");
-    app->playlist.block_icons[OMNPLAY_PLAYLIST_ITEM_LOOP_BEGIN] =
+    app->playlist.block_icons[PLAYLIST_ITEM_LOOP_BEGIN] =
         create_pixbuf("block_type_loop_start_16x16.png");
-    app->playlist.block_icons[OMNPLAY_PLAYLIST_ITEM_LOOP_BODY] =
+    app->playlist.block_icons[PLAYLIST_ITEM_LOOP_BODY] =
         create_pixbuf("block_type_loop_middle_16x16.png");
-    app->playlist.block_icons[OMNPLAY_PLAYLIST_ITEM_LOOP_END] =
+    app->playlist.block_icons[PLAYLIST_ITEM_LOOP_END] =
         create_pixbuf("block_type_loop_end_16x16.png");
-    app->playlist.block_icons[OMNPLAY_PLAYLIST_ITEM_LOOP_SINGLE] =
+    app->playlist.block_icons[PLAYLIST_ITEM_LOOP_SINGLE] =
         create_pixbuf("block_type_block_loop_16x16.png");
 
     return wnd;
 }
 
-int ui_playlist_item_dialog(omnplay_instance_t* app, playlist_item_t* item)
+int ui_playlist_item_dialog(instance_t* app, playlist_item_t* item)
 {
     int r, c;
     char tc[32];