compose path of and eventually create base dir (~/.ladish/)

daemon/common.h

@@ -36,6 +36,10 @@
 #include "../dbus/service.h"
 #include "../dbus/helpers.h"
 
+/* ~/BASE_DIR is where studio, room and project xml files are stored */
+#define BASE_DIR "/." BASE_NAME
+extern char * g_base_dir;
+
 /* JACK port or virtual port */
 struct port
 {

daemon/main.c

@@ -39,10 +39,13 @@
 #include "control.h"
 #include "studio.h"
 #include "../dbus_constants.h"
+#include "../catdup.h"
+#include "dirhelpers.h"
 
 bool g_quit;
 const char * g_dbus_unique_name;
 object_path_t * g_control_object;
+char * g_base_dir;
 
 #if 0
 static DBusHandlerResult lashd_client_disconnect_handler(DBusConnection * connection, DBusMessage * message, void * data)
@@ -209,6 +212,38 @@ bool install_term_signal_handler(int signum, bool ignore_if_already_ignored)
   return true;
 }
 
+bool init_paths(void)
+{
+  const char * home_dir;
+
+  home_dir = getenv("HOME");
+  if (home_dir == NULL)
+  {
+    lash_error("Environment variable HOME not set");
+    return false;
+  }
+
+  g_base_dir = catdup(home_dir, BASE_DIR);
+  if (g_base_dir == NULL)
+  {
+    lash_error("catdup failed for '%s' and '%s'", home_dir, BASE_DIR);
+    return false;
+  }
+
+  if (!ensure_dir_exist(g_base_dir, 0700))
+  {
+    free(g_base_dir);
+    return false;
+  }
+
+  return true;
+}
+
+void uninit_paths(void)
+{
+  free(g_base_dir);
+}
+
 int main(int argc, char ** argv, char ** envp)
 {
   struct stat st;
@@ -229,6 +264,11 @@ int main(int argc, char ** argv, char ** envp)
 
   ret = EXIT_FAILURE;
 
+  if (!init_paths())
+  {
+    goto exit;
+  }
+
   loader_init(on_child_exit);
 
   if (!connect_dbus())
@@ -273,6 +313,9 @@ uninit_dbus:
 uninit_loader:
   loader_uninit();
 
+  uninit_paths();
+
+exit:
   lash_debug("Cleaned up, exiting");
 
   lash_info("LADI session handler deactivated");

wscript

@@ -117,7 +117,6 @@ def configure(conf):
     add_cflag(conf, '-Werror')
 
     conf.define('DATA_DIR', os.path.normpath(os.path.join(conf.env['PREFIX'], 'share', APPNAME)))
-    conf.define('DEFAULT_PROJECT_DIR', "audio-projects")
     conf.define('PACKAGE_VERSION', VERSION)
     conf.define('DBUS_NAME_BASE', DBUS_NAME_BASE)
     conf.define('DBUS_BASE_PATH', '/' + DBUS_NAME_BASE.replace('.', '/'))