smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 07:45:00 +01:00
Code Issues Projects Releases Wiki Activity

NO-OP: whitespace

Browse source
This commit is contained in:
Robin Gareus 2021-06-12 00:45:25 +02:00
parent ef72afb963
commit 1ed0e88e23
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
1 changed files with 17 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

36
libs/ardour/buffer_manager.cc
View file

@ -28,9 +28,9 @@
using namespace ARDOUR; using namespace ARDOUR;
using namespace PBD; using namespace PBD;
RingBufferNPT<ThreadBuffers*>* BufferManager::thread_buffers = 0; RingBufferNPT<ThreadBuffers*>* BufferManager::thread_buffers = 0;
std::list<ThreadBuffers*>* BufferManager::thread_buffers_list = 0; std::list<ThreadBuffers*>* BufferManager::thread_buffers_list = 0;
Glib::Threads::Mutex BufferManager::rb_mutex; Glib::Threads::Mutex BufferManager::rb_mutex;
using std::cerr; using std::cerr;
using std::endl; using std::endl;
@ -38,49 +38,47 @@ using std::endl;
void void
BufferManager::init (uint32_t size) BufferManager::init (uint32_t size)
{ {
thread_buffers = new ThreadBufferFIFO (size+1); // must be one larger than requested thread_buffers = new ThreadBufferFIFO (size + 1); // must be one larger than requested
thread_buffers_list = new ThreadBufferList; thread_buffers_list = new ThreadBufferList;
/* and populate with actual ThreadBuffers /* and populate with actual ThreadBuffers */
*/
for (uint32_t n = 0; n < size; ++n) { for (uint32_t n = 0; n < size; ++n) {
ThreadBuffers* ts = new ThreadBuffers; ThreadBuffers* ts = new ThreadBuffers;
thread_buffers->write (&ts, 1); thread_buffers->write (&ts, 1);
thread_buffers_list->push_back (ts); thread_buffers_list->push_back (ts);
} }
// cerr << "Initialized thread buffers, readable count now " << thread_buffers->read_space() << endl; // cerr << "Initialized thread buffers, readable count now " << thread_buffers->read_space() << endl;
} }
ThreadBuffers* ThreadBuffers*
BufferManager::get_thread_buffers () BufferManager::get_thread_buffers ()
{ {
Glib::Threads::Mutex::Lock em (rb_mutex); Glib::Threads::Mutex::Lock em (rb_mutex);
ThreadBuffers* tbp; ThreadBuffers* tbp;
if (thread_buffers->read (&tbp, 1) == 1) { if (thread_buffers->read (&tbp, 1) == 1) {
// cerr << "Got thread buffers, readable count now " << thread_buffers->read_space() << endl; // cerr << "Got thread buffers, readable count now " << thread_buffers->read_space() << endl;
return tbp; return tbp;
} }
return 0; return 0;
} }
void void
BufferManager::put_thread_buffers (ThreadBuffers* tbp) BufferManager::put_thread_buffers (ThreadBuffers* tbp)
{ {
Glib::Threads::Mutex::Lock em (rb_mutex); Glib::Threads::Mutex::Lock em (rb_mutex);
thread_buffers->write (&tbp, 1); thread_buffers->write (&tbp, 1);
// cerr << "Put back thread buffers, readable count now " << thread_buffers->read_space() << endl; // cerr << "Put back thread buffers, readable count now " << thread_buffers->read_space() << endl;
} }
void void
BufferManager::ensure_buffers (ChanCount howmany, size_t custom) BufferManager::ensure_buffers (ChanCount howmany, size_t custom)
{ {
/* this is protected by the audioengine's process lock: we do not */ /* this is protected by the audioengine's process lock: we do not */
for (ThreadBufferList::iterator i = thread_buffers_list->begin(); i != thread_buffers_list->end(); ++i) { for (ThreadBufferList::iterator i = thread_buffers_list->begin (); i != thread_buffers_list->end (); ++i) {
(*i)->ensure_buffers (howmany, custom); (*i)->ensure_buffers (howmany, custom);
} }
} }