Hopefully fix disappearing MIDI recorded regions on the first record of a new session.

[ardour.git] / libs / ardour / caimportable.cc

diff --git a/libs/ardour/caimportable.cc b/libs/ardour/caimportable.cc
index 229bfa8809a314d66e6ef9e162076d13dded6f20..149f213222def48b574f0d236ee4dcc072fe7a8f 100644 (file)
--- a/libs/ardour/caimportable.cc
+++ b/libs/ardour/caimportable.cc
@@ -1,6 +1,6 @@
-#include <ardour/caimportable.h>
+#include "ardour/caimportable.h"
 #include <sndfile.h>
-#include <pbd/error.h>
+#include "pbd/error.h"
 
 #include "i18n.h"
 
@@ -24,7 +24,9 @@ CAImportableSource::CAImportableSource (const string& path)
                af.SetClientFormat (client_format);
 
        } catch (CAXException& cax) {
-               error << string_compose ("CAImportable: %1", cax.mOperation) << endmsg;
+                //Don't report an error here since there is one higher up in import.
+                //Since libsndfile gets tried second, any failures here may show as
+                //invalid errors in the Error log.
                throw failed_constructor ();
        }
 
@@ -34,12 +36,12 @@ CAImportableSource::~CAImportableSource ()
 {
 }
 
-nframes_t
-CAImportableSource::read (Sample* buffer, nframes_t nframes) 
+framecnt_t
+CAImportableSource::read (Sample* buffer, framecnt_t nframes)
 {
-       nframes_t nread = 0;
+       framecnt_t nread = 0;
        AudioBufferList abl;
-       nframes_t per_channel;
+       framecnt_t per_channel;
        bool at_end = false;
 
        abl.mNumberBuffers = 1;
@@ -48,12 +50,12 @@ CAImportableSource::read (Sample* buffer, nframes_t nframes)
        per_channel = nframes / abl.mBuffers[0].mNumberChannels;
 
        while (nread < per_channel) {
-               
+
                UInt32 new_cnt = per_channel - nread;
-               
+
                abl.mBuffers[0].mDataByteSize = new_cnt * abl.mBuffers[0].mNumberChannels * sizeof(Sample);
                abl.mBuffers[0].mData = buffer + nread;
-                       
+
                try {
                        af.Read (new_cnt, &abl);
                } catch (CAXException& cax) {
@@ -73,24 +75,24 @@ CAImportableSource::read (Sample* buffer, nframes_t nframes)
        if (!at_end && nread < per_channel) {
                return 0;
        } else {
-               return nread *  abl.mBuffers[0].mNumberChannels;
+               return nread * abl.mBuffers[0].mNumberChannels;
        }
 }
 
 uint
-CAImportableSource::channels () const 
+CAImportableSource::channels () const
 {
        return af.GetFileDataFormat().NumberChannels();
 }
 
-nframes_t
-CAImportableSource::length () const 
+framecnt_t
+CAImportableSource::length () const
 {
        return af.GetNumberFrames();
 }
 
-nframes_t
-CAImportableSource::samplerate() const
+framecnt_t
+CAImportableSource::samplerate () const
 {
        CAStreamBasicDescription client_asbd;
 
@@ -105,7 +107,7 @@ CAImportableSource::samplerate() const
 }
 
 void
-CAImportableSource::seek (nframes_t pos)
+CAImportableSource::seek (framepos_t pos)
 {
        try {
                af.Seek (pos);
@@ -114,5 +116,5 @@ CAImportableSource::seek (nframes_t pos)
        }
 }
 
-       
+