Changeset edf72d39720caf76f89be3b4ffe739f1a89caff8 for gui/main.c

Timestamp:

04/05/10 14:06:18 (3 years ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

31900ca551bcb7feafcc024dba2405b559272501

Parents:

49812cd2198078e851d2a122b4d233f7e19d1583

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-04-05T14:06:18Z+0300

Message:

gui: menu item for controling raw jack graph display

Files:

• gui/main.c (modified) (5 diffs)

gui/main.c

@@ -74 +74 @@
 GtkWidget * g_xrun_progress_bar;
 
+graph_view_handle g_studio_view = NULL;
+
+bool g_jack_view_enabled = false;
 graph_view_handle g_jack_view = NULL;
-graph_view_handle g_studio_view = NULL;
 
 static guint g_jack_poll_source_tag;
@@ -974 +976 @@
 }
 
+static void update_raw_jack_visibility(void)
+{
+  /* if there is no jack view and its display is enabled and jack is avaialable, create the raw jack view */
+  if (g_jack_view == NULL && g_jack_view_enabled && g_jack_state != JACK_STATE_NA)
+  {
+    if (!create_view("Raw JACK", JACKDBUS_SERVICE_NAME, JACKDBUS_OBJECT_PATH, false, false, true, &g_jack_view))
+    {
+      log_error("create_view() failed for jack");
+      return;
+    }
+  }
+
+  /* if there is jack view and its display is disabled or it is enabled byt jack is not avaialable, destroy the raw jack view */
+  if (g_jack_view != NULL && (!g_jack_view_enabled || g_jack_state == JACK_STATE_NA))
+  {
+    destroy_view(g_jack_view);
+    g_jack_view = NULL;
+  }
+}
+
 void jack_appeared(void)
 {
@@ -980 +1002 @@
   g_jack_state = JACK_STATE_STOPPED;
   studio_state_changed(NULL);
-
-#if defined(SHOW_RAW_JACK)
-  if (!create_view("Raw JACK", JACKDBUS_SERVICE_NAME, JACKDBUS_OBJECT_PATH, false, false, true, &g_jack_view))
-  {
-    log_error("create_view() failed for jack");
-    return;
-  }
-#endif
+  update_raw_jack_visibility();
 }
 
@@ -998 +1013 @@
   g_jack_state = JACK_STATE_NA;
   studio_state_changed(NULL);
-
-#if defined(SHOW_RAW_JACK)
-  if (g_jack_view != NULL)
-  {
-    destroy_view(g_jack_view);
-    g_jack_view = NULL;
-  }
-#endif
+  update_raw_jack_visibility();
 }
 
@@ -1087 +1095 @@
 }
 
+void menu_request_toggle_raw_jack(bool visible)
+{
+  //log_info("toogle raw jack visibility -> %s", visible ? "visible" : "invisible");
+  g_jack_view_enabled = visible;
+  update_raw_jack_visibility();
+}
+
 static char * read_file_contents(const char * filename)
 {