add kxstudio linux vst dirs to LXVST default search path

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

diff --git a/libs/ardour/session_state_utils.cc b/libs/ardour/session_state_utils.cc
index 8cfda28780eb3ee5fd4f69f81d4ea2d024b1ef70..13d65e5b3c404d42187905637269bd78a809bea6 100644 (file)
--- a/libs/ardour/session_state_utils.cc
+++ b/libs/ardour/session_state_utils.cc
@@ -18,6 +18,11 @@
 
 #include <algorithm>
 
+#include <glibmm/fileutils.h>
+
+#include <giomm/file.h>
+
+#include "pbd/basename.h"
 #include "pbd/compose.h"
 #include "pbd/error.h"
 #include "pbd/file_utils.h"
@@ -33,24 +38,9 @@ using namespace PBD;
 namespace ARDOUR {
 
 bool
-create_backup_file (const sys::path & file_path)
+create_backup_file (const std::string & file_path)
 {
-       if (!sys::exists (file_path)) return false;
-
-       sys::path backup_path(file_path.to_string() + backup_suffix);
-
-       try
-       {
-               sys::copy_file (file_path, backup_path);
-       }
-       catch(sys::filesystem_error& ex)
-       {
-               error << string_compose (_("Unable to create a backup copy of file %1 (%2)"),
-                               file_path.to_string(), ex.what())
-                       << endmsg;
-               return false;
-       }
-       return true;
+       return copy_file (file_path, file_path + backup_suffix);
 }
 
 void
@@ -69,7 +59,7 @@ get_file_names_no_extension (const vector<std::string> & file_paths)
        vector<string> result;
 
        std::transform (file_paths.begin(), file_paths.end(),
-                       std::back_inserter(result), sys::basename);
+                       std::back_inserter(result), PBD::basename_nosuffix);
 
        sort (result.begin(), result.end(), std::less<string>());