diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-12-12 14:43:24 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-12-12 14:43:24 +0000 |
| commit | bc89fe0147c04b67141936d109c00dfd4d69cc4b (patch) | |
| tree | 544ff450c40fe1f43853a8420228a26f27f1eafb /libs/appleutility | |
| parent | 30daaebaa2d90d6b0e8673143ccc3cacd7bd1753 (diff) | |
most of the 2.X->3.0 commit (up to rev 4299) except for gtk2_ardour/editor_canvas.cc; builds and runs and does a few specific things but expect it to be buggy for a while yet
git-svn-id: svn://localhost/ardour2/branches/3.0@4313 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/appleutility')
| -rw-r--r-- | libs/appleutility/CAAudioFile.h | 8 | ||||
| -rw-r--r-- | libs/appleutility/SConscript | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/libs/appleutility/CAAudioFile.h b/libs/appleutility/CAAudioFile.h index 2cfb4f3031..ce22bfe466 100644 --- a/libs/appleutility/CAAudioFile.h +++ b/libs/appleutility/CAAudioFile.h @@ -43,6 +43,7 @@ #ifndef __CAAudioFile_h__ #define __CAAudioFile_h__ +#include <iostream> #include <AvailabilityMacros.h> #if !defined(__COREAUDIO_USE_FLAT_INCLUDES__) @@ -98,6 +99,7 @@ public: // implementation-independent helpers void Open(const char *filePath) { FSRef fsref; + std::cerr << "Opening " << filePath << std::endl; XThrowIfError(FSPathMakeRef((UInt8 *)filePath, &fsref, NULL), "locate audio file"); Open(fsref); } @@ -112,9 +114,10 @@ public: // or the file's sample rate is 0 (unknown) #if CAAF_USE_EXTAUDIOFILE +#warning HERE WE ARE public: - CAAudioFile() : mExtAF(NULL) { } - virtual ~CAAudioFile() { if (mExtAF) Close(); } + CAAudioFile() : mExtAF(NULL) { std::cerr << "Constructing CAAudioFile\n"; } + virtual ~CAAudioFile() { std::cerr << "Destroying CAAudiofile @ " << this << std::endl; if (mExtAF) Close(); } void Open(const FSRef &fsref) { // open an existing file @@ -131,6 +134,7 @@ public: } void Close() { + std::cerr << "\tdisposeo of ext audio file @ " << mExtAF << std::endl; XThrowIfError(ExtAudioFileDispose(mExtAF), "ExtAudioFileClose failed"); mExtAF = NULL; } diff --git a/libs/appleutility/SConscript b/libs/appleutility/SConscript index c4f65ec81e..7a3a5c8975 100644 --- a/libs/appleutility/SConscript +++ b/libs/appleutility/SConscript @@ -4,7 +4,7 @@ import os import os.path import glob -appleutility_files = glob.glob('*.cpp') +appleutility_files = [ glob.glob('*.cpp') + glob.glob('*.c') + glob.glob('*.C') ] Import('env install_prefix') appleutility = env.Clone() |