goodbye USE_TRACKS_CODE_FEATURES and is_tracks_build

[ardour.git] / libs / ardour / filesystem_paths.cc

diff --git a/libs/ardour/filesystem_paths.cc b/libs/ardour/filesystem_paths.cc
index 94ebc2830ecb5b46f7104397f4f9e4e850de44a6..1d1bd125ddbbded3dfeeb9d6304bd972af8ae246 100644 (file)
--- a/libs/ardour/filesystem_paths.cc
+++ b/libs/ardour/filesystem_paths.cc
@@ -1,27 +1,31 @@
 /*
-    Copyright (C) 2007 Tim Mayberry
-
-    This program 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.
-
-    This program 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 this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
+ * Copyright (C) 2007-2016 Tim Mayberry <mojofunk@gmail.com>
+ * Copyright (C) 2008-2011 David Robillard <d@drobilla.net>
+ * Copyright (C) 2008-2016 Paul Davis <paul@linuxaudiosystems.com>
+ * Copyright (C) 2009-2012 Carl Hetherington <carl@carlh.net>
+ * Copyright (C) 2013-2014 John Emmas <john@creativepost.co.uk>
+ * Copyright (C) 2014-2019 Robin Gareus <robin@gareus.org>
+ *
+ * This program 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.
+ *
+ * This program 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 this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 #include <cstdlib>
 #include <iostream>
 
 #include "pbd/compose.h"
-#include "pbd/convert.h"
 #include "pbd/error.h"
+#include "pbd/string_convert.h"
 
 #include <glibmm/miscutils.h>
 #include <glibmm/fileutils.h>
@@ -46,7 +50,7 @@ static std::string
 user_config_directory_name (int version = -1)
 {
        if (version < 0) {
-               version = atoi (X_(PROGRAM_VERSION));
+               version = string_to<int32_t>(X_(PROGRAM_VERSION));
        }
 
        /* ARDOUR::Profile may not be available when this is
@@ -54,13 +58,6 @@ user_config_directory_name (int version = -1)
           product name etc.
        */
 
-#ifdef USE_TRACKS_CODE_FEATURES
-       /* Tracks does not use versioned configuration folders, which may or
-          may not be problematic in the future.
-       */
-       return X_(PROGRAM_NAME);
-
-#else
        const string config_dir_name = string_compose ("%1%2", X_(PROGRAM_NAME), version);
 
 #if defined (__APPLE__) || defined (PLATFORM_WINDOWS)
@@ -70,7 +67,6 @@ user_config_directory_name (int version = -1)
        /* use lower case folder name on Linux */
        return downcase (config_dir_name);
 #endif
-#endif
 }
 
 std::string
@@ -98,7 +94,7 @@ user_config_directory (int version)
 #endif
                if (home_dir.empty ()) {
                        error << "Unable to determine home directory" << endmsg;
-                       exit (1);
+                       exit (EXIT_FAILURE);
                }
                p = home_dir;
 
@@ -119,7 +115,7 @@ user_config_directory (int version)
                        if (g_mkdir_with_parents (p.c_str(), 0755)) {
                                error << string_compose (_("Cannot create Configuration directory %1 - cannot run"),
                                                         p) << endmsg;
-                               exit (1);
+                               exit (EXIT_FAILURE);
                        }
                        } else if (!Glib::file_test (p, Glib::FILE_TEST_IS_DIR)) {
                        fatal << string_compose (_("Configuration directory %1 already exists and is not a directory/folder - cannot run"),
@@ -156,7 +152,7 @@ user_cache_directory (std::string cachename)
 #endif
                if (home_dir.empty ()) {
                        error << "Unable to determine home directory" << endmsg;
-                       exit (1);
+                       exit (EXIT_FAILURE);
                }
                p = home_dir;
 
@@ -187,7 +183,7 @@ user_cache_directory (std::string cachename)
                if (g_mkdir_with_parents (p.c_str(), 0755)) {
                        error << string_compose (_("Cannot create cache directory %1 - cannot run"),
                                                   p) << endmsg;
-                       exit (1);
+                       exit (EXIT_FAILURE);
                }
        } else if (!Glib::file_test (p, Glib::FILE_TEST_IS_DIR)) {
                fatal << string_compose (_("Cache directory %1 already exists and is not a directory/folder - cannot run"),
@@ -209,7 +205,7 @@ ardour_dll_directory ()
        std::string s = Glib::getenv("ARDOUR_DLL_PATH");
        if (s.empty()) {
                std::cerr << _("ARDOUR_DLL_PATH not set in environment - exiting\n");
-               ::exit (1);
+               ::exit (EXIT_FAILURE);
        }
        return s;
 #endif
@@ -313,7 +309,7 @@ been_here_before_path (int version)
                version = atoi (PROGRAM_VERSION);
        }
 
-       return Glib::build_filename (user_config_directory (version), string (".a") + to_string (version, std::dec));
+       return Glib::build_filename (user_config_directory (version), string (".a") + to_string (version));
 }