provide support for playhead-to-next/previous-region-boundary actions, and bindings...

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

diff --git a/libs/ardour/coreaudiosource.cc b/libs/ardour/coreaudiosource.cc
index 3c81b18fd4fb2ee129a8d230d4fb180f75e234b6..703225e502eaa953eee5c5d40a9afe9f828c1796 100644 (file)
--- a/libs/ardour/coreaudiosource.cc
+++ b/libs/ardour/coreaudiosource.cc
@@ -19,6 +19,7 @@
 
 #include <pbd/error.h>
 #include <ardour/coreaudiosource.h>
+#include <ardour/utils.h>
 
 #include <appleutility/CAAudioFile.h>
 #include <appleutility/CAStreamBasicDescription.h>
@@ -33,33 +34,23 @@ using namespace PBD;
 CoreAudioSource::CoreAudioSource (Session& s, const XMLNode& node)
        : AudioFileSource (s, node)
 {
-       init (_name);
+       init ();
 }
 
-CoreAudioSource::CoreAudioSource (Session& s, const string& idstr, Flag flags)
-       : AudioFileSource(s, idstr, flags)
+CoreAudioSource::CoreAudioSource (Session& s, const string& path, int chn, Flag flags)
+       /* files created this way are never writable or removable */
+       : AudioFileSource (s, path, Flag (flags & ~(Writable|Removable|RemovableIfEmpty|RemoveAtDestroy)))
 {
-       init (idstr);
+       _channel = chn;
+       init ();
 }
 
 void 
-CoreAudioSource::init (string idstr)
+CoreAudioSource::init ()
 {
-       string::size_type pos;
-
        tmpbuf = 0;
        tmpbufsize = 0;
 
-       _name = idstr;
-
-       if ((pos = idstr.find_last_of (':')) == string::npos) {
-               channel = 0;
-               _path = idstr;
-       } else {
-               channel = atoi (idstr.substr (pos+1).c_str());
-               _path = idstr.substr (0, pos);
-       }
-
        cerr << "CoreAudioSource::init() " << name() << endl;
        
        /* note that we temporarily truncated _id at the colon */
@@ -70,8 +61,8 @@ CoreAudioSource::init (string idstr)
                n_channels = file_asbd.NumberChannels();
                cerr << "number of channels: " << n_channels << endl;
                
-               if (channel >= n_channels) {
-                       error << string_compose("CoreAudioSource: file only contains %1 channels; %2 is invalid as a channel number (%3)", n_channels, channel, name()) << endmsg;
+               if (_channel >= n_channels) {
+                       error << string_compose("CoreAudioSource: file only contains %1 channels; %2 is invalid as a channel number (%3)", n_channels, _channel, name()) << endmsg;
                        throw failed_constructor();
                }
 
@@ -142,14 +133,14 @@ CoreAudioSource::read_unlocked (Sample *dst, nframes_t start, nframes_t cnt) con
                abl.mBuffers[0].mDataByteSize = tmpbufsize * sizeof(Sample);
                abl.mBuffers[0].mData = tmpbuf;
 
-               cerr << "channel: " << channel << endl;
+               cerr << "channel: " << _channel << endl;
                
                try {
                        af.Read (real_cnt, &abl);
                } catch (CAXException& cax) {
                        error << string_compose("CoreAudioSource: %1 (%2)", cax.mOperation, _name);
                }
-               float *ptr = tmpbuf + channel;
+               float *ptr = tmpbuf + _channel;
                real_cnt /= n_channels;
                
                /* stride through the interleaved data */