diff options
author | Carl Hetherington <carl@carlh.net> | 2011-11-05 17:58:35 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2011-11-05 17:58:35 +0000 |
commit | c1386bafcec57a056911ad9363aa468d35657029 (patch) | |
tree | aa09ff5cf80a06b0d4d97533a595722e4b56a51d /libs/ardour | |
parent | 8f78fad338ad59dfad48f3d1418d607580e39a98 (diff) |
Coding style tinkering.
git-svn-id: svn://localhost/ardour2/branches/3.0@10464 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour')
-rw-r--r-- | libs/ardour/graph.cc | 30 | ||||
-rw-r--r-- | libs/ardour/route.cc | 3 |
2 files changed, 19 insertions, 14 deletions
diff --git a/libs/ardour/graph.cc b/libs/ardour/graph.cc index 9dfc611e17..aea4b2cccf 100644 --- a/libs/ardour/graph.cc +++ b/libs/ardour/graph.cc @@ -223,7 +223,7 @@ Graph::prep() /* Trigger the initial nodes for processing, which are the ones at the `input' end */ for (i=_init_trigger_list[chain].begin(); i!=_init_trigger_list[chain].end(); i++) { - this->trigger( i->get() ); + trigger (i->get ()); } } @@ -247,7 +247,7 @@ Graph::dec_ref() the graph, so there is nothing more to do this time around. */ - this->restart_cycle(); + restart_cycle (); } } @@ -266,7 +266,7 @@ Graph::restart_cycle() return; } - this->prep(); + prep (); if (_graph_empty) { goto again; @@ -280,12 +280,14 @@ static bool is_feedback (boost::shared_ptr<RouteList> routelist, Route* from, boost::shared_ptr<Route> to) { for (RouteList::iterator ri=routelist->begin(); ri!=routelist->end(); ri++) { - if ((*ri).get() == from) + if ((*ri).get() == from) { return false; - if ((*ri) == to) + } + if ((*ri) == to) { return true; + } } - assert(0); + return false; } @@ -293,12 +295,14 @@ static bool is_feedback (boost::shared_ptr<RouteList> routelist, boost::shared_ptr<Route> from, Route* to) { for (RouteList::iterator ri=routelist->begin(); ri!=routelist->end(); ri++) { - if ((*ri).get() == to) + if ((*ri).get() == to) { return true; - if ((*ri) == from) + } + if ((*ri) == from) { return false; + } } - assert(0); + return false; } @@ -377,11 +381,13 @@ Graph::rechain (boost::shared_ptr<RouteList> routelist) (*ai)->_init_refcount[chain] += 1; } - if (!has_input) + if (!has_input) { _init_trigger_list[chain].push_back (*ni); + } - if (!has_output) + if (!has_output) { _init_finished_refcount[chain] += 1; + } } _pending_chain = chain; @@ -502,7 +508,7 @@ Graph::main_thread() return; } - this->prep(); + prep (); if (_graph_empty && !_quit_threads) { _callback_done_sem.signal (); diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 7521f183da..0b5ccdc53d 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -65,7 +65,6 @@ #include "ardour/session.h" #include "ardour/timestamps.h" #include "ardour/utils.h" -#include "ardour/graph.h" #include "ardour/unknown_processor.h" #include "ardour/capturing_processor.h" @@ -82,7 +81,7 @@ PBD::Signal0<void> Route::RemoteControlIDChange; Route::Route (Session& sess, string name, Flag flg, DataType default_type) : SessionObject (sess, name) , Automatable (sess) - , GraphNode( sess.route_graph ) + , GraphNode (sess.route_graph) , _active (true) , _signal_latency (0) , _initial_delay (0) |