Fixes to port inserts.
git-svn-id: svn://localhost/ardour2/branches/3.0@4514 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
bd66734a59
commit
6f14394c95
|
@ -58,7 +58,7 @@ class PortInsert : public IOProcessor
|
||||||
ChanCount output_streams() const;
|
ChanCount output_streams() const;
|
||||||
ChanCount input_streams() const;
|
ChanCount input_streams() const;
|
||||||
|
|
||||||
bool can_support_io_configuration (const ChanCount& in, ChanCount& out) const { return true; }
|
bool can_support_io_configuration (const ChanCount& in, ChanCount& out) const;
|
||||||
bool configure_io (ChanCount in, ChanCount out);
|
bool configure_io (ChanCount in, ChanCount out);
|
||||||
|
|
||||||
uint32_t bit_slot() const { return bitslot; }
|
uint32_t bit_slot() const { return bitslot; }
|
||||||
|
|
|
@ -212,3 +212,9 @@ PortInsert::input_streams() const
|
||||||
return _io->n_outputs ();
|
return _io->n_outputs ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool
|
||||||
|
PortInsert::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
|
||||||
|
{
|
||||||
|
out = in;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
|
@ -1602,7 +1602,7 @@ Route::_reset_processor_counts (ProcessorStreams* err)
|
||||||
plugin_insert->set_count (1);
|
plugin_insert->set_count (1);
|
||||||
|
|
||||||
} else if ((port_insert = boost::dynamic_pointer_cast<PortInsert>(*r)) != 0) {
|
} else if ((port_insert = boost::dynamic_pointer_cast<PortInsert>(*r)) != 0) {
|
||||||
|
|
||||||
++insert_cnt;
|
++insert_cnt;
|
||||||
proc_map[(*r)->placement()].push_back (ProcessorCount (*r));
|
proc_map[(*r)->placement()].push_back (ProcessorCount (*r));
|
||||||
|
|
||||||
|
@ -1635,7 +1635,7 @@ Route::_reset_processor_counts (ProcessorStreams* err)
|
||||||
if (!proc_map[PreFader].empty()) {
|
if (!proc_map[PreFader].empty()) {
|
||||||
previous_initial_streams = n_inputs ();
|
previous_initial_streams = n_inputs ();
|
||||||
for (list<ProcessorCount>::iterator i = proc_map[PreFader].begin(); i != proc_map[PreFader].end(); i++) {
|
for (list<ProcessorCount>::iterator i = proc_map[PreFader].begin(); i != proc_map[PreFader].end(); i++) {
|
||||||
if (i->processor->can_support_io_configuration (previous_initial_streams, initial_streams) < 0) {
|
if (i->processor->can_support_io_configuration (previous_initial_streams, initial_streams) == false) {
|
||||||
goto streamcount;
|
goto streamcount;
|
||||||
}
|
}
|
||||||
previous_initial_streams = initial_streams;
|
previous_initial_streams = initial_streams;
|
||||||
|
@ -1650,7 +1650,7 @@ Route::_reset_processor_counts (ProcessorStreams* err)
|
||||||
|
|
||||||
if (!proc_map[PostFader].empty()) {
|
if (!proc_map[PostFader].empty()) {
|
||||||
for (list<ProcessorCount>::iterator i = proc_map[PostFader].begin(); i != proc_map[PostFader].end(); i++) {
|
for (list<ProcessorCount>::iterator i = proc_map[PostFader].begin(); i != proc_map[PostFader].end(); i++) {
|
||||||
if (i->processor->can_support_io_configuration (previous_initial_streams, initial_streams) < 0) {
|
if (i->processor->can_support_io_configuration (previous_initial_streams, initial_streams) == false) {
|
||||||
goto streamcount;
|
goto streamcount;
|
||||||
}
|
}
|
||||||
previous_initial_streams = initial_streams;
|
previous_initial_streams = initial_streams;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user