projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
copy plugin state to all instances when instantiating.
[ardour.git]
/
libs
/
ardour
/
buffer_manager.cc
diff --git
a/libs/ardour/buffer_manager.cc
b/libs/ardour/buffer_manager.cc
index f9c73d5b3eceb6fc142c3a7d9a39b0abb24ec8d1..c221837af88ddef013ca597ecf1ec8a272f348e0 100644
(file)
--- a/
libs/ardour/buffer_manager.cc
+++ b/
libs/ardour/buffer_manager.cc
@@
-18,6
+18,9
@@
*/
#include <iostream>
*/
#include <iostream>
+
+#include "pbd/compose.h"
+
#include "ardour/buffer_manager.h"
#include "ardour/thread_buffers.h"
#include "ardour/buffer_manager.h"
#include "ardour/thread_buffers.h"
@@
-26,7
+29,10
@@
using namespace PBD;
RingBufferNPT<ThreadBuffers*>* BufferManager::thread_buffers = 0;
std::list<ThreadBuffers*>* BufferManager::thread_buffers_list = 0;
RingBufferNPT<ThreadBuffers*>* BufferManager::thread_buffers = 0;
std::list<ThreadBuffers*>* BufferManager::thread_buffers_list = 0;
-Glib::StaticMutex BufferManager::rb_mutex = GLIBMM_STATIC_MUTEX_INIT;
+Glib::Threads::Mutex BufferManager::rb_mutex;
+
+using std::cerr;
+using std::endl;
void
BufferManager::init (uint32_t size)
void
BufferManager::init (uint32_t size)
@@
-34,23
+40,26
@@
BufferManager::init (uint32_t size)
thread_buffers = new ThreadBufferFIFO (size+1); // must be one larger than requested
thread_buffers_list = new ThreadBufferList;
thread_buffers = new ThreadBufferFIFO (size+1); // must be one larger than requested
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;
thread_buffers->write (&ts, 1);
thread_buffers_list->push_back (ts);
}
ThreadBuffers* ts = new ThreadBuffers;
thread_buffers->write (&ts, 1);
thread_buffers_list->push_back (ts);
}
+ // cerr << "Initialized thread buffers, readable count now " << thread_buffers->read_space() << endl;
+
}
ThreadBuffers*
BufferManager::get_thread_buffers ()
{
}
ThreadBuffers*
BufferManager::get_thread_buffers ()
{
- Glib::Mutex::Lock em (rb_mutex);
+ Glib::
Threads::
Mutex::Lock em (rb_mutex);
ThreadBuffers* tbp;
if (thread_buffers->read (&tbp, 1) == 1) {
ThreadBuffers* tbp;
if (thread_buffers->read (&tbp, 1) == 1) {
+ // cerr << "Got thread buffers, readable count now " << thread_buffers->read_space() << endl;
return tbp;
}
return tbp;
}
@@
-60,16
+69,17
@@
BufferManager::get_thread_buffers ()
void
BufferManager::put_thread_buffers (ThreadBuffers* tbp)
{
void
BufferManager::put_thread_buffers (ThreadBuffers* tbp)
{
- Glib::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;
}
void
}
void
-BufferManager::ensure_buffers (ChanCount howmany)
+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) {
- (*i)->ensure_buffers (howmany);
+ for (ThreadBufferList::iterator i = thread_buffers_list->begin(); i != thread_buffers_list
->
end(); ++i) {
+ (*i)->ensure_buffers (howmany
, custom
);
}
}
}
}