smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-24 06:07:29 +01:00
Code Issues Projects Releases Wiki Activity

Use std::string and Glib::build_filename in Session::path_from_region_name

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@12898 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Tim Mayberry 2012-06-23 05:09:35 +00:00
parent 6844eee3ae
commit 8bfeb96bfc
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libs/ardour/session_state.cc
View file

@ -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;
}
}