ardour/livetrax
13
0
Fork 0
Code

more style-guidification

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7233 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-06-04 12:11:18 +00:00
parent 15f1d68e9f
commit 5f1e6f089f
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libs/ardour/graph.cc
View File

@ -143,7 +143,7 @@ Graph::prep()
} }
void void
Graph::trigger (GraphNode * n) Graph::trigger (GraphNode* n)
{ {
pthread_mutex_lock (&_trigger_mutex); pthread_mutex_lock (&_trigger_mutex);
_trigger_queue.push_back( n); _trigger_queue.push_back( n);
@ -188,7 +188,7 @@ Graph::restart_cycle()
} }
static bool static bool
is_feedback (boost::shared_ptr<RouteList> routelist, Route * from, boost::shared_ptr<Route> to) is_feedback (boost::shared_ptr<RouteList> routelist, Route* from, boost::shared_ptr<Route> to)
{ {
for (RouteList::iterator ri=routelist->begin(); ri!=routelist->end(); ri++) { for (RouteList::iterator ri=routelist->begin(); ri!=routelist->end(); ri++) {
if ((*ri).get() == from) if ((*ri).get() == from)
@ -201,7 +201,7 @@ is_feedback (boost::shared_ptr<RouteList> routelist, Route * from, boost::shared
} }
static bool static bool
is_feedback (boost::shared_ptr<RouteList> routelist, boost::shared_ptr<Route> from, Route * to) is_feedback (boost::shared_ptr<RouteList> routelist, boost::shared_ptr<Route> from, Route* to)
{ {
for (RouteList::iterator ri=routelist->begin(); ri!=routelist->end(); ri++) { for (RouteList::iterator ri=routelist->begin(); ri!=routelist->end(); ri++) {
if ((*ri).get() == to) if ((*ri).get() == to)
@ -244,27 +244,26 @@ Graph::rechain (boost::shared_ptr<RouteList> routelist)
boost::shared_ptr<Route> rp = boost::dynamic_pointer_cast<Route>( *ni); boost::shared_ptr<Route> rp = boost::dynamic_pointer_cast<Route>( *ni);
for (RouteList::iterator ri=routelist->begin(); ri!=routelist->end(); ri++) for (RouteList::iterator ri=routelist->begin(); ri!=routelist->end(); ri++) {
{ if (rp->direct_feeds (*ri)) {
if (rp->direct_feeds (*ri)) if (is_feedback (routelist, rp.get(), *ri)) {
{
if (is_feedback (routelist, rp.get(), *ri))
continue; continue;
}
has_output = true; has_output = true;
(*ni)->_activation_set[chain].insert (boost::dynamic_pointer_cast<GraphNode> (*ri) ); (*ni)->_activation_set[chain].insert (boost::dynamic_pointer_cast<GraphNode> (*ri) );
} }
} }
for (Route::FedBy::iterator fi=rp->fed_by().begin(); fi!=rp->fed_by().end(); fi++) for (Route::FedBy::iterator fi=rp->fed_by().begin(); fi!=rp->fed_by().end(); fi++) {
{ if (boost::shared_ptr<Route> r = fi->r.lock()) {
if (boost::shared_ptr<Route> r = fi->r.lock()) if (!is_feedback (routelist, r, rp.get())) {
if (!is_feedback (routelist, r, rp.get() ))
has_input = true; has_input = true;
}
}
} }
for (node_set_t::iterator ai=(*ni)->_activation_set[chain].begin(); ai!=(*ni)->_activation_set[chain].end(); ai++) for (node_set_t::iterator ai=(*ni)->_activation_set[chain].begin(); ai!=(*ni)->_activation_set[chain].end(); ai++) {
{
(*ai)->_init_refcount[chain] += 1; (*ai)->_init_refcount[chain] += 1;
} }
@ -284,7 +283,7 @@ Graph::rechain (boost::shared_ptr<RouteList> routelist)
bool bool
Graph::run_one() Graph::run_one()
{ {
GraphNode * to_run; GraphNode* to_run;
pthread_mutex_lock (&_trigger_mutex); pthread_mutex_lock (&_trigger_mutex);
if (_trigger_queue.size()) { if (_trigger_queue.size()) {
@ -483,7 +482,7 @@ Graph::routes_no_roll (nframes_t nframes, framepos_t start_frame, framepos_t end
return _process_retval; return _process_retval;
} }
void void
Graph::process_one_route (Route * route) Graph::process_one_route (Route* route)
{ {
bool need_butler = false; bool need_butler = false;
int retval; int retval;