X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fsession_state_utils.cc;h=28cfbb2b756eb6019f4ca2bcb06f032a2cce46e2;hb=f39bcaa4bfe0a6aed097f669f039ae2efcc2642f;hp=42551b9945492cbdf2d988b00f335d870c1d8a3a;hpb=28ca6442749a1241915faa35367ce6df6d997671;p=ardour.git

diff --git a/libs/ardour/session_state_utils.cc b/libs/ardour/session_state_utils.cc
index 42551b9945..28cfbb2b75 100644
--- a/libs/ardour/session_state_utils.cc
+++ b/libs/ardour/session_state_utils.cc
@@ -22,15 +22,15 @@
 
 #include <giomm/file.h>
 
+#include "pbd/basename.h"
 #include "pbd/compose.h"
 #include "pbd/error.h"
 #include "pbd/file_utils.h"
-#include "pbd/filesystem.h"
 
 #include "ardour/session_state_utils.h"
 #include "ardour/filename_extensions.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;
@@ -40,33 +40,15 @@ namespace ARDOUR {
 bool
 create_backup_file (const std::string & file_path)
 {
-	if (!Glib::file_test (file_path, Glib::FILE_TEST_EXISTS)) return false;
-
-	Glib::RefPtr<Gio::File> backup_path = Gio::File::create_for_path(file_path + backup_suffix);
-	Glib::RefPtr<Gio::File> path = Gio::File::create_for_path(file_path);
-
-	try
-	{
-		path->copy (backup_path);
-	}
-	catch(const Glib::Exception& ex)
-	{
-		error << string_compose (_("Unable to create a backup copy of file %1 (%2)"),
-				file_path, ex.what())
-			<< endmsg;
-		return false;
-	}
-	return true;
+	return copy_file (file_path, file_path + backup_suffix);
 }
 
 void
 get_state_files_in_directory (const std::string & directory_path,
 			      vector<std::string> & result)
 {
-	Glib::PatternSpec state_file_pattern('*' + string(statefile_suffix));
-
-	find_matching_files_in_directory (directory_path, state_file_pattern,
-			result);
+	find_files_matching_pattern (result, directory_path,
+	                             '*' + string(statefile_suffix));
 }
 
 vector<string>
@@ -75,7 +57,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>());