Changeset 97f4150664c833e181971788d8f58962f4b5e66d

Timestamp:

02/20/10 03:09:37 (5 months ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

44cdd3164cb959ab9418ac310b52388d8cc96ca7

Parents:

0f5da82ae8555ee792aae824333798de930e1f68

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-02-20T03:09:37Z+0200

Message:

gui: move rest the status widgets to statusbar

Location:

gui

Files:

• gladish.ui (modified) (3 diffs)
• main.c (modified) (11 diffs)

gui/gladish.ui

@@ -388 +388 @@
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
+                <property name="label" translatable="yes">Clear XRuns</property>
                 <property name="stock_id">gtk-clear</property>
               </object>
@@ -396 +397 @@
             </child>
             <child>
-              <object class="GtkToolItem" id="toolitem30">
-                <property name="visible">True</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment3">
-                    <property name="visible">True</property>
-                    <property name="yscale">0</property>
-                    <child>
-                      <object class="GtkProgressBar" id="xrun_progress_bar">
-                        <property name="visible">True</property>
-                        <property name="pulse_step">0.10000000149</property>
-                        <property name="text" translatable="yes">Stopped</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSeparatorToolItem" id="toolbutton1">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToolItem" id="toolitem_studio">
-                <property name="visible">True</property>
-                <property name="border_width">1</property>
-                <child>
-                  <object class="GtkViewport" id="viewport1">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="resize_mode">queue</property>
-                    <child>
-                      <object class="GtkLabel" id="studio_status_label">
-                        <property name="width_request">150</property>
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">No studio loaded</property>
-                        <property name="use_markup">True</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSeparatorToolItem" id="toolbutton4">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-            <child>
               <object class="GtkToolButton" id="zoom_normal_but">
                 <property name="visible">True</property>
@@ -475 +412 @@
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="stock_id">gtk-zoom-fit</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSeparatorToolItem" id="separatortoolitem1">
-                <property name="visible">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToolItem" id="startstop_item">
-                <property name="visible">True</property>
-                <child>
-                  <object class="GtkImage" id="startstop">
-                    <property name="visible">True</property>
-                    <property name="stock">gtk-dialog-warning</property>
-                  </object>
-                </child>
               </object>
               <packing>

gui/main.c

@@ -54 +54 @@
 
 GtkWidget * g_clear_load_button;
-GtkWidget * g_xrun_progress_bar;
 GtkStatusbar * g_statusbar;
 
@@ -83 +82 @@
 GtkWidget * g_menu_item_start_app;
 GtkWidget * g_status_image;
-GtkWidget * g_status_tool_item;
 
 GtkWidget * g_name_dialog;
@@ -92 +90 @@
 
 GtkWidget * g_latency_label;
+GtkWidget * g_dsp_load_label;
+GtkWidget * g_xruns_label;
 
 graph_view_handle g_jack_view = NULL;
@@ -226 +226 @@
     {
       char buf[100];
-      snprintf(buf, sizeof(buf), "Latency: %4.1f ms (%"PRIu32")", (float)size / (float)g_sample_rate * 1000.0f, size);
+      snprintf(buf, sizeof(buf), "%4.1f ms (%"PRIu32")", (float)size / (float)g_sample_rate * 1000.0f, size);
       gtk_label_set_text(GTK_LABEL(g_latency_label), buf);
     }
@@ -276 +276 @@
   char tmp_buf[100];
 
-  if (!jack_proxy_get_xruns(&xruns) || !jack_proxy_get_dsp_load(&load))
-  {
-    gtk_progress_bar_set_text(GTK_PROGRESS_BAR(g_xrun_progress_bar), "error");
-    gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(g_xrun_progress_bar), 0.0);
-  }
-
-  snprintf(tmp_buf, sizeof(tmp_buf), "%" PRIu32 " Dropouts", xruns);
-  gtk_progress_bar_set_text(GTK_PROGRESS_BAR(g_xrun_progress_bar), tmp_buf);
-
-  load /= 100.0;           // dbus returns it in percents, we use 0..1
-
-  if (load > g_jack_max_dsp_load)
-  {
-    g_jack_max_dsp_load = load;
-    gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(g_xrun_progress_bar), load);
+  if (jack_proxy_get_xruns(&xruns))
+  {
+    snprintf(tmp_buf, sizeof(tmp_buf), "%" PRIu32 " dropouts", xruns);
+    gtk_label_set_text(GTK_LABEL(g_xruns_label), tmp_buf);
+  }
+  else
+  {
+    gtk_label_set_text(GTK_LABEL(g_xruns_label), "?");
+  }
+
+  if (jack_proxy_get_dsp_load(&load))
+  {
+    if (load > g_jack_max_dsp_load)
+    {
+      g_jack_max_dsp_load = load;
+    }
+
+    snprintf(tmp_buf, sizeof(tmp_buf), "DSP: %5.1f%% (%5.1f%%)", (float)load, (float)g_jack_max_dsp_load);
+    gtk_label_set_text(GTK_LABEL(g_dsp_load_label), tmp_buf);
+  }
+  else
+  {
+    gtk_label_set_text(GTK_LABEL(g_xruns_label), "?");
   }
 }
@@ -298 +306 @@
   jack_proxy_reset_xruns();
   g_jack_max_dsp_load = 0.0;
-  gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(g_xrun_progress_bar), 0.0);
 }
 
@@ -746 +753 @@
   }
 
-  gtk_progress_bar_set_text(GTK_PROGRESS_BAR(g_xrun_progress_bar), status);
+  //gtk_progress_bar_set_text(GTK_PROGRESS_BAR(g_xrun_progress_bar), status);
   gtk_label_set_text(GTK_LABEL(g_studio_status_label), name);
 
+  log_error("status icon stock id: %s", stock_id);
   gtk_image_set_from_stock(GTK_IMAGE(g_status_image), stock_id, GTK_ICON_SIZE_SMALL_TOOLBAR);
-  gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(g_status_tool_item), tooltip);
-
-  if (g_jack_state == JACK_STATE_STARTED && jack_proxy_sample_rate(&g_sample_rate))
-  {
-    char buf[100];
-
-    if (fmod(g_sample_rate, 1000.0) != 0.0)
-    {
-      snprintf(buf, sizeof(buf), "Sample rate: %.1f kHz", (float)g_sample_rate / 1000.0f);
+  //gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(g_status_tool_item), tooltip);
+
+  if (g_jack_state == JACK_STATE_STARTED)
+  {
+    if (jack_proxy_sample_rate(&g_sample_rate))
+    {
+      char buf[100];
+
+      if (fmod(g_sample_rate, 1000.0) != 0.0)
+      {
+        snprintf(buf, sizeof(buf), "%.1f kHz", (float)g_sample_rate / 1000.0f);
+      }
+      else
+      {
+        snprintf(buf, sizeof(buf), "%u kHz", g_sample_rate / 1000);
+      }
+
+      gtk_label_set_text(GTK_LABEL(g_sample_rate_label), buf);
     }
     else
     {
-      snprintf(buf, sizeof(buf), "Sample rate: %u kHz", g_sample_rate / 1000);
-    }
-
-    gtk_label_set_text(GTK_LABEL(g_sample_rate_label), buf);
+      gtk_label_set_text(GTK_LABEL(g_sample_rate_label), "");
+    }
   }
   else
   {
-    gtk_label_set_text(GTK_LABEL(g_sample_rate_label), "");
+    gtk_label_set_text(GTK_LABEL(g_sample_rate_label), g_jack_state == JACK_STATE_NA ? "JACK is sick" : "JACK is stopped");
+    gtk_label_set_text(GTK_LABEL(g_latency_label), "");
+    gtk_label_set_text(GTK_LABEL(g_dsp_load_label), "");
+    gtk_label_set_text(GTK_LABEL(g_xruns_label), "");
   }
 
@@ -937 +955 @@
   buffer_size_clear();
   gtk_widget_set_sensitive(g_clear_load_button, false);
-  gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(g_xrun_progress_bar), 0.0);
 }
 
@@ -1146 +1163 @@
   g_main_win = get_gtk_builder_widget("main_win");
   g_clear_load_button = get_gtk_builder_widget("clear_load_button");
-  g_xrun_progress_bar = get_gtk_builder_widget("xrun_progress_bar");
   g_menu_item_new_studio = get_gtk_builder_widget("menu_item_new_studio");
   g_menu_item_start_app = get_gtk_builder_widget("menu_item_start_app");
@@ -1160 +1176 @@
   g_menu_item_daemon_exit = get_gtk_builder_widget("menu_item_daemon_exit");
   g_menu_item_jack_configure = get_gtk_builder_widget("menu_item_jack_configure");
-  g_studio_status_label = get_gtk_builder_widget("studio_status_label");
   g_menu_item_view_toolbar = get_gtk_builder_widget("menu_item_view_toolbar");
   g_toolbar = get_gtk_builder_widget("toolbar");
-  g_status_image = get_gtk_builder_widget("startstop");
-  g_status_tool_item = get_gtk_builder_widget("startstop_item");
   g_statusbar = GTK_STATUSBAR(get_gtk_builder_widget("statusbar"));
 
@@ -1183 +1196 @@
   g_menu_item_jack_latency_8192 = GTK_CHECK_MENU_ITEM(get_gtk_builder_widget("menu_item_jack_latency_8192"));
 
+  g_studio_status_label = gtk_label_new("studioname");
+  gtk_widget_show(g_studio_status_label);
+  gtk_box_pack_start(GTK_BOX(g_statusbar), g_studio_status_label, FALSE, TRUE, 10);
+  gtk_box_reorder_child(GTK_BOX(g_statusbar), g_studio_status_label, 0);
+
+  g_status_image = gtk_image_new();
+  gtk_widget_show(g_status_image);
+  gtk_box_pack_start(GTK_BOX(g_statusbar), g_status_image, FALSE, TRUE, 10);
+  gtk_box_reorder_child(GTK_BOX(g_statusbar), g_status_image, 1);
+
   g_sample_rate_label = gtk_label_new("srate");
   gtk_widget_show(g_sample_rate_label);
   gtk_box_pack_start(GTK_BOX(g_statusbar), g_sample_rate_label, FALSE, TRUE, 10);
-  gtk_box_reorder_child(GTK_BOX(g_statusbar), g_sample_rate_label, 0);
+  gtk_box_reorder_child(GTK_BOX(g_statusbar), g_sample_rate_label, 2);
 
   g_latency_label = gtk_label_new("latency");
   gtk_widget_show(g_latency_label);
   gtk_box_pack_start(GTK_BOX(g_statusbar), g_latency_label, FALSE, TRUE, 10);
-  gtk_box_reorder_child(GTK_BOX(g_statusbar), g_latency_label, 1);
+  gtk_box_reorder_child(GTK_BOX(g_statusbar), g_latency_label, 3);
+
+  g_xruns_label = gtk_label_new("xruns");
+  gtk_widget_show(g_xruns_label);
+  gtk_box_pack_start(GTK_BOX(g_statusbar), g_xruns_label, FALSE, TRUE, 10);
+  gtk_box_reorder_child(GTK_BOX(g_statusbar), g_xruns_label, 4);
+
+  g_dsp_load_label = gtk_label_new("load");
+  gtk_widget_show(g_dsp_load_label);
+  gtk_box_pack_start(GTK_BOX(g_statusbar), g_dsp_load_label, FALSE, TRUE, 10);
+  gtk_box_reorder_child(GTK_BOX(g_statusbar), g_dsp_load_label, 5);
 
   buffer_size_clear();