#include <pbd/convert.h>
#include <pbd/enumwriter.h>
+#include <pbd/replace_all.h>
#include <gtkmm2ext/gtk_ui.h>
#include <gtkmm2ext/utils.h>
#include <ardour/session.h>
#include <ardour/audioengine.h>
#include <ardour/route.h>
+#include <ardour/route_group.h>
#include <ardour/audio_track.h>
#include <ardour/audio_diskstream.h>
#include <ardour/panner.h>
#include <ardour/processor.h>
#include <ardour/profile.h>
#include <ardour/ladspa_plugin.h>
-#include <ardour/auto_bundle.h>
#include <ardour/user_bundle.h>
#include "ardour_ui.h"
comment_window = 0;
comment_area = 0;
_width_owner = 0;
+ spacer = 0;
- width_button.add (*(manage (new Gtk::Image (::get_icon("strip_width")))));
- hide_button.add (*(manage (new Gtk::Image (::get_icon("hide")))));
+ Gtk::Image* img;
+
+ img = manage (new Gtk::Image (::get_icon("strip_width")));
+ img->show ();
+
+ width_button.add (*img);
+
+ img = manage (new Gtk::Image (::get_icon("hide")));
+ img->show ();
+
+ hide_button.add (*img);
input_label.set_text (_("Input"));
- ARDOUR_UI::instance()->set_tip (&input_button, _("Click to choose inputs"), "");
+ ARDOUR_UI::instance()->set_tip (&input_button, _("Button 1 to choose inputs from a port matrix, button 3 to select inputs from a menu"), "");
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, _("Click to choose outputs"), "");
+ 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);
global_vpacker.set_border_width (0);
global_vpacker.set_spacing (0);
- VBox *whvbox = manage (new VBox);
-
width_button.set_name ("MixerWidthButton");
hide_button.set_name ("MixerHideButton");
top_event_box.set_name ("MixerTopEventBox");
width_hide_box.pack_start (width_button, false, true);
width_hide_box.pack_start (top_event_box, true, true);
width_hide_box.pack_end (hide_button, false, true);
- Gtk::Alignment *gain_meter_alignment = Gtk::manage(new Gtk::Alignment());
- gain_meter_alignment->set_padding(0, 4, 0, 0);
- gain_meter_alignment->add(gpm);
+ gain_meter_alignment.set_padding(0, 4, 0, 0);
+ gain_meter_alignment.add(gpm);
- whvbox->pack_start (width_hide_box, true, true);
+ whvbox.pack_start (width_hide_box, true, true);
- global_vpacker.pack_start (*whvbox, Gtk::PACK_SHRINK);
+ global_vpacker.pack_start (whvbox, Gtk::PACK_SHRINK);
global_vpacker.pack_start (button_table,Gtk::PACK_SHRINK);
global_vpacker.pack_start (pre_processor_box, true, true);
global_vpacker.pack_start (middle_button_table,Gtk::PACK_SHRINK);
- global_vpacker.pack_start (*gain_meter_alignment,Gtk::PACK_SHRINK);
+ global_vpacker.pack_start (gain_meter_alignment,Gtk::PACK_SHRINK);
global_vpacker.pack_start (bottom_button_table,Gtk::PACK_SHRINK);
global_vpacker.pack_start (post_processor_box, true, true);
if (!is_midi_track()) {
{
GoingAway(); /* EMIT_SIGNAL */
- if (input_selector) {
- delete input_selector;
- }
-
- if (output_selector) {
- delete output_selector;
- }
+ delete input_selector;
+ delete output_selector;
}
void
RouteUI::set_route (rt);
+ delete input_selector;
+ input_selector = 0;
+
+ delete output_selector;
+ output_selector = 0;
+
panners.set_io (rt);
gpm.set_io (rt);
pre_processor_box.set_route (rt);
scrollbar_height = requisition.height;
}
- EventBox* spacer = manage (new EventBox);
+ spacer = manage (new EventBox);
spacer->set_size_request (-1, scrollbar_height);
global_vpacker.pack_start (*spacer, false, false);
}
#endif /* VARISPEED_IN_MIXER_STRIP */
button_table.attach (*rec_enable_button, 0, 2, 2, 3);
+ rec_enable_button->show();
}
if (_route->phase_invert()) {
meter_point_label.set_text (_("post"));
break;
}
+
+ delete route_ops_menu;
+ route_ops_menu = 0;
ARDOUR_UI::instance()->tooltips().set_tip (comment_button, _route->comment().empty() ?
_("Click to Add/Edit Comments"):
/* we don't allow master or control routes to be hidden */
hide_button.show();
}
+
width_button.show();
width_hide_box.show();
+ whvbox.show ();
global_frame.show();
global_vpacker.show();
button_table.show();
middle_button_table.show();
bottom_button_table.show();
+ pre_processor_box.show_all ();
+ gpm.show_all ();
+ panners.show_all ();
+ gain_meter_alignment.show ();
+ post_processor_box.show_all ();
gain_unit_button.show();
gain_unit_label.show();
meter_point_button.show();
speed_label.show();
speed_frame.show();
- show();
+ show ();
}
void
switch (w) {
case Wide:
- set_size_request (-1, -1);
-
+
if (rec_enable_button) {
- ((Gtk::Label*)rec_enable_button->get_child())->set_text (_("record"));
+ ((Gtk::Label*)rec_enable_button->get_child())->set_text (_("Record"));
}
((Gtk::Label*)mute_button->get_child())->set_text (_("Mute"));
((Gtk::Label*)solo_button->get_child())->set_text (_("Solo"));
if (_route->comment() == "") {
comment_button.unset_bg (STATE_NORMAL);
- ((Gtk::Label*)comment_button.get_child())->set_text (_("comments"));
+ ((Gtk::Label*)comment_button.get_child())->set_text (_("Comments"));
} else {
comment_button.modify_bg (STATE_NORMAL, color());
- ((Gtk::Label*)comment_button.get_child())->set_text (_("*comments*"));
+ ((Gtk::Label*)comment_button.get_child())->set_text (_("*Comments*"));
}
((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (gpm.astyle_string(gain_automation->automation_style()));
((Gtk::Label*)panners.pan_automation_style_button.get_child())->set_text (panners.astyle_string(_route->panner().automation_style()));
((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text (panners.astate_string(_route->panner().automation_state()));
Gtkmm2ext::set_size_request_to_display_given_text (name_button, "long", 2, 2);
+ set_size_request (-1, -1);
break;
case Narrow:
set_size_request (max (50, gpm.get_gm_width()), -1);
break;
}
-
update_input_display ();
update_output_display ();
mix_group_changed (0);
name_changed ();
-
+#ifdef GTKOSX
+ WidthChanged();
+#endif
}
void
switch (ev->button) {
case 1:
+ edit_output_configuration ();
+ break;
+
+ case 3:
{
output_menu.set_name ("ArdourContextMenu");
citems.clear();
- citems.push_back (MenuElem (_("Edit"), mem_fun(*this, &MixerStrip::edit_output_configuration)));
- citems.push_back (SeparatorElem());
citems.push_back (MenuElem (_("Disconnect"), mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_output)));
citems.push_back (SeparatorElem());
- std::vector<boost::shared_ptr<Bundle> > current = _route->bundles_connected_to_outputs ();
+ ARDOUR::BundleList current = _route->bundles_connected_to_outputs ();
- _session.foreach_bundle (
- bind (mem_fun (*this, &MixerStrip::add_bundle_to_output_menu), current)
- );
+ boost::shared_ptr<ARDOUR::BundleList> b = _session.bundles ();
+ for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) {
+ 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);
break;
}
-
+
default:
break;
}
switch (ev->button) {
case 1:
+ edit_input_configuration ();
+ break;
+
+ case 3:
{
- citems.push_back (MenuElem (_("Edit"), mem_fun(*this, &MixerStrip::edit_input_configuration)));
- citems.push_back (SeparatorElem());
citems.push_back (MenuElem (_("Disconnect"), mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_input)));
citems.push_back (SeparatorElem());
- std::vector<boost::shared_ptr<Bundle> > current = _route->bundles_connected_to_inputs ();
+ ARDOUR::BundleList current = _route->bundles_connected_to_inputs ();
- _session.foreach_bundle (
- bind (mem_fun (*this, &MixerStrip::add_bundle_to_input_menu), current)
- );
+ boost::shared_ptr<ARDOUR::BundleList> b = _session.bundles ();
+ for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) {
+ 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);
break;
}
void
-MixerStrip::bundle_input_
chosen (boost::shared_ptr<ARDOUR::Bundle> c)
+MixerStrip::bundle_input_
toggled (boost::shared_ptr<ARDOUR::Bundle> c)
{
- if (!ignore_toggle) {
+ if (ignore_toggle) {
+ return;
+ }
- try {
- _route->connect_input_ports_to_bundle (c, this);
- }
+ ARDOUR::BundleList current = _route->bundles_connected_to_inputs ();
- catch (AudioEngine::PortRegistrationFailure& err) {
- error << _("could not register new ports required for that bundle")
- << endmsg;
- }
+ if (std::find (current.begin(), current.end(), c) == current.end()) {
+ _route->connect_input_ports_to_bundle (c, this);
+ } else {
+ _route->disconnect_input_ports_from_bundle (c, this);
}
}
void
-MixerStrip::bundle_output_
chosen (boost::shared_ptr<ARDOUR::Bundle> c)
+MixerStrip::bundle_output_
toggled (boost::shared_ptr<ARDOUR::Bundle> c)
{
- if (!ignore_toggle) {
+ if (ignore_toggle) {
+ return;
+ }
- try {
- _route->connect_output_ports_to_bundle (c, this);
- }
+ ARDOUR::BundleList current = _route->bundles_connected_to_outputs ();
- catch (AudioEngine::PortRegistrationFailure& err) {
- error << _("could not register new ports required for that bundle")
- << endmsg;
- }
+ if (std::find (current.begin(), current.end(), c) == current.end()) {
+ _route->connect_output_ports_to_bundle (c, this);
+ } else {
+ _route->disconnect_output_ports_from_bundle (c, this);
}
}
void
-MixerStrip::add_bundle_to_input_menu (boost::shared_ptr<Bundle> b, std::vector<boost::shared_ptr<Bundle> > 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()) {
-
- citems.push_back (CheckMenuElem (b->name(), bind (mem_fun(*this, &MixerStrip::bundle_input_chosen), 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, std::vector<boost::shared_ptr<Bundle> > 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()) {
-
- MenuList& citems = output_menu.items();
- citems.push_back (CheckMenuElem (b->name(), bind (mem_fun(*this, &MixerStrip::bundle_output_chosen), 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;
}
}
void
MixerStrip::update_input_display ()
{
- std::vector<boost::shared_ptr<ARDOUR::Bundle> > 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:
void
MixerStrip::update_output_display ()
{
- std::vector<boost::shared_ptr<ARDOUR::Bundle> > 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) {
MixerStrip::build_route_ops_menu ()
{
using namespace Menu_Helpers;
- route_ops_menu = manage (new Menu);
+ route_ops_menu = new Menu;
route_ops_menu->set_name ("ArdourContextMenu");
MenuList& items = route_ops_menu->items();
denormal_menu_item = dynamic_cast<CheckMenuItem *> (&items.back());
denormal_menu_item->set_active (_route->denormal_protection());
- build_remote_control_menu ();
-
- items.push_back (SeparatorElem());
if (!Profile->get_sae()) {
- items.push_back (MenuElem (_("Remote Control ID"), *remote_control_menu));
+ build_remote_control_menu ();
+ items.push_back (SeparatorElem());
+ items.push_back (MenuElem (_("Remote Control ID"), *remote_control_menu));
}
items.push_back (SeparatorElem());
gint
MixerStrip::name_button_button_press (GdkEventButton* ev)
{
- if (ev->button == 1) {
+ if (ev->button == 1 || ev->button == 3) {
list_route_operations ();
Menu_Helpers::MenuList& items = route_ops_menu->items();
void
MixerStrip::hide_redirect_editors ()
{
- _route->foreach_processor (this, &MixerStrip::hide_processor_editor);
+ _route->foreach_processor (mem_fun (*this, &MixerStrip::hide_processor_editor));
}
void
-MixerStrip::hide_processor_editor (boost::shared_ptr<Processor> processor)
+MixerStrip::hide_processor_editor (boost::weak_ptr<Processor> p)
{
+ boost::shared_ptr<Processor> processor (p.lock ());
+ if (!processor) {
+ return;
+ }
+
void* gui = processor->get_gui ();
if (gui) {
projects / ardour.git / blobdiff