Changeset e85a6e96fec941da0083a18e4c21c46ccc577eea

Timestamp:

12/19/11 00:16:51 (17 months ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

ac5a278f109f407b0022155417560ee48a462bdc

Parents:

d66d57ae8a9669bb821254e3956579bd9b9bc533

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2011-12-19T00:16:51Z+0200

Message:

setting for jack conf tool

Files:

• dbus_constants.h (modified) (1 diff)
• gui/gladish.ui (modified) (2 diffs)
• gui/jack.c (modified) (3 diffs)
• gui/main.c (modified) (1 diff)
• gui/settings.c (modified) (7 diffs)

dbus_constants.h

@@ -95 +95 @@
 #define LADISH_DBUS_ERROR_KEY_NOT_FOUND       DBUS_NAME_BASE ".Error.KeyNotFound"
 
+#define LADISH_CONF_KEY_JACK_CONF_TOOL            "/org/ladish/jack_conf_tool"
+#define LADISH_CONF_KEY_JACK_CONF_TOOL_DEFAULT    "ladiconf"
+
 #endif /* #ifndef DBUS_CONSTANTS_H__C21DE0EE_C19C_42F0_8D63_D613E4806C0E__INCLUDED */

gui/gladish.ui

@@ -1742 +1742 @@
                 <property name="column_spacing">5</property>
                 <property name="n_columns">2</property>
-                <property name="n_rows">3</property>
+                <property name="n_rows">4</property>
                 <property name="row_spacing">5</property>
                 <property name="visible">True</property>
@@ -1812 +1812 @@
                     <property name="right_attach">2</property>
                     <property name="top_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="settings_jack_conf_tool_label">
+                    <property name="label" translatable="yes">JACK conf tool:</property>
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="bottom_attach">4</property>
+                    <property name="top_attach">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="settings_jack_conf_tool_entry">
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">&#x25CF;</property>
+                    <property name="visible">True</property>
+                  </object>
+                  <packing>
+                    <property name="bottom_attach">4</property>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">3</property>
                   </packing>
                 </child>

gui/jack.c

@@ -35 +35 @@
 #include "../proxies/jack_proxy.h"
 #include "../proxies/a2j_proxy.h"
+#include "../proxies/conf_proxy.h"
 #include "gtk_builder.h"
 #include "ask_dialog.h"
@@ -283 +284 @@
 {
   GError * error_ptr;
-  gchar * argv[] = {"ladiconf", NULL};
+  gchar * argv[] = {NULL, NULL};
   GtkWidget * dialog;
+  const char * jack_conf_tool;
 
   log_info("JACK configure request");
+
+  if (!conf_get(LADISH_CONF_KEY_JACK_CONF_TOOL, &jack_conf_tool))
+  {
+    jack_conf_tool = LADISH_CONF_KEY_JACK_CONF_TOOL_DEFAULT;
+  }
+
+  argv[0] = (gchar *)jack_conf_tool;
 
   error_ptr = NULL;
@@ -300 +309 @@
   {
     dialog = get_gtk_builder_widget("error_dialog");
-    gtk_message_dialog_set_markup(GTK_MESSAGE_DIALOG(dialog), _("<b><big>Error executing ladiconf.\nAre LADI Tools installed?</big></b>"));
+    gtk_message_dialog_set_markup(GTK_MESSAGE_DIALOG(dialog), _("<b><big>Error executing JACK configuration tool.\n</big></b>"));
     gtk_message_dialog_format_secondary_markup(GTK_MESSAGE_DIALOG(dialog), "%s", error_ptr->message);
     gtk_widget_show(dialog);

gui/main.c

@@ -167 +167 @@
   }
 
+  if (!conf_register(LADISH_CONF_KEY_JACK_CONF_TOOL, NULL, NULL))
+  {
+    return 1;
+  }
+
   if (!init_jack())
   {

gui/settings.c

@@ -39 +39 @@
   GtkEntry * terminal_entry;
   GtkSpinButton * js_delay_spin;
+  GtkEntry * jack_conf_tool_entry;
   bool autostart;
   bool notify;
@@ -44 +45 @@
   const char * terminal;
   unsigned int js_delay;
+  const char * jack_conf_tool;
 
   autostart_studio_button = GTK_TOGGLE_BUTTON(get_gtk_builder_widget("settings_studio_autostart_checkbutton"));
@@ -50 +52 @@
   terminal_entry = GTK_ENTRY(get_gtk_builder_widget("settings_terminal_entry"));
   js_delay_spin = GTK_SPIN_BUTTON(get_gtk_builder_widget("settings_js_delay_spin"));
+  jack_conf_tool_entry = GTK_ENTRY(get_gtk_builder_widget("settings_jack_conf_tool_entry"));
 
   dialog = GTK_DIALOG(get_gtk_builder_widget("settings_dialog"));
@@ -78 +81 @@
   }
 
+  if (!conf_get(LADISH_CONF_KEY_JACK_CONF_TOOL, &jack_conf_tool))
+  {
+    jack_conf_tool = LADISH_CONF_KEY_JACK_CONF_TOOL_DEFAULT;
+  }
+
   gtk_toggle_button_set_active(autostart_studio_button, autostart);
   gtk_toggle_button_set_active(send_notifications_button, notify);
@@ -83 +91 @@
   gtk_entry_set_text(shell_entry, shell);
   gtk_entry_set_text(terminal_entry, terminal);
+  gtk_entry_set_text(jack_conf_tool_entry, jack_conf_tool);
 
   gtk_spin_button_set_range(js_delay_spin, 0, 1000);
@@ -101 +110 @@
   terminal = gtk_entry_get_text(terminal_entry);
   js_delay = gtk_spin_button_get_value(js_delay_spin);
+  jack_conf_tool = gtk_entry_get_text(jack_conf_tool_entry);
 
   if (!conf_set_bool(LADISH_CONF_KEY_DAEMON_STUDIO_AUTOSTART, autostart) ||
@@ -106 +116 @@
       !conf_set(LADISH_CONF_KEY_DAEMON_SHELL, shell) ||
       !conf_set(LADISH_CONF_KEY_DAEMON_TERMINAL, terminal) ||
-      !conf_set_uint(LADISH_CONF_KEY_DAEMON_JS_SAVE_DELAY, js_delay))
+      !conf_set_uint(LADISH_CONF_KEY_DAEMON_JS_SAVE_DELAY, js_delay) ||
+      !conf_set(LADISH_CONF_KEY_JACK_CONF_TOOL, jack_conf_tool))
   {
     error_message_box(_("Storing settings"));