hook studio save to gui; improve studio interface; studio proxy

daemon/studio.c

@@ -29,6 +29,8 @@
 #include "patchbay.h"
 #include "../dbus_constants.h"
 #include "control.h"
+#include "../catdup.h"
+#include "../dbus/error.h"
 
 extern const interface_t g_interface_studio;
 
@@ -57,6 +59,8 @@ struct studio
   object_path_t * dbus_object;
 
   struct list_head event_queue;
+
+  char * name;
 } g_studio;
 
 #define EVENT_JACK_START   0
@@ -409,11 +413,35 @@ bool studio_fetch_jack_settings()
   return true;
 }
 
+bool studio_name_generate(char ** name_ptr)
+{
+  time_t now;
+  char timestamp_str[26];
+  char * name;
+
+  time(&now);
+  //ctime_r(&now, timestamp_str);
+  //timestamp_str[24] = 0;
+  snprintf(timestamp_str, sizeof(timestamp_str), "%llu", (unsigned long long)now);
+
+  name = catdup("Studio ", timestamp_str);
+  if (name == NULL)
+  {
+    lash_error("catdup failed to create studio name");
+    return false;
+  }
+
+  *name_ptr = name;
+  return true;
+}
+
 bool
 studio_activate(void)
 {
   object_path_t * object;
 
+  assert(g_studio.name != NULL);
+
   object = object_path_new(STUDIO_OBJECT_PATH, &g_studio, 2, &g_interface_studio, &g_interface_patchbay);
   if (object == NULL)
   {
@@ -428,7 +456,7 @@ studio_activate(void)
     return false;
   }
 
-  lash_info("Studio D-Bus object created.");
+  lash_info("Studio D-Bus object created. \"%s\"", g_studio.name);
 
   g_studio.dbus_object = object;
 
@@ -460,6 +488,12 @@ studio_clear(void)
     g_studio.dbus_object = NULL;
     emit_studio_disappeared();
   }
+
+  if (g_studio.name != NULL)
+  {
+    free(g_studio.name);
+    g_studio.name = NULL;
+  }
 }
 
 void
@@ -476,6 +510,13 @@ void on_event_jack_started(void)
 {
   if (g_studio.dbus_object == NULL)
   {
+    assert(g_studio.name == NULL);
+    if (!studio_name_generate(&g_studio.name))
+    {
+      lash_error("studio_name_generate() failed.");
+      return;
+    }
+
     studio_activate();
   }
 
@@ -600,6 +641,7 @@ bool studio_init(void)
   INIT_LIST_HEAD(&g_studio.event_queue);
 
   g_studio.dbus_object = NULL;
+  g_studio.name = NULL;
   studio_clear();
 
   if (!jack_proxy_init(
@@ -628,7 +670,7 @@ bool studio_is_loaded(void)
   return g_studio.dbus_object != NULL;
 }
 
-bool studio_save(const char * file_path)
+bool studio_save()
 {
   struct list_head * node_ptr;
   struct jack_conf_parameter * parameter_ptr;
@@ -704,15 +746,56 @@ bool studio_load(const char * file_path)
   return false;                 /* not implemented yet */
 }
 
+static void ladish_get_studio_name(method_call_t * call_ptr)
+{
+  method_return_new_single(call_ptr, DBUS_TYPE_STRING, &g_studio.name);
+}
+
+static void ladish_rename_studio(method_call_t * call_ptr)
+{
+  const char * new_name;
+  char * new_name_dup;
+  
+  if (!dbus_message_get_args(call_ptr->message, &g_dbus_error, DBUS_TYPE_STRING, &new_name, DBUS_TYPE_INVALID))
+  {
+    lash_dbus_error(call_ptr, LASH_DBUS_ERROR_INVALID_ARGS, "Invalid arguments to method \"%s\": %s",  call_ptr->method_name, g_dbus_error.message);
+    dbus_error_free(&g_dbus_error);
+    return;
+  }
+
+  new_name_dup = strdup(new_name);
+  if (new_name_dup == NULL)
+  {
+    lash_dbus_error(call_ptr, LASH_DBUS_ERROR_GENERIC, "strdup() failed to allocate new name.");
+    return;
+  }
+
+  free(g_studio.name);
+  g_studio.name = new_name_dup;
+
+  method_return_new_void(call_ptr);
+}
+
 static void ladish_save_studio(method_call_t * call_ptr)
 {
-  //studio_save(g_studio, NULL)
+  studio_save();
+  method_return_new_void(call_ptr);
 }
 
+METHOD_ARGS_BEGIN(GetName, "Get studio name")
+  METHOD_ARG_DESCRIBE_OUT("studio_name", "s", "Name of studio")
+METHOD_ARGS_END
+
+METHOD_ARGS_BEGIN(Rename, "Rename studio")
+  METHOD_ARG_DESCRIBE_IN("studio_name", "s", "New name")
+METHOD_ARGS_END
+
 METHOD_ARGS_BEGIN(Save, "Save studio")
 METHOD_ARGS_END
 
 METHODS_BEGIN
+  METHOD_DESCRIBE(GetName, ladish_get_studio_name)
+  METHOD_DESCRIBE(Rename, ladish_rename_studio)
   METHOD_DESCRIBE(Save, ladish_save_studio)
 METHODS_END
 

gui/main.c

@@ -39,6 +39,7 @@
 #include "world_tree.h"
 #include "graph_view.h"
 #include "../catdup.h"
+#include "../studio_proxy.h"
 
 GtkWidget * g_main_win;
 GtkWidget * g_clear_load_button;
@@ -172,6 +173,10 @@ static void arrange(void)
 static void save_studio(void)
 {
   lash_info("save studio request");
+  if (!studio_proxy_save())
+  {
+    lash_error("studio save failed");
+  }
 }
 
 static gboolean poll_jack(gpointer data)

studio_proxy.c

@@ -0,0 +1,58 @@
+/* -*- Mode: C ; c-basic-offset: 2 -*- */
+/*
+ * LADI Session Handler (ladish)
+ *
+ * Copyright (C) 2009 Nedko Arnaudov <nedko@arnaudov.name>
+ *
+ **************************************************************************
+ * This file contains implementation of the helper functionality
+ * for accessing Studio object through D-Bus
+ **************************************************************************
+ *
+ * LADI Session Handler is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * LADI Session Handler is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LADI Session Handler. If not, see <http://www.gnu.org/licenses/>
+ * or write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "common.h"
+#include "dbus_constants.h"
+#include "dbus/helpers.h"
+
+bool studio_proxy_get_name(char ** name_ptr)
+{
+  const char * name;
+  if (!dbus_call_simple(SERVICE_NAME, STUDIO_OBJECT_PATH, IFACE_STUDIO, "GetName", "", "s", &name))
+  {
+    return false;
+  }
+
+  *name_ptr = strdup(name);
+  if (*name_ptr == NULL)
+  {
+    lash_error("strdup() failed to duplicate studio name");
+    return false;
+  }
+
+  return true;
+}
+
+bool studio_proxy_rename(const char * name)
+{
+  return dbus_call_simple(SERVICE_NAME, STUDIO_OBJECT_PATH, IFACE_STUDIO, "Rename", "s", &name, "");
+}
+
+bool studio_proxy_save(void)
+{
+  return dbus_call_simple(SERVICE_NAME, STUDIO_OBJECT_PATH, IFACE_STUDIO, "Save", "", "");
+}

studio_proxy.h

@@ -0,0 +1,35 @@
+/* -*- Mode: C ; c-basic-offset: 2 -*- */
+/*
+ * LADI Session Handler (ladish)
+ *
+ * Copyright (C) 2009 Nedko Arnaudov <nedko@arnaudov.name>
+ *
+ **************************************************************************
+ * This file contains interface to the helper functionality for accessing
+ * Studio object through D-Bus
+ **************************************************************************
+ *
+ * LADI Session Handler is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * LADI Session Handler is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LADI Session Handler. If not, see <http://www.gnu.org/licenses/>
+ * or write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef STUDIO_PROXY_H__2CEC623F_C998_4618_A947_D1A0016DF978__INCLUDED
+#define STUDIO_PROXY_H__2CEC623F_C998_4618_A947_D1A0016DF978__INCLUDED
+
+bool studio_proxy_get_name(char ** name);
+bool studio_proxy_rename(const char * name);
+bool studio_proxy_save(void);
+
+#endif /* #ifndef STUDIO_PROXY_H__2CEC623F_C998_4618_A947_D1A0016DF978__INCLUDED */

wscript

@@ -262,6 +262,7 @@ def build(bld):
     gladish.source = [
         'jack_proxy.c',
         'graph_proxy.c',
+        'studio_proxy.c',
         'catdup.c',
         ]