ardour/livetrax
13
0
Fork 0
Code

Don't offer inputs to things as possible output connections, and vice versa (part of #4432).

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@10410 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-11-03 03:04:51 +00:00
parent 11d604dea3
commit 3e36dc7746
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/mixer_strip.cc
View File

@ -884,7 +884,7 @@ MixerStrip::maybe_add_bundle_to_input_menu (boost::shared_ptr<Bundle> b, ARDOUR:
{
using namespace Menu_Helpers;
if (b->ports_are_outputs() == false || b->nchannels() != _route->n_inputs()) {
if (b->ports_are_outputs() == false || b->nchannels() != _route->n_inputs() || *b == *_route->output()->bundle()) {
return;
}
@ -918,7 +918,7 @@ MixerStrip::maybe_add_bundle_to_output_menu (boost::shared_ptr<Bundle> b, ARDOUR
{
using namespace Menu_Helpers;
if (b->ports_are_inputs() == false || b->nchannels() != _route->n_outputs()) {
if (b->ports_are_inputs() == false || b->nchannels() != _route->n_outputs() || *b == *_route->input()->bundle()) {
return;
}

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

@ -114,6 +114,8 @@ class Bundle : public PBD::ScopedConnectionList
void suspend_signals ();
void resume_signals ();
bool operator== (Bundle const & other);
/** Things that might change about this bundle */
enum Change {
NameChanged = 0x1, ///< the bundle name or a channel name has changed

6
libs/ardour/bundle.cc
View File

@ -511,3 +511,9 @@ operator<< (ostream& os, Bundle const & b)
return os;
}
bool
Bundle::operator== (Bundle const & other)
{
return _channel == other._channel;
}