projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mega-commit to save state of first "it compilesand links" state for separated disk...
[ardour.git]
/
libs
/
ardour
/
ardour
/
butler.h
diff --git
a/libs/ardour/ardour/butler.h
b/libs/ardour/ardour/butler.h
index 21af5fb69158a217354b9fd4307a8db93b277010..3c254648ffa9ccb132e2f47bab878655b769994d 100644
(file)
--- a/
libs/ardour/ardour/butler.h
+++ b/
libs/ardour/ardour/butler.h
@@
-20,14
+20,19
@@
#ifndef __ardour_butler_h__
#define __ardour_butler_h__
#ifndef __ardour_butler_h__
#define __ardour_butler_h__
+#include <pthread.h>
+
#include <glibmm/threads.h>
#include <glibmm/threads.h>
+#include "pbd/crossthread.h"
#include "pbd/ringbuffer.h"
#include "pbd/pool.h"
#include "ardour/libardour_visibility.h"
#include "ardour/types.h"
#include "ardour/session_handle.h"
#include "pbd/ringbuffer.h"
#include "pbd/pool.h"
#include "ardour/libardour_visibility.h"
#include "ardour/types.h"
#include "ardour/session_handle.h"
+
+
namespace ARDOUR {
/**
namespace ARDOUR {
/**
@@
-52,10
+57,14
@@
class LIBARDOUR_API Butler : public SessionHandleRef
bool transport_work_requested() const;
void drop_references ();
bool transport_work_requested() const;
void drop_references ();
+ void map_parameters ();
+
framecnt_t audio_diskstream_capture_buffer_size() const { return audio_dstream_capture_buffer_size; }
framecnt_t audio_diskstream_playback_buffer_size() const { return audio_dstream_playback_buffer_size; }
uint32_t midi_diskstream_buffer_size() const { return midi_dstream_buffer_size; }
framecnt_t audio_diskstream_capture_buffer_size() const { return audio_dstream_capture_buffer_size; }
framecnt_t audio_diskstream_playback_buffer_size() const { return audio_dstream_playback_buffer_size; }
uint32_t midi_diskstream_buffer_size() const { return midi_dstream_buffer_size; }
+ bool flush_tracks_to_disk_after_locate (boost::shared_ptr<RouteList>, uint32_t& errors);
+
static void* _thread_work(void *arg);
void* thread_work();
static void* _thread_work(void *arg);
void* thread_work();
@@
-68,19
+77,29
@@
class LIBARDOUR_API Butler : public SessionHandleRef
};
pthread_t thread;
};
pthread_t thread;
+ bool have_thread;
Glib::Threads::Mutex request_lock;
Glib::Threads::Cond paused;
bool should_run;
mutable gint should_do_transport_work;
Glib::Threads::Mutex request_lock;
Glib::Threads::Cond paused;
bool should_run;
mutable gint should_do_transport_work;
- int request_pipe[2];
framecnt_t audio_dstream_capture_buffer_size;
framecnt_t audio_dstream_playback_buffer_size;
uint32_t midi_dstream_buffer_size;
framecnt_t audio_dstream_capture_buffer_size;
framecnt_t audio_dstream_playback_buffer_size;
uint32_t midi_dstream_buffer_size;
- RingBuffer<CrossThreadPool*> pool_trash;
+
PBD::
RingBuffer<CrossThreadPool*> pool_trash;
private:
void empty_pool_trash ();
void config_changed (std::string);
private:
void empty_pool_trash ();
void config_changed (std::string);
+
+ bool flush_tracks_to_disk_normal (boost::shared_ptr<RouteList>, uint32_t& errors);
+
+ /**
+ * Add request to butler thread request queue
+ */
+ void queue_request (Request::Type r);
+
+ CrossThreadChannel _xthread;
+
};
} // namespace ARDOUR
};
} // namespace ARDOUR