From 105caf23daf5aed16c7ee8b904fcca2ddbd4f59f Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Sat, 23 Jun 2012 05:06:54 +0000 Subject: Use std::string instead of PBD::sys::path in pbd/search_path.h, pbd/file_utils.h and ardour/session_dir.h git-svn-id: svn://localhost/ardour2/branches/3.0@12829 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/audio_region_importer.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'libs/ardour/audio_region_importer.cc') diff --git a/libs/ardour/audio_region_importer.cc b/libs/ardour/audio_region_importer.cc index c4755ec1f5..d1a1da718e 100644 --- a/libs/ardour/audio_region_importer.cc +++ b/libs/ardour/audio_region_importer.cc @@ -22,6 +22,8 @@ #include +#include + #include "pbd/failed_constructor.h" #include "pbd/compose.h" #include "pbd/error.h" @@ -292,12 +294,8 @@ AudioRegionImporter::parse_source_xml () PBD::sys::path AudioRegionImporter::get_sound_dir (XMLTree const & tree) { - PBD::sys::path source_dir = tree.filename(); - source_dir = source_dir.branch_path(); - SessionDirectory session_dir(source_dir); - source_dir = session_dir.sound_path(); - - return source_dir; + SessionDirectory session_dir(Glib::path_get_dirname (tree.filename())); + return session_dir.sound_path(); } void -- cgit v1.2.3