smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 19:56:31 +01:00
Code Issues Projects Releases Wiki Activity

click reset error fixed, plus some older work on sends+panners i/o counts

Browse source 
git-svn-id: svn://localhost/ardour2/trunk@2456 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2007-09-11 11:27:59 +00:00
parent 11a4c2804e
commit 80ee9e6e13
4 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libs/ardour/ardour/send.h
View file

@ -56,7 +56,7 @@ class Send : public IOProcessor
XMLNode& get_state(void);
int set_state(const XMLNode& node);
uint32_t pans_required() const { return _expected_inputs.n_audio(); }
uint32_t pans_required() const { return _configured_input.n_audio(); }
virtual bool can_support_input_configuration (ChanCount in) const;
virtual ChanCount output_for_input_configuration (ChanCount in) const;
@ -66,7 +66,6 @@ class Send : public IOProcessor
private:
bool _metering;
ChanCount _expected_inputs;
uint32_t bitslot;
};

7
libs/ardour/route.cc
View file

@ -1221,6 +1221,8 @@ Route::apply_some_plugin_counts (list<ProcessorCount>& iclist)
for (i = iclist.begin(); i != iclist.end(); ++i) {
cerr << "now applying for " << (*i).processor->name() << " in = " << (*i).in.n_audio() << " out = " << (*i).out.n_audio() << endl;
if ((*i).processor->configure_io ((*i).in, (*i).out)) {
return -1;
}
@ -1249,6 +1251,9 @@ Route::check_some_plugin_counts (list<ProcessorCount>& iclist, ChanCount require
for (i = iclist.begin(); i != iclist.end(); ++i) {
cerr << "Checking whether " << (*i).processor->name() << " can support " << required_inputs.n_audio() << " inputs\n";
if ((*i).processor->can_support_input_configuration (required_inputs) < 0) {
if (err) {
err->index = index;
@ -1260,6 +1265,8 @@ Route::check_some_plugin_counts (list<ProcessorCount>& iclist, ChanCount require
(*i).in = required_inputs;
(*i).out = (*i).processor->output_for_input_configuration (required_inputs);
cerr << "config looks like " << (*i).processor->name() << " in = " << (*i).in.n_audio() << " out = " << (*i).out.n_audio() << endl;
required_inputs = (*i).out;
++index;

10
libs/ardour/send.cc
View file

@ -212,11 +212,17 @@ Send::configure_io (ChanCount in, ChanCount out)
ChanCount
Send::output_streams() const
{
return _io->n_outputs ();
// this method reflects the idea that from the perspective of the Route's ProcessorList,
// a send is just a passthrough. that doesn't match what the Send actually does with its
// data, but since what it does is invisible to the Route, it appears to be a passthrough.
return _configured_input;
}
ChanCount
Send::input_streams() const
{
return _io->n_outputs (); // (sic)
return _configured_input;
}

2
libs/ardour/session_click.cc
View file

@ -144,7 +144,7 @@ Session::setup_click_sounds (int which)
click_data = 0;
}
string path = Config->get_click_emphasis_sound();
string path = Config->get_click_sound();
if (path.empty()) {