ardour/livetrax
13
0
Fork 0
Code

Offer routes on mixer strip IO menus. Fixes to these menus on MIDI routes.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@4528 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2009-02-11 02:14:01 +00:00
parent a192ccaebc
commit 567f37f8eb
3 changed files with 91 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
gtk2_ardour/mixer_strip.cc
View File

@ -23,6 +23,7 @@
#include <pbd/convert.h>
#include <pbd/enumwriter.h>
#include <pbd/replace_all.h>
#include <gtkmm2ext/gtk_ui.h>
#include <gtkmm2ext/utils.h>
@ -158,12 +159,14 @@ MixerStrip::init ()
input_button.add (input_label);
input_button.set_name ("MixerIOButton");
input_label.set_name ("MixerIOButtonLabel");
Gtkmm2ext::set_size_request_to_display_given_text (input_button, "longest label", 4, 4);
output_label.set_text (_("Output"));
ARDOUR_UI::instance()->set_tip (&output_button, _("Button 1 to choose outputs from a port matrix, button 3 to select inputs from a menu"), "");
output_button.add (output_label);
output_button.set_name ("MixerIOButton");
output_label.set_name ("MixerIOButtonLabel");
Gtkmm2ext::set_size_request_to_display_given_text (output_button, "longest label", 4, 4);
ARDOUR_UI::instance()->set_tip (&meter_point_button, _("Select metering point"), "");
meter_point_button.add (meter_point_label);
@ -636,7 +639,17 @@ MixerStrip::output_press (GdkEventButton *ev)
boost::shared_ptr<ARDOUR::BundleList> b = _session.bundles ();
for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) {
add_bundle_to_output_menu (*i, current);
maybe_add_bundle_to_output_menu (*i, current);
}
boost::shared_ptr<ARDOUR::RouteList> routes = _session.get_routes ();
for (ARDOUR::RouteList::const_iterator i = routes->begin(); i != routes->end(); ++i) {
maybe_add_bundle_to_output_menu ((*i)->bundle_for_inputs(), current);
}
if (citems.size() == 2) {
/* no routes added; remove the separator */
citems.pop_back ();
}
output_menu.popup (1, ev->time);
@ -707,7 +720,17 @@ MixerStrip::input_press (GdkEventButton *ev)
boost::shared_ptr<ARDOUR::BundleList> b = _session.bundles ();
for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) {
add_bundle_to_input_menu (*i, current);
maybe_add_bundle_to_input_menu (*i, current);
}
boost::shared_ptr<ARDOUR::RouteList> routes = _session.get_routes ();
for (ARDOUR::RouteList::const_iterator i = routes->begin(); i != routes->end(); ++i) {
maybe_add_bundle_to_input_menu ((*i)->bundle_for_outputs(), current);
}
if (citems.size() == 2) {
/* no routes added; remove the separator */
citems.pop_back ();
}
input_menu.popup (1, ev->time);
@ -752,51 +775,54 @@ MixerStrip::bundle_output_toggled (boost::shared_ptr<ARDOUR::Bundle> c)
}
void
MixerStrip::add_bundle_to_input_menu (boost::shared_ptr<Bundle> b, ARDOUR::BundleList const & current)
MixerStrip::maybe_add_bundle_to_input_menu (boost::shared_ptr<Bundle> b, ARDOUR::BundleList const & current)
{
using namespace Menu_Helpers;
/* the input menu needs to contain only output bundles (that we
can connect inputs to */
if (b->ports_are_outputs() == false) {
if (b->ports_are_outputs() == false ||
route()->default_type() != b->type() ||
b->nchannels() != _route->n_inputs().get (b->type ())) {
return;
}
MenuList& citems = input_menu.items();
if (b->nchannels() == _route->n_inputs().get (b->type ())) {
citems.push_back (CheckMenuElem (b->name(), bind (mem_fun(*this, &MixerStrip::bundle_input_toggled), b)));
if (std::find (current.begin(), current.end(), b) != current.end()) {
ignore_toggle = true;
dynamic_cast<CheckMenuItem *> (&citems.back())->set_active (true);
ignore_toggle = false;
}
std::string n = b->name ();
replace_all (n, "_", " ");
citems.push_back (CheckMenuElem (n, bind (mem_fun(*this, &MixerStrip::bundle_input_toggled), b)));
if (std::find (current.begin(), current.end(), b) != current.end()) {
ignore_toggle = true;
dynamic_cast<CheckMenuItem *> (&citems.back())->set_active (true);
ignore_toggle = false;
}
}
void
MixerStrip::add_bundle_to_output_menu (boost::shared_ptr<Bundle> b, ARDOUR::BundleList const & current)
MixerStrip::maybe_add_bundle_to_output_menu (boost::shared_ptr<Bundle> b, ARDOUR::BundleList const & current)
{
using namespace Menu_Helpers;
/* the output menu needs to contain only input bundles (that we
can connect outputs to */
if (b->ports_are_inputs() == false) {
if (b->ports_are_inputs() == false ||
route()->default_type() != b->type() ||
b->nchannels() != _route->n_outputs().get (b->type ())) {
return;
}
if (b->nchannels() == _route->n_outputs().get (b->type ())) {
MenuList& citems = output_menu.items();
citems.push_back (CheckMenuElem (b->name(), bind (mem_fun(*this, &MixerStrip::bundle_output_toggled), b)));
if (std::find (current.begin(), current.end(), b) != current.end()) {
ignore_toggle = true;
dynamic_cast<CheckMenuItem *> (&citems.back())->set_active (true);
ignore_toggle = false;
}
MenuList& citems = output_menu.items();
std::string n = b->name ();
replace_all (n, "_", " ");
citems.push_back (CheckMenuElem (n, bind (mem_fun(*this, &MixerStrip::bundle_output_toggled), b)));
if (std::find (current.begin(), current.end(), b) != current.end()) {
ignore_toggle = true;
dynamic_cast<CheckMenuItem *> (&citems.back())->set_active (true);
ignore_toggle = false;
}
}
@ -840,11 +866,12 @@ MixerStrip::connect_to_pan ()
void
MixerStrip::update_input_display ()
{
ARDOUR::BundleList c = _route->bundles_connected_to_inputs ();
ARDOUR::BundleList const c = _route->bundles_connected_to_inputs ();
/* XXX: how do we represent >1 connected bundle? */
if (c.empty() == false) {
input_label.set_text (c[0]->name());
if (c.size() > 1) {
input_label.set_text (_("Inputs"));
} else if (c.size() == 1) {
input_label.set_text (c[0]->name ());
} else {
switch (_width) {
case Wide:
@ -861,10 +888,12 @@ MixerStrip::update_input_display ()
void
MixerStrip::update_output_display ()
{
ARDOUR::BundleList c = _route->bundles_connected_to_outputs ();
ARDOUR::BundleList const c = _route->bundles_connected_to_outputs ();
/* XXX: how do we represent >1 connected bundle? */
if (c.empty() == false) {
if (c.size() > 1) {
output_label.set_text (_("Outputs"));
} else if (c.size() == 1) {
output_label.set_text (c[0]->name());
} else {
switch (_width) {

4
gtk2_ardour/mixer_strip.h
View File

@ -178,10 +178,10 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
gint output_press (GdkEventButton *);
Gtk::Menu input_menu;
void add_bundle_to_input_menu (boost::shared_ptr<ARDOUR::Bundle>, ARDOUR::BundleList const &);
void maybe_add_bundle_to_input_menu (boost::shared_ptr<ARDOUR::Bundle>, ARDOUR::BundleList const &);
Gtk::Menu output_menu;
void add_bundle_to_output_menu (boost::shared_ptr<ARDOUR::Bundle>, ARDOUR::BundleList const &);
void maybe_add_bundle_to_output_menu (boost::shared_ptr<ARDOUR::Bundle>, ARDOUR::BundleList const &);
void bundle_input_toggled (boost::shared_ptr<ARDOUR::Bundle>);
void bundle_output_toggled (boost::shared_ptr<ARDOUR::Bundle>);

48
libs/ardour/io.cc
View File

@ -2621,7 +2621,9 @@ IO::setup_bundle_for_inputs ()
}
_bundle_for_inputs->suspend_signals ();
_bundle_for_inputs->set_type (default_type ());
_bundle_for_inputs->remove_channels ();
snprintf(buf, sizeof (buf), _("%s in"), _name.c_str());
@ -2647,6 +2649,8 @@ IO::setup_bundle_for_outputs ()
_bundle_for_outputs->suspend_signals ();
_bundle_for_outputs->set_type (default_type ());
_bundle_for_outputs->remove_channels ();
snprintf(buf, sizeof (buf), _("%s out"), _name.c_str());
@ -2672,23 +2676,22 @@ IO::bundles_connected_to_inputs ()
bundles.push_back (i->bundle);
}
/* Normal bundles */
/* Session bundles */
boost::shared_ptr<ARDOUR::BundleList> b = _session.bundles ();
for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) {
if ((*i)->ports_are_outputs() == false || (*i)->nchannels() != n_inputs().n_total()) {
continue;
}
for (uint32_t j = 0; j < n_inputs().n_total(); ++j) {
Bundle::PortList const& pl = (*i)->channel_ports (j);
if (!pl.empty() && input(j)->connected_to (pl[0])) {
bundles.push_back (*i);
}
if ((*i)->connected_to (_bundle_for_inputs, _session.engine())) {
bundles.push_back (*i);
}
}
/* Route bundles */
boost::shared_ptr<ARDOUR::RouteList> r = _session.get_routes ();
for (ARDOUR::RouteList::iterator i = r->begin(); i != r->end(); ++i) {
if ((*i)->bundle_for_outputs()->connected_to (_bundle_for_inputs, _session.engine())) {
bundles.push_back ((*i)->bundle_for_outputs());
}
}
return bundles;
}
@ -2704,20 +2707,19 @@ IO::bundles_connected_to_outputs ()
bundles.push_back (i->bundle);
}
/* Auto bundles */
/* Session bundles */
boost::shared_ptr<ARDOUR::BundleList> b = _session.bundles ();
for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) {
if ((*i)->ports_are_inputs() == false || (*i)->nchannels() != n_outputs().n_total()) {
continue;
if ((*i)->connected_to (_bundle_for_outputs, _session.engine())) {
bundles.push_back (*i);
}
}
for (uint32_t j = 0; j < n_outputs().n_total(); ++j) {
Bundle::PortList const& pl = (*i)->channel_ports (j);
if (!pl.empty() && output(j)->connected_to (pl[0])) {
bundles.push_back (*i);
}
/* Route bundles */
boost::shared_ptr<ARDOUR::RouteList> r = _session.get_routes ();
for (ARDOUR::RouteList::iterator i = r->begin(); i != r->end(); ++i) {
if ((*i)->bundle_for_inputs()->connected_to (_bundle_for_outputs, _session.engine())) {
bundles.push_back ((*i)->bundle_for_inputs());
}
}