diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2012-06-23 05:06:54 +0000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2012-06-23 05:06:54 +0000 |
| commit | 105caf23daf5aed16c7ee8b904fcca2ddbd4f59f (patch) | |
| tree | 4d74f6c8722790e6fb9d58888ea225866fc98d3c /libs/ardour/audio_region_importer.cc | |
| parent | 22e478e7fc4952dd386391e85d8e7fa2491ae953 (diff) | |
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
Diffstat (limited to 'libs/ardour/audio_region_importer.cc')
| -rw-r--r-- | libs/ardour/audio_region_importer.cc | 10 |
1 files changed, 4 insertions, 6 deletions
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 <sstream> +#include <glibmm/miscutils.h> + #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 |