From 8bfeb96bfc460fe8df50d5def0a879a13d8fb61f Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Sat, 23 Jun 2012 05:09:35 +0000 Subject: [PATCH] Use std::string and Glib::build_filename in Session::path_from_region_name git-svn-id: svn://localhost/ardour2/branches/3.0@12898 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/session_state.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 20761eafc6..42040d29a1 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -1913,7 +1913,7 @@ Session::path_from_region_name (DataType type, string name, string identifier) char buf[PATH_MAX+1]; uint32_t n; SessionDirectory sdir(get_best_session_directory_for_new_source()); - sys::path source_dir = ((type == DataType::AUDIO) + std::string source_dir = ((type == DataType::AUDIO) ? sdir.sound_path() : sdir.midi_path()); string ext = native_header_format_extension (config.get_native_file_header_format(), type); @@ -1927,10 +1927,10 @@ Session::path_from_region_name (DataType type, string name, string identifier) n, ext.c_str()); } - sys::path source_path = source_dir / buf; + std::string source_path = Glib::build_filename (source_dir, buf); - if (!Glib::file_test (source_path.to_string(), Glib::FILE_TEST_EXISTS)) { - return source_path.to_string(); + if (!Glib::file_test (source_path, Glib::FILE_TEST_EXISTS)) { + return source_path; } }