ardour/livetrax
13
0
Fork 0
Code

Revert inadvertantly committed stuff from 10322.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@10323 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-10-28 00:31:09 +00:00
parent 0a87941c70
commit 947422c095
2 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/ardour/route.h
View File

@ -468,7 +468,6 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember,
bool _solo_safe;
DataType _default_type;
FedBy _fed_by;
FedBy _direct_fed_by;
virtual ChanCount input_streams () const;
@ -500,7 +499,6 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember,
private:
int _set_state_2X (const XMLNode&, int);
void set_processor_state_2X (XMLNodeList const &, int);
bool sub_feeds (FedBy const &, boost::shared_ptr<Route>, bool* via_send_only = 0);
static uint32_t order_key_cnt;

43
libs/ardour/route.cc
View File

@ -2673,7 +2673,7 @@ Route::clear_fed_by ()
}
bool
Route::sub_feeds (Fedby const & fed_by, boost::shared_ptr<Route> other, bool* via_sends_only)
Route::feeds (boost::shared_ptr<Route> other, bool* via_sends_only)
{
const FedBy& fed_by (other->fed_by());
@ -2694,15 +2694,42 @@ Route::sub_feeds (Fedby const & fed_by, boost::shared_ptr<Route> other, bool* vi
}
bool
Route::feeds (boost::shared_ptr<Route> other, bool* via_sends_only)
Route::direct_feeds (boost::shared_ptr<Route> other, bool* only_send)
{
return sub_feeds (other->fed_by (), other, via_sends_only);
}
DEBUG_TRACE (DEBUG::Graph, string_compose ("Feeds? %1\n", _name));
bool
Route::direct_feeds (boost::shared_ptr<Route> other, bool* via_sends_only)
{
return sub_feeds (other->direct_fed_by (), other, via_sends_only);
if (_output->connected_to (other->input())) {
DEBUG_TRACE (DEBUG::Graph, string_compose ("\tdirect FEEDS %2\n", other->name()));
if (only_send) {
*only_send = false;
}
return true;
}
for (ProcessorList::iterator r = _processors.begin(); r != _processors.end(); ++r) {
boost::shared_ptr<IOProcessor> iop;
if ((iop = boost::dynamic_pointer_cast<IOProcessor>(*r)) != 0) {
if (iop->feeds (other)) {
DEBUG_TRACE (DEBUG::Graph, string_compose ("\tIOP %1 does feed %2\n", iop->name(), other->name()));
if (only_send) {
*only_send = true;
}
return true;
} else {
DEBUG_TRACE (DEBUG::Graph, string_compose ("\tIOP %1 does NOT feed %2\n", iop->name(), other->name()));
}
} else {
DEBUG_TRACE (DEBUG::Graph, string_compose ("\tPROC %1 is not an IOP\n", (*r)->name()));
}
}
DEBUG_TRACE (DEBUG::Graph, string_compose ("\tdoes NOT feed %1\n", other->name()));
return false;
}
/** Called from the (non-realtime) butler thread when the transport is stopped */