X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fcaimportable.cc;h=008e78954c8566fe79989b096b34ff38afd47b5f;hb=4e5423b3487771220cdca4c2b1a79c4d74b6afa5;hp=751e74cbcf3e406c696c141c867dd3861dd122b5;hpb=4dc63966f0872efe768dad61eb9b8785d06b92d1;p=ardour.git

diff --git a/libs/ardour/caimportable.cc b/libs/ardour/caimportable.cc
index 751e74cbcf..008e78954c 100644
--- a/libs/ardour/caimportable.cc
+++ b/libs/ardour/caimportable.cc
@@ -21,7 +21,7 @@
 #include <sndfile.h>
 #include "pbd/error.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace std;
@@ -55,12 +55,12 @@ CAImportableSource::~CAImportableSource ()
 {
 }
 
-framecnt_t
-CAImportableSource::read (Sample* buffer, framecnt_t nframes)
+samplecnt_t
+CAImportableSource::read (Sample* buffer, samplecnt_t nframes)
 {
-	framecnt_t nread = 0;
+	samplecnt_t nread = 0;
 	AudioBufferList abl;
-	framecnt_t per_channel;
+	samplecnt_t per_channel;
 	bool at_end = false;
 
 	abl.mNumberBuffers = 1;
@@ -104,13 +104,13 @@ CAImportableSource::channels () const
 	return af.GetFileDataFormat().NumberChannels();
 }
 
-framecnt_t
+samplecnt_t
 CAImportableSource::length () const
 {
 	return af.GetNumberFrames();
 }
 
-framecnt_t
+samplecnt_t
 CAImportableSource::samplerate () const
 {
 	CAStreamBasicDescription client_asbd;
@@ -126,7 +126,7 @@ CAImportableSource::samplerate () const
 }
 
 void
-CAImportableSource::seek (framepos_t pos)
+CAImportableSource::seek (samplepos_t pos)
 {
 	try {
 		af.Seek (pos);