Merge remote-tracking branch 'remotes/origin/exportvis' into windows+cc

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

diff --git a/libs/ardour/ardour/coreaudiosource.h b/libs/ardour/ardour/coreaudiosource.h
index bd69c78e180d29ec1285d6bdcd8d409bc9da2b59..f12a67ded7fae8ad8c05a8e1e38cf16a38add86a 100644 (file)
--- a/libs/ardour/ardour/coreaudiosource.h
+++ b/libs/ardour/ardour/coreaudiosource.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000 Paul Davis 
+    Copyright (C) 2000 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,42 +17,46 @@
 
 */
 
-#ifndef __coreaudio_source_h__ 
+#ifndef __coreaudio_source_h__
 #define __coreaudio_source_h__
 
 #include <appleutility/CAAudioFile.h>
+#include "ardour/audiofilesource.h"
+#include <string>
 
-#include <ardour/audiofilesource.h>
+using namespace std;
 
 namespace ARDOUR {
 
-class CoreAudioSource : public AudioFileSource {
+class LIBARDOUR_API CoreAudioSource : public AudioFileSource {
   public:
        CoreAudioSource (ARDOUR::Session&, const XMLNode&);
-       CoreAudioSource (ARDOUR::Session&, const string& path_plus_channel, Flag);
+       CoreAudioSource (ARDOUR::Session&, const string& path, int chn, Flag);
        ~CoreAudioSource ();
 
+       void set_path (const std::string& p);
+
        float sample_rate() const;
-       int update_header (nframes_t when, struct tm&, time_t);
+       int update_header (framepos_t when, struct tm&, time_t);
 
        int flush_header () {return 0;};
        void set_header_timeline_position () {};
+       bool clamped_at_unity () const { return false; }
+
+       void flush () {}
 
        static int get_soundfile_info (string path, SoundFileInfo& _info, string& error_msg);
 
   protected:
-       nframes_t read_unlocked (Sample *dst, nframes_t start, nframes_t cnt) const;
-       nframes_t write_unlocked (Sample *dst, nframes_t cnt) { return 0; }
+       framecnt_t read_unlocked (Sample *dst, framepos_t start, framecnt_t cnt) const;
+       framecnt_t write_unlocked (Sample *, framecnt_t) { return 0; }
 
   private:
        mutable CAAudioFile af;
        uint16_t n_channels;
 
-       mutable float *tmpbuf;
-       mutable nframes_t tmpbufsize;
-       mutable Glib::Mutex _tmpbuf_lock;
-
-       void init (string str);
+       void init_cafile ();
+       int safe_read (Sample*, framepos_t start, framecnt_t cnt, AudioBufferList&) const;
 };
 
 }; /* namespace ARDOUR */