X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudio_region_importer.cc;h=1b9263b0261909ea5d82c7b62064401c0d1ccce1;hb=4e5423b3487771220cdca4c2b1a79c4d74b6afa5;hp=53367a35a443282d752ee5b99546b06b27ae97a5;hpb=33f63bd09ce7a78e3f2d783c9ace6a0bf29a807c;p=ardour.git

diff --git a/libs/ardour/audio_region_importer.cc b/libs/ardour/audio_region_importer.cc
index 53367a35a4..1b9263b026 100644
--- a/libs/ardour/audio_region_importer.cc
+++ b/libs/ardour/audio_region_importer.cc
@@ -33,7 +33,7 @@
 #include "ardour/region_factory.h"
 #include "ardour/session_directory.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;
@@ -127,7 +127,7 @@ AudioRegionImporter::~AudioRegionImporter ()
 string
 AudioRegionImporter::get_info () const
 {
-	framecnt_t length, position;
+	samplecnt_t length, position;
 	Timecode::Time length_time, position_time;
 	std::ostringstream oss;
 
@@ -236,7 +236,7 @@ AudioRegionImporter::parse_source_xml ()
 	char buf[128];
 	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")))) {