smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-13 10:06:33 +01:00
Code Issues Projects Releases Wiki Activity

Coding style tinkering.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@10464 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-11-05 17:58:35 +00:00
parent 8f78fad338
commit c1386bafce
2 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

30
libs/ardour/graph.cc
View file

@ -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 ();

3
libs/ardour/route.cc
View file

@ -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)