X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudio_region_importer.cc;h=1fc2537af1b19793b9e88c7d36c99f0a3db556bb;hb=b285559767e21aae4467270590f048c3263fd742;hp=2cade745f2d055f81df0a4e3d3d1dc7399d12e75;hpb=4d112a8e6b90fa64a5cd333042044768111ba994;p=ardour.git

diff --git a/libs/ardour/audio_region_importer.cc b/libs/ardour/audio_region_importer.cc
index 2cade745f2..1fc2537af1 100644
--- a/libs/ardour/audio_region_importer.cc
+++ b/libs/ardour/audio_region_importer.cc
@@ -22,17 +22,18 @@
 
 #include <sstream>
 
+#include <glibmm/miscutils.h>
+
 #include "pbd/failed_constructor.h"
 #include "pbd/compose.h"
 #include "pbd/error.h"
 
 #include "ardour/session.h"
 #include "ardour/region.h"
-#include "ardour/source_factory.h"
 #include "ardour/region_factory.h"
 #include "ardour/session_directory.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;
@@ -61,7 +62,7 @@ AudioRegionImportHandler::create_regions_from_children (XMLNode const & node, El
 		if (!(*it)->name().compare ("Region") && (!type || type->value() == "audio") ) {
 			try {
 				list.push_back (ElementPtr ( new AudioRegionImporter (source, session, *this, **it)));
-			} catch (failed_constructor err) {
+			} catch (failed_constructor const&) {
 				set_dirty();
 			}
 		}
@@ -126,7 +127,7 @@ AudioRegionImporter::~AudioRegionImporter ()
 string
 AudioRegionImporter::get_info () const
 {
-	nframes_t length, position;
+	samplecnt_t length, position;
 	Timecode::Time length_time, position_time;
 	std::ostringstream oss;
 
@@ -233,10 +234,9 @@ 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;
+	XMLProperty const * prop;
 
 	// Get XML for sources
 	if (!(source_node = source.root()->child (X_("Sources")))) {
@@ -267,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;
 			}
@@ -290,15 +287,11 @@ AudioRegionImporter::parse_source_xml ()
 	return true;
 }
 
-PBD::sys::path
+std::string
 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
@@ -317,7 +310,11 @@ AudioRegionImporter::prepare_region ()
 	}
 
 	// create region and update XML
-	region.push_back (RegionFactory::create (source_list, xml_region));
+	boost::shared_ptr<Region> r = RegionFactory::create (source_list, xml_region);
+	if (session.config.get_glue_new_regions_to_bars_and_beats ()) {
+		r->set_position_lock_style (MusicTime);
+	}
+	region.push_back (r);
 	if (*region.begin()) {
 		xml_region = (*region.begin())->get_state();
 	} else {
@@ -353,7 +350,7 @@ AudioRegionImporter::prepare_sources ()
 
 	// import files
 	// TODO: threading & exception handling
-	session.import_audiofiles (status);
+	session.import_files (status);
 
 	// Add imported sources to handlers map
 	std::vector<string>::iterator file_it = status.paths.begin();