#include <fcntl.h>
#include <poll.h>
+#include <glibmm/thread.h>
+
#include <pbd/error.h>
-#include <pbd/lockmonitor.h>
#include <pbd/pthread_utils.h>
#include <ardour/configuration.h>
#include <ardour/audioengine.h>
#include <ardour/session.h>
-#include <ardour/diskstream.h>
+#include <ardour/audio_diskstream.h>
#include <ardour/crossfade.h>
#include <ardour/timestamps.h>
using namespace std;
using namespace ARDOUR;
-//using namespace sigc;
+using namespace PBD;
static float _read_data_rate;
static float _write_data_rate;
{
/* size is in Samples, not bytes */
- dstream_buffer_size = (uint32_t) floor (Config->get_track_buffer() * (float) frame_rate());
+ dstream_buffer_size = (uint32_t) floor (Config->get_track_buffer_seconds() * (float) frame_rate());
Crossfade::set_buffer_size (dstream_buffer_size);
- pthread_cond_init (&butler_paused, 0);
-
butler_should_run = false;
if (pipe (butler_request_pipe)) {
void
Session::schedule_butler_transport_work ()
{
- atomic_inc (&butler_should_do_transport_work);
+ g_atomic_int_inc (&butler_should_do_transport_work);
summon_butler ();
}
void
Session::stop_butler ()
{
- LockMonitor lm (butler_request_lock, __LINE__, __FILE__);
+ Glib::Mutex::Lock lm (butler_request_lock);
char c = ButlerRequest::Pause;
::write (butler_request_pipe[1], &c, 1);
- pthread_cond_wait (&butler_paused, butler_request_lock.mutex());
+ butler_paused.wait(butler_request_lock);
}
void
Session::wait_till_butler_finished ()
{
- LockMonitor lm (butler_request_lock, __LINE__, __FILE__);
+ Glib::Mutex::Lock lm (butler_request_lock);
char c = ButlerRequest::Wake;
::write (butler_request_pipe[1], &c, 1);
- pthread_cond_wait (&butler_paused, butler_request_lock.mutex());
+ butler_paused.wait(butler_request_lock);
}
void *
Session::_butler_thread_work (void* arg)
{
PBD::ThreadCreated (pthread_self(), X_("Butler"));
-
return ((Session *) arg)->butler_thread_work ();
return 0;
}
-#define transport_work_requested() atomic_read(&butler_should_do_transport_work)
+#define transport_work_requested() g_atomic_int_get(&butler_should_do_transport_work)
void *
Session::butler_thread_work ()
struct timeval begin, end;
struct pollfd pfd[1];
bool disk_work_outstanding = false;
- DiskStreamList::iterator i;
+ AudioDiskstreamList::iterator i;
- butler_mixdown_buffer = new Sample[DiskStream::disk_io_frames()];
- butler_gain_buffer = new gain_t[DiskStream::disk_io_frames()];
+ butler_mixdown_buffer = new Sample[AudioDiskstream::disk_io_frames()];
+ butler_gain_buffer = new gain_t[AudioDiskstream::disk_io_frames()];
+ // this buffer is used for temp conversion purposes in filesources
+ char * conv_buffer = conversion_buffer(ButlerContext);
while (true) {
<< endmsg;
break;
}
-
+
if (pfd[0].revents & ~POLLIN) {
error << _("Error on butler thread request pipe") << endmsg;
break;
case ButlerRequest::Wake:
break;
+
case ButlerRequest::Run:
butler_should_run = true;
break;
}
}
-// for (DiskStreamList::iterator i = diskstreams.begin(); i != diskstreams.end(); ++i) {
-// cerr << "BEFORE " << (*i)->name() << ": pb = " << (*i)->playback_buffer_load() << " cp = " << (*i)->capture_buffer_load() << endl;
-// }
+ for (i = audio_diskstreams.begin(); i != audio_diskstreams.end(); ++i) {
+ // cerr << "BEFORE " << (*i)->name() << ": pb = " << (*i)->playback_buffer_load() << " cp = " << (*i)->capture_buffer_load() << endl;
+ }
if (transport_work_requested()) {
butler_transport_work ();
gettimeofday (&begin, 0);
- for (i = diskstreams.begin(); !transport_work_requested() && butler_should_run && i != diskstreams.end(); ++i) {
+ Glib::RWLock::ReaderLock dsm (diskstream_lock);
+
+ for (i = audio_diskstreams.begin(); !transport_work_requested() && butler_should_run && i != audio_diskstreams.end(); ++i) {
// cerr << "rah fondr " << (*i)->io()->name () << endl;
- switch ((*i)->do_refill (butler_mixdown_buffer, butler_gain_buffer)) {
+ switch ((*i)->do_refill (butler_mixdown_buffer, butler_gain_buffer, conv_buffer)) {
case 0:
bytes += (*i)->read_data_count();
break;
}
- if (i != diskstreams.end()) {
+ if (i != audio_diskstreams.end()) {
/* we didn't get to all the streams */
disk_work_outstanding = true;
}
compute_io = true;
gettimeofday (&begin, 0);
- for (i = diskstreams.begin(); !transport_work_requested() && butler_should_run && i != diskstreams.end(); ++i) {
+ for (i = audio_diskstreams.begin(); !transport_work_requested() && butler_should_run && i != audio_diskstreams.end(); ++i) {
// cerr << "write behind for " << (*i)->name () << endl;
- switch ((*i)->do_flush ()) {
+ switch ((*i)->do_flush (conv_buffer)) {
case 0:
bytes += (*i)->write_data_count();
break;
request_stop ();
}
- if (i != diskstreams.end()) {
+ if (i != audio_diskstreams.end()) {
/* we didn't get to all the streams */
disk_work_outstanding = true;
}
{
- LockMonitor lm (butler_request_lock, __LINE__, __FILE__);
+ Glib::Mutex::Lock lm (butler_request_lock);
if (butler_should_run && (disk_work_outstanding || transport_work_requested())) {
-// for (DiskStreamList::iterator i = diskstreams.begin(); i != diskstreams.end(); ++i) {
+// for (AudioDiskstreamList::iterator i = audio_diskstreams.begin(); i != audio_diskstreams.end(); ++i) {
// cerr << "AFTER " << (*i)->name() << ": pb = " << (*i)->playback_buffer_load() << " cp = " << (*i)->capture_buffer_load() << endl;
// }
continue;
}
- pthread_cond_signal (&butler_paused);
+ butler_paused.signal();
}
}
void
-Session::request_overwrite_buffer (DiskStream* stream)
+Session::request_overwrite_buffer (AudioDiskstream* stream)
{
Event *ev = new Event (Event::Overwrite, Event::Add, Event::Immediate, 0, 0, 0.0);
ev->set_ptr (stream);
}
void
-Session::overwrite_some_buffers (DiskStream* ds)
+Session::overwrite_some_buffers (AudioDiskstream* ds)
{
/* executed by the audio thread */
} else {
- LockMonitor dm (diskstream_lock, __LINE__, __FILE__);
- for (DiskStreamList::iterator i = diskstreams.begin(); i != diskstreams.end(); ++i) {
+ Glib::RWLock::ReaderLock dm (diskstream_lock);
+ for (AudioDiskstreamList::iterator i = audio_diskstreams.begin(); i != audio_diskstreams.end(); ++i) {
(*i)->set_pending_overwrite (true);
}
}
uint32_t
Session::playback_load ()
{
- return (uint32_t) atomic_read (&_playback_load);
+ return (uint32_t) g_atomic_int_get (&_playback_load);
}
uint32_t
Session::capture_load ()
{
- return (uint32_t) atomic_read (&_capture_load);
+ return (uint32_t) g_atomic_int_get (&_capture_load);
}
uint32_t
Session::playback_load_min ()
{
- return (uint32_t) atomic_read (&_playback_load_min);
+ return (uint32_t) g_atomic_int_get (&_playback_load_min);
}
uint32_t
Session::capture_load_min ()
{
- return (uint32_t) atomic_read (&_capture_load_min);
+ return (uint32_t) g_atomic_int_get (&_capture_load_min);
}
void
Session::reset_capture_load_min ()
{
- atomic_set (&_capture_load_min, 100);
+ g_atomic_int_set (&_capture_load_min, 100);
}
void
Session::reset_playback_load_min ()
{
- atomic_set (&_playback_load_min, 100);
+ g_atomic_int_set (&_playback_load_min, 100);
}
projects / ardour.git / blobdiff