projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor LTC File decoder, prepare for Lua bindings
[ardour.git]
/
libs
/
ardour
/
ardour
/
graph.h
diff --git
a/libs/ardour/ardour/graph.h
b/libs/ardour/ardour/graph.h
index b433580a54a9dec7aa32709ad56031f8d0206583..e6eae0750d7e7bce34e7c9eea530841f3fda4d39 100644
(file)
--- a/
libs/ardour/ardour/graph.h
+++ b/
libs/ardour/ardour/graph.h
@@
-29,7
+29,6
@@
#include <boost/shared_ptr.hpp>
#include <glib.h>
#include <boost/shared_ptr.hpp>
#include <glib.h>
-#include <cassert>
#include "pbd/semutils.h"
#include "pbd/semutils.h"
@@
-46,7
+45,7
@@
class Graph;
class Route;
class Session;
class Route;
class Session;
-class GraphEdges;
+class GraphEdges;
typedef boost::shared_ptr<GraphNode> node_ptr_t;
typedef boost::shared_ptr<GraphNode> node_ptr_t;
@@
-58,27
+57,17
@@
class LIBARDOUR_API Graph : public SessionHandleRef
public:
Graph (Session & session);
public:
Graph (Session & session);
- void prep();
void trigger (GraphNode * n);
void rechain (boost::shared_ptr<RouteList>, GraphEdges const &);
void dump (int chain);
void trigger (GraphNode * n);
void rechain (boost::shared_ptr<RouteList>, GraphEdges const &);
void dump (int chain);
- void process();
void dec_ref();
void dec_ref();
- void restart_cycle();
- bool run_one();
void helper_thread();
void helper_thread();
- void main_thread();
-
- int silent_process_routes (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
- bool& need_butler);
- int process_routes (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, int declick,
- bool& need_butler);
+ int process_routes (pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample, bool& need_butler);
- int routes_no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
- bool non_rt_pending, int declick);
+ int routes_no_roll (pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample, bool non_rt_pending );
void process_one_route (Route * route);
void process_one_route (Route * route);
@@
-90,10
+79,14
@@
protected:
virtual void session_going_away ();
private:
virtual void session_going_away ();
private:
- volatile bool _
quit_threads
;
+ volatile bool _
threads_active
;
void reset_thread_list ();
void drop_threads ();
void reset_thread_list ();
void drop_threads ();
+ void restart_cycle();
+ bool run_one();
+ void main_thread();
+ void prep();
node_list_t _nodes_rt[2];
node_list_t _nodes_rt[2];
@@
-102,12
+95,11
@@
private:
std::vector<GraphNode *> _trigger_queue;
pthread_mutex_t _trigger_mutex;
std::vector<GraphNode *> _trigger_queue;
pthread_mutex_t _trigger_mutex;
- PBD::
Process
Semaphore _execution_sem;
+ PBD::Semaphore _execution_sem;
/** Signalled to start a run of the graph for a process callback */
/** Signalled to start a run of the graph for a process callback */
- PBD::ProcessSemaphore _callback_start_sem;
- PBD::ProcessSemaphore _callback_done_sem;
- PBD::ProcessSemaphore _cleanup_sem;
+ PBD::Semaphore _callback_start_sem;
+ PBD::Semaphore _callback_done_sem;
/** The number of processing threads that are asleep */
volatile gint _execution_tokens;
/** The number of processing threads that are asleep */
volatile gint _execution_tokens;
@@
-127,16
+119,18
@@
private:
// parameter caches.
pframes_t _process_nframes;
// parameter caches.
pframes_t _process_nframes;
-
framepos_t _process_start_fram
e;
-
framepos_t _process_end_fram
e;
+
samplepos_t _process_start_sampl
e;
+
samplepos_t _process_end_sampl
e;
bool _process_can_record;
bool _process_non_rt_pending;
bool _process_can_record;
bool _process_non_rt_pending;
- int _process_declick;
- bool _process_silent;
bool _process_noroll;
int _process_retval;
bool _process_need_butler;
bool _process_noroll;
int _process_retval;
bool _process_need_butler;
+
+ // enginer / thread connection
+ PBD::ScopedConnectionList engine_connections;
+ void engine_stopped ();
};
} // namespace
};
} // namespace