diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2008-03-17 20:54:03 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-03-17 20:54:03 +0000 |
commit | 997e4b1f9cd7ccfc704b7c035051da7f60d831e7 (patch) | |
tree | 1236e40183b677abf4a2882e4cfe8e0a345eb24d /libs/ardour/ardour/coreaudiosource.h | |
parent | 19a4b990325577fc949ccd5d5fbad4520eb1df56 (diff) |
merge with 2.0-ongoing @ rev 3147
git-svn-id: svn://localhost/ardour2/branches/3.0@3152 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/coreaudiosource.h')
-rw-r--r-- | libs/ardour/ardour/coreaudiosource.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libs/ardour/ardour/coreaudiosource.h b/libs/ardour/ardour/coreaudiosource.h index ad21188531..d7282b35bd 100644 --- a/libs/ardour/ardour/coreaudiosource.h +++ b/libs/ardour/ardour/coreaudiosource.h @@ -21,7 +21,6 @@ #define __coreaudio_source_h__ #include <appleutility/CAAudioFile.h> - #include <ardour/audiofilesource.h> namespace ARDOUR { @@ -48,11 +47,8 @@ class CoreAudioSource : public AudioFileSource { mutable CAAudioFile af; uint16_t n_channels; - mutable float *tmpbuf; - mutable nframes_t tmpbufsize; - mutable Glib::Mutex _tmpbuf_lock; - void init (); + int safe_read (Sample*, nframes_t start, nframes_t cnt, AudioBufferList&) const; }; }; /* namespace ARDOUR */ |