diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-01-21 19:44:33 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-01-21 19:44:33 +0000 |
| commit | 4f07564b353cbf548589a2538afb3e4405ac5951 (patch) | |
| tree | aea46d4e5cce014068d8399d77656be12c3dc4f4 | |
| parent | 52204ca987c42e49b8adecaa0584db2b02f4b3b2 (diff) | |
use correct number of buffers when setting up data for an AudioUnit plugin
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@6530 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | libs/ardour/audio_unit.cc | 3 | ||||
| -rw-r--r-- | libs/ardour/audioengine.cc | 1 | ||||
| -rw-r--r-- | libs/ardour/route.cc | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/libs/ardour/audio_unit.cc b/libs/ardour/audio_unit.cc index 49f02d9bca..b2933b2a09 100644 --- a/libs/ardour/audio_unit.cc +++ b/libs/ardour/audio_unit.cc @@ -1019,8 +1019,7 @@ AUPlugin::render_callback(AudioUnitRenderActionFlags *ioActionFlags, error << _("AUPlugin: render callback called illegally!") << endmsg; return kAudioUnitErr_CannotDoInCurrentContext; } - - for (uint32_t i = 0; i < current_maxbuf; ++i) { + for (uint32_t i = 0; i < ioData->mNumberBuffers; ++i) { ioData->mBuffers[i].mNumberChannels = 1; ioData->mBuffers[i].mDataByteSize = sizeof (Sample) * inNumberFrames; ioData->mBuffers[i].mData = (*current_buffers)[i] + cb_offset + current_offset; diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index e60e7f7957..a4381a748f 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -428,7 +428,6 @@ AudioEngine::jack_bufsize_callback (nframes_t nframes) _usecs_per_cycle = (int) floor ((((double) nframes / frame_rate())) * 1000000.0); last_monitor_check = 0; - cerr << "bufsize: Set Port buffer size to " << nframes << endl; Port::set_buffer_size (nframes); boost::shared_ptr<Ports> p = ports.reader(); diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index a62d1a4953..4e8d4d954c 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -2266,7 +2266,7 @@ Route::handle_transport_stopped (bool abort_ignored, bool did_locate, bool can_f if (Config->get_plugins_stop_with_transport() && can_flush_redirects) { (*i)->deactivate (); (*i)->activate (); - } + } (*i)->transport_stopped (now); } |