projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Save LV2 presets with relative URIs to their own bundle, in the same style as Jalv.
[ardour.git]
/
libs
/
ardour
/
process_thread.cc
diff --git
a/libs/ardour/process_thread.cc
b/libs/ardour/process_thread.cc
index 58d51bef4e3d75a9d869eee7f22794e9460d03db..e10ccf160ce78e4eb22ee92a681b54b54770ecd4 100644
(file)
--- a/
libs/ardour/process_thread.cc
+++ b/
libs/ardour/process_thread.cc
@@
-18,7
+18,7
@@
*/
#include <iostream>
*/
#include <iostream>
-#include "ardour/audioengine.h"
+
#include "ardour/buffer.h"
#include "ardour/buffer_manager.h"
#include "ardour/buffer_set.h"
#include "ardour/buffer.h"
#include "ardour/buffer_manager.h"
#include "ardour/buffer_set.h"
@@
-29,22
+29,20
@@
using namespace ARDOUR;
using namespace Glib;
using namespace std;
using namespace Glib;
using namespace std;
-Private<ThreadBuffers>* ProcessThread::_private_thread_buffers = 0;
-
static void
release_thread_buffer (void* arg)
{
BufferManager::put_thread_buffers ((ThreadBuffers*) arg);
}
static void
release_thread_buffer (void* arg)
{
BufferManager::put_thread_buffers ((ThreadBuffers*) arg);
}
+Glib::Threads::Private<ThreadBuffers> ProcessThread::_private_thread_buffers (release_thread_buffer);
+
void
ProcessThread::init ()
{
void
ProcessThread::init ()
{
- _private_thread_buffers = new Private<ThreadBuffers> (release_thread_buffer);
}
ProcessThread::ProcessThread ()
}
ProcessThread::ProcessThread ()
- : _thread (0)
{
}
{
}
@@
-58,22
+56,22
@@
ProcessThread::get_buffers ()
ThreadBuffers* tb = BufferManager::get_thread_buffers ();
assert (tb);
ThreadBuffers* tb = BufferManager::get_thread_buffers ();
assert (tb);
- _private_thread_buffers
->
set (tb);
+ _private_thread_buffers
.
set (tb);
}
void
ProcessThread::drop_buffers ()
{
}
void
ProcessThread::drop_buffers ()
{
- ThreadBuffers* tb = _private_thread_buffers
->
get();
+ ThreadBuffers* tb = _private_thread_buffers
.
get();
assert (tb);
BufferManager::put_thread_buffers (tb);
assert (tb);
BufferManager::put_thread_buffers (tb);
- _private_thread_buffers
->
set (0);
+ _private_thread_buffers
.
set (0);
}
BufferSet&
ProcessThread::get_silent_buffers (ChanCount count)
{
}
BufferSet&
ProcessThread::get_silent_buffers (ChanCount count)
{
- ThreadBuffers* tb = _private_thread_buffers
->
get();
+ ThreadBuffers* tb = _private_thread_buffers
.
get();
assert (tb);
BufferSet* sb = tb->silent_buffers;
assert (tb);
BufferSet* sb = tb->silent_buffers;
@@
-94,7
+92,7
@@
ProcessThread::get_silent_buffers (ChanCount count)
BufferSet&
ProcessThread::get_scratch_buffers (ChanCount count)
{
BufferSet&
ProcessThread::get_scratch_buffers (ChanCount count)
{
- ThreadBuffers* tb = _private_thread_buffers
->
get();
+ ThreadBuffers* tb = _private_thread_buffers
.
get();
assert (tb);
BufferSet* sb = tb->scratch_buffers;
assert (tb);
BufferSet* sb = tb->scratch_buffers;
@@
-113,7
+111,7
@@
ProcessThread::get_scratch_buffers (ChanCount count)
BufferSet&
ProcessThread::get_mix_buffers (ChanCount count)
{
BufferSet&
ProcessThread::get_mix_buffers (ChanCount count)
{
- ThreadBuffers* tb = _private_thread_buffers
->
get();
+ ThreadBuffers* tb = _private_thread_buffers
.
get();
assert (tb);
BufferSet* mb = tb->mix_buffers;
assert (tb);
BufferSet* mb = tb->mix_buffers;
@@
-127,7
+125,7
@@
ProcessThread::get_mix_buffers (ChanCount count)
gain_t*
ProcessThread::gain_automation_buffer()
{
gain_t*
ProcessThread::gain_automation_buffer()
{
- ThreadBuffers* tb = _private_thread_buffers
->
get();
+ ThreadBuffers* tb = _private_thread_buffers
.
get();
assert (tb);
gain_t *g = tb->gain_automation_buffer;
assert (tb);
gain_t *g = tb->gain_automation_buffer;
@@
-135,10
+133,21
@@
ProcessThread::gain_automation_buffer()
return g;
}
return g;
}
+gain_t*
+ProcessThread::send_gain_automation_buffer()
+{
+ ThreadBuffers* tb = _private_thread_buffers.get();
+ assert (tb);
+
+ gain_t* g = tb->send_gain_automation_buffer;
+ assert (g);
+ return g;
+}
+
pan_t**
ProcessThread::pan_automation_buffer()
{
pan_t**
ProcessThread::pan_automation_buffer()
{
- ThreadBuffers* tb = _private_thread_buffers
->
get();
+ ThreadBuffers* tb = _private_thread_buffers
.
get();
assert (tb);
pan_t** p = tb->pan_automation_buffer;
assert (tb);
pan_t** p = tb->pan_automation_buffer;