X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_state_utils.cc;h=5d5c9cc8df6eefd605da55d2c7fec17add13c7c4;hb=7fc3b0c34c552d7be862897bd0aaa542453e9973;hp=b6bd6a958176dfe3c213a7f11606ce8c725e4a03;hpb=078e867f3cd51ac0f940d12ea90f11c3d5af9cae;p=ardour.git

diff --git a/libs/ardour/session_state_utils.cc b/libs/ardour/session_state_utils.cc
index b6bd6a9581..5d5c9cc8df 100644
--- a/libs/ardour/session_state_utils.cc
+++ b/libs/ardour/session_state_utils.cc
@@ -1,5 +1,5 @@
 /*
-	Copyright (C) 2007 Tim Mayberry 
+	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
@@ -16,59 +16,48 @@
 	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <pbd/compose.h>
-#include <pbd/basename.h>
-#include <pbd/error.h>
-#include <pbd/file_utils.h>
+#include <algorithm>
 
-#include <ardour/session_state_utils.h>
-#include <ardour/filename_extensions.h>
+#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"
+
+#include "ardour/session_state_utils.h"
+#include "ardour/filename_extensions.h"
 
 #include "i18n.h"
 
+using namespace std;
+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
-get_state_files_in_directory (const sys::path & directory_path,
-		vector<sys::path> & result)
+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>
-get_file_names_no_extension (const vector<sys::path> & file_paths)
+get_file_names_no_extension (const vector<std::string> & file_paths)
 {
 	vector<string> result;
 
-	for (vector<sys::path>::const_iterator i = file_paths.begin();
-			i != file_paths.end(); ++i)
-	{
-		result.push_back (basename_nosuffix((*i).to_string()));
-	}
+	std::transform (file_paths.begin(), file_paths.end(),
+			std::back_inserter(result), PBD::basename_nosuffix);
 
 	sort (result.begin(), result.end(), std::less<string>());