diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-04-23 17:48:37 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-04-23 17:48:37 +0000 |
| commit | 28368793415ba934132994d8c10a5e149c1a8d9d (patch) | |
| tree | 818d5f406e0c9b6f95f43faae0ff88d885a59ad6 /libs/ardour/session.cc | |
| parent | 0a22716b74d52fcbef37bebf529048f7f3bc79e0 (diff) | |
remove offset from process callback tree. some breakage may have occured. yes, really.
git-svn-id: svn://localhost/ardour2/branches/3.0@4999 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session.cc')
| -rw-r--r-- | libs/ardour/session.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index f2e1b2a730..e2e38a17c5 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -92,12 +92,6 @@ using namespace ARDOUR; using namespace PBD; using boost::shared_ptr; -#ifdef __x86_64__ -static const int CPU_CACHE_ALIGN = 64; -#else -static const int CPU_CACHE_ALIGN = 16; /* arguably 32 on most arches, but it matters less */ -#endif - bool Session::_disable_all_loaded_plugins = false; sigc::signal<void,std::string> Session::Dialog; @@ -3847,15 +3841,18 @@ Session::tempo_map_changed (Change ignored) void Session::ensure_buffers (ChanCount howmany) { - if (current_block_size == 0) + if (current_block_size == 0) { return; // too early? (is this ok?) + } // We need at least 2 MIDI scratch buffers to mix/merge - if (howmany.n_midi() < 2) + if (howmany.n_midi() < 2) { howmany.set_midi(2); + } // FIXME: JACK needs to tell us maximum MIDI buffer size // Using nasty assumption (max # events == nframes) for now + _scratch_buffers->ensure_buffers(howmany, current_block_size); _mix_buffers->ensure_buffers(howmany, current_block_size); _silent_buffers->ensure_buffers(howmany, current_block_size); |