ardour/livetrax
13
0
Fork 0
Code

Replace use of PBD::sys::path in AudioRegionImporter

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@12830 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Tim Mayberry 2012-06-23 05:06:57 +00:00
parent 105caf23da
commit 33f63bd09c
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/ardour/ardour/audio_region_importer.h
View File

@ -29,7 +29,6 @@
#include "pbd/xml++.h"
#include "pbd/id.h"
#include "pbd/filesystem.h"
#include "ardour/element_importer.h"
#include "ardour/element_import_handler.h"
#include "ardour/import_status.h"
@ -100,7 +99,7 @@ class AudioRegionImporter : public ElementImporter
bool parse_xml_region ();
bool parse_source_xml ();
PBD::sys::path get_sound_dir (XMLTree const & tree);
std::string get_sound_dir (XMLTree const & tree);
void prepare_region ();
void prepare_sources ();

10
libs/ardour/audio_region_importer.cc
View File

@ -234,8 +234,7 @@ AudioRegionImporter::parse_source_xml ()
{
uint32_t channels;
char buf[128];
PBD::sys::path source_dir = get_sound_dir (source);
PBD::sys::path source_path;
std::string source_dir(get_sound_dir (source));
XMLNode * source_node;
XMLProperty *prop;
@ -268,15 +267,12 @@ AudioRegionImporter::parse_source_xml ()
for (XMLNodeList::const_iterator it = sources.begin(); it != sources.end(); ++it) {
prop = (*it)->property ("id");
if (prop && !source_id.compare (prop->value())) {
source_path = source_dir;
prop = (*it)->property ("name");
if (!prop) {
error << string_compose (X_("AudioRegionImporter (%1): source %2 has no \"name\" property"), name, source_id) << endmsg;
return false;
}
source_path /= prop->value();
filenames.push_back (source_path.to_string());
filenames.push_back (Glib::build_filename (source_dir, prop->value()));
source_found = true;
break;
}
@ -291,7 +287,7 @@ AudioRegionImporter::parse_source_xml ()
return true;
}
PBD::sys::path
std::string
AudioRegionImporter::get_sound_dir (XMLTree const & tree)
{
SessionDirectory session_dir(Glib::path_get_dirname (tree.filename()));