Changeset 0f5da82ae8555ee792aae824333798de930e1f68

Timestamp:

02/20/10 01:52:49 (3 years ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

97f4150664c833e181971788d8f58962f4b5e66d

Parents:

42429315c5e0fc08b65a7fd8c942ec869de639ae

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-02-20T01:52:49Z+0200

Message:

sample rate and latency display in statusbar

Location:

gui

Files:

• gladish.ui (modified) (1 diff)
• main.c (modified) (12 diffs)

gui/gladish.ui

@@ -385 +385 @@
             <property name="icon_size_set">True</property>
             <child>
-              <object class="GtkToolItem" id="toolitem28">
-                <property name="visible">True</property>
-                <property name="visible_vertical">False</property>
-                <child>
-                  <object class="GtkHBox" id="hbox4">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkLabel" id="sample_rate_label">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">48</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="padding">1</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label9">
-                        <property name="visible">True</property>
-                        <property name="xpad">1</property>
-                        <property name="label" translatable="yes">kHz</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSeparatorToolItem" id="separatortoolitem3">
-                <property name="visible">True</property>
-                <property name="border_width">8</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-            <child>
               <object class="GtkToolButton" id="clear_load_button">
                 <property name="visible">True</property>

gui/main.c

@@ -55 +55 @@
 GtkWidget * g_clear_load_button;
 GtkWidget * g_xrun_progress_bar;
+GtkStatusbar * g_statusbar;
 
 GtkWidget * g_menu_item_new_studio;
@@ -87 +88 @@
 GtkWidget * g_app_dialog;
 
+GtkWidget * g_sample_rate_label;
+uint32_t g_sample_rate;
+
+GtkWidget * g_latency_label;
+
 graph_view_handle g_jack_view = NULL;
 graph_view_handle g_studio_view = NULL;
@@ -167 +173 @@
 {
   set_latency_items_sensivity(false);
+  gtk_label_set_text(GTK_LABEL(g_latency_label), "");
 }
 
 static bool latency_changing = false;
 
-static void buffer_size_set(uint32_t size)
+static void buffer_size_set(uint32_t size, bool force)
 {
   GtkCheckMenuItem * item_ptr;
@@ -210 +217 @@
   }
 
-  if (!item_ptr->active)
+  if (force || !item_ptr->active)
   {
     log_info("JACK latency changed: %"PRIu32" samples", size);
@@ -216 +223 @@
     gtk_check_menu_item_set_active(item_ptr, TRUE);
     latency_changing = false;
+
+    {
+      char buf[100];
+      snprintf(buf, sizeof(buf), "Latency: %4.1f ms (%"PRIu32")", (float)size / (float)g_sample_rate * 1000.0f, size);
+      gtk_label_set_text(GTK_LABEL(g_latency_label), buf);
+    }
   }
 }
@@ -243 +256 @@
 }
 
-static void update_buffer_size(void)
+static void update_buffer_size(bool force)
 {
   uint32_t size;
@@ -249 +262 @@
   if (jack_proxy_get_buffer_size(&size))
   {
-    buffer_size_set(size);
+    buffer_size_set(size, force);
   }
   else
@@ -632 +645 @@
 {
   update_load();
-  update_buffer_size();
+  update_buffer_size(false);
 
   return TRUE;
@@ -739 +752 @@
   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);
+    }
+    else
+    {
+      snprintf(buf, sizeof(buf), "Sample rate: %u kHz", g_sample_rate / 1000);
+    }
+
+    gtk_label_set_text(GTK_LABEL(g_sample_rate_label), buf);
+  }
+  else
+  {
+    gtk_label_set_text(GTK_LABEL(g_sample_rate_label), "");
+  }
+
   if (buffer == NULL)
   {
@@ -883 +916 @@
 
   set_latency_items_sensivity(true);
+  update_buffer_size(true);
   gtk_widget_set_sensitive(g_clear_load_button, true);
 
@@ -1131 +1165 @@
   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"));
 
   g_name_dialog = get_gtk_builder_widget("name_dialog");
@@ -1147 +1182 @@
   g_menu_item_jack_latency_4096 = GTK_CHECK_MENU_ITEM(get_gtk_builder_widget("menu_item_jack_latency_4096"));
   g_menu_item_jack_latency_8192 = GTK_CHECK_MENU_ITEM(get_gtk_builder_widget("menu_item_jack_latency_8192"));
+
+  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);
+
+  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);
 
   buffer_size_clear();