diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-08-08 22:36:32 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-08-08 22:36:32 +0000 |
| commit | bcc929a5b6760660d307c30da58efdd24c9411fb (patch) | |
| tree | 2394156d6c1a1f8f120c7d7f7cdd4bc6f98f0c7a /libs/ardour/coreaudiosource.cc | |
| parent | 9c6449567d2dc6ce65b99fc1f9e94fc11cccc743 (diff) | |
waf build works on OS X ; new bindings file and processing system in place for mnemonic-us
git-svn-id: svn://localhost/ardour2/branches/3.0@5498 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/coreaudiosource.cc')
| -rw-r--r-- | libs/ardour/coreaudiosource.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libs/ardour/coreaudiosource.cc b/libs/ardour/coreaudiosource.cc index 95cae8c4ee..d9d1f01601 100644 --- a/libs/ardour/coreaudiosource.cc +++ b/libs/ardour/coreaudiosource.cc @@ -38,14 +38,16 @@ using namespace ARDOUR; using namespace PBD; CoreAudioSource::CoreAudioSource (Session& s, const XMLNode& node) - : AudioFileSource (s, node) + : Source (s, node), + AudioFileSource (s, node) { init (); } -CoreAudioSource::CoreAudioSource (Session& s, const string& path, int chn, Flag flags) +CoreAudioSource::CoreAudioSource (Session& s, const string& path, bool, int chn, Flag flags) /* files created this way are never writable or removable */ - : AudioFileSource (s, path, + : Source (s, DataType::AUDIO, path, Source::Flag (flags & ~(Writable|Removable|RemovableIfEmpty|RemoveAtDestroy))), + AudioFileSource (s, path, Source::Flag (flags & ~(Writable|Removable|RemovableIfEmpty|RemoveAtDestroy))) { _channel = chn; @@ -138,7 +140,7 @@ CoreAudioSource::safe_read (Sample* dst, nframes_t start, nframes_t cnt, AudioBu nframes_t -CoreAudioSource::read_unlocked (Sample *dst, nframes_t start, nframes_t cnt) const +CoreAudioSource::read_unlocked (Sample *dst, sframes_t start, nframes_t cnt) const { nframes_t file_cnt; AudioBufferList abl; @@ -217,7 +219,7 @@ CoreAudioSource::sample_rate() const } int -CoreAudioSource::update_header (nframes_t when, struct tm&, time_t) +CoreAudioSource::update_header (sframes_t when, struct tm&, time_t) { return 0; } |