projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treat VCA assign as a RouteGroup property.
[ardour.git]
/
libs
/
ardour
/
ardour
/
graph.h
diff --git
a/libs/ardour/ardour/graph.h
b/libs/ardour/ardour/graph.h
index b433580a54a9dec7aa32709ad56031f8d0206583..239f9ad1abec406c2976e2d1dc48d83cdad47221 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;
@@
-90,7
+89,7
@@
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 ();
@@
-102,12
+101,12
@@
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::
Process
Semaphore _callback_start_sem;
- PBD::
Process
Semaphore _callback_done_sem;
- PBD::
Process
Semaphore _cleanup_sem;
+ PBD::Semaphore _callback_start_sem;
+ PBD::Semaphore _callback_done_sem;
+ PBD::Semaphore _cleanup_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;
@@
-137,6
+136,10
@@
private:
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