#include <gtkmm2ext/gtk_ui.h>
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/choice.h>
-#include <gtkmm2ext/stop_signal.h>
#include <gtkmm2ext/doi.h>
#include <gtkmm2ext/slider_controller.h>
#include <gtkmm2ext/bindable_button.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/send.h"
#include "ardour/processor.h"
#include "ardour/profile.h"
#include "ardour/ladspa_plugin.h"
#include "ardour/user_bundle.h"
+#include "ardour/port.h"
#include "ardour_ui.h"
#include "ardour_dialog.h"
#include "mixer_strip.h"
#include "mixer_ui.h"
#include "keyboard.h"
+#include "led.h"
#include "public_editor.h"
#include "send_ui.h"
#include "io_selector.h"
#include "i18n.h"
-using namespace sigc;
using namespace ARDOUR;
using namespace PBD;
using namespace Gtk;
sigc::signal<void,boost::shared_ptr<Route> > MixerStrip::SwitchIO;
int MixerStrip::scrollbar_height = 0;
+PBD::Signal1<void,MixerStrip*> MixerStrip::CatchDeletion;
-MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, bool in_mixer)
+MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
: AxisView(sess)
, RouteUI (sess)
- ,_mixer(mx)
+ , _mixer(mx)
, _mixer_owned (in_mixer)
- , processor_box (sess, sigc::mem_fun(*this, &MixerStrip::plugin_selector), mx.selection(), this, in_mixer)
+ , processor_box (sess, boost::bind (&MixerStrip::plugin_selector, this), mx.selection(), this, in_mixer)
, gpm (sess, 250)
, panners (sess)
, _mono_button (_("Mono"))
- , button_table (3, 2)
+ , button_table (4, 2)
+ , solo_led_table (2, 2)
, middle_button_table (1, 2)
, bottom_button_table (1, 2)
, meter_point_label (_("pre"))
}
}
-MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt, bool in_mixer)
+MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr<Route> rt, bool in_mixer)
: AxisView(sess)
, RouteUI (sess)
- ,_mixer(mx)
+ , _mixer(mx)
, _mixer_owned (in_mixer)
, processor_box (sess, sigc::mem_fun(*this, &MixerStrip::plugin_selector), mx.selection(), this, in_mixer)
, gpm (sess, 250)
, panners (sess)
+ , _mono_button (_("Mono"))
, button_table (3, 2)
, middle_button_table (1, 2)
, bottom_button_table (1, 2)
, comment_button (_("Comments"))
{
init ();
- set_button_names ();
set_route (rt);
}
mute_button->set_name ("MixerMuteButton");
solo_button->set_name ("MixerSoloButton");
+ solo_isolated_led = manage (new LED);
+ solo_isolated_led->show ();
+ solo_isolated_led->set_diameter (6);
+ solo_isolated_led->set_no_show_all (true);
+ solo_isolated_led->set_name (X_("SoloIsolatedLED"));
+ solo_isolated_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
+ solo_isolated_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_isolate_button_release));
+ UI::instance()->set_tip (solo_isolated_led, _("Isolate Solo"), "");
+
+ solo_safe_led = manage (new LED);
+ solo_safe_led->show ();
+ solo_safe_led->set_diameter (6);
+ solo_safe_led->set_no_show_all (true);
+ solo_safe_led->set_name (X_("SoloSafeLED"));
+ solo_safe_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
+ solo_safe_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_safe_button_release));
+ UI::instance()->set_tip (solo_safe_led, _("Lock Solo Status"), "");
+
+ Label* iso_label = manage (new Label (_("iso")));
+ Label* safe_label = manage (new Label (_("lock")));
+
+ iso_label->set_name (X_("SoloLEDLabel"));
+ safe_label->set_name (X_("SoloLEDLabel"));
+
+ iso_label->show ();
+ safe_label->show ();
+
+ solo_led_table.set_spacings (0);
+ solo_led_table.set_border_width (1);
+ solo_led_table.attach (*iso_label, 0, 1, 0, 1, Gtk::FILL, Gtk::FILL);
+ solo_led_table.attach (*solo_isolated_led, 1, 2, 0, 1, Gtk::FILL, Gtk::FILL);
+ solo_led_table.attach (*safe_label, 0, 1, 1, 2, Gtk::FILL, Gtk::FILL);
+ solo_led_table.attach (*solo_safe_led, 1, 2, 1, 2, Gtk::FILL, Gtk::FILL);
+
+ solo_led_table.show ();
+ solo_led_box.pack_end (solo_led_table, false, false);
+ solo_led_box.show ();
+
button_table.set_homogeneous (true);
button_table.set_spacings (0);
button_table.attach (name_button, 0, 2, 0, 1);
button_table.attach (input_button, 0, 2, 1, 2);
+ button_table.attach (_invert_button_box, 0, 2, 3, 4);
middle_button_table.set_homogeneous (true);
middle_button_table.set_spacings (0);
middle_button_table.attach (*mute_button, 0, 1, 0, 1);
- middle_button_table.attach (*solo_button, 1, 2, 0, 1);
+ middle_button_table.attach (*solo_button, 1, 2, 0, 1);
bottom_button_table.set_col_spacings (0);
bottom_button_table.set_homogeneous (true);
ARDOUR_UI::instance()->set_tip (&group_button, _("Mix group"), "");
group_button.add (group_label);
group_button.set_name ("MixerGroupButton");
+ Gtkmm2ext::set_size_request_to_display_given_text (group_button, "Group", 2, 2);
group_label.set_name ("MixerGroupButtonLabel");
comment_button.set_name ("MixerCommentButton");
-
comment_button.signal_clicked().connect (sigc::mem_fun(*this, &MixerStrip::comment_button_clicked));
+ _mono_button.set_name ("MixerMonoButton");
+ _mono_button.signal_clicked().connect (sigc::mem_fun (*this, &MixerStrip::mono_button_clicked));
+
global_vpacker.set_border_width (0);
global_vpacker.set_spacing (0);
global_vpacker.pack_start (whvbox, Gtk::PACK_SHRINK);
global_vpacker.pack_start (button_table,Gtk::PACK_SHRINK);
global_vpacker.pack_start (processor_box, true, true);
+ global_vpacker.pack_start (panners, Gtk::PACK_SHRINK);
+ global_vpacker.pack_start (solo_led_box,Gtk::PACK_SHRINK);
global_vpacker.pack_start (middle_button_table,Gtk::PACK_SHRINK);
global_vpacker.pack_start (gain_meter_alignment,Gtk::PACK_SHRINK);
global_vpacker.pack_start (bottom_button_table,Gtk::PACK_SHRINK);
- if (!is_midi_track()) {
- global_vpacker.pack_start (panners, Gtk::PACK_SHRINK);
- }
global_vpacker.pack_start (_mono_button, Gtk::PACK_SHRINK);
global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK);
global_vpacker.pack_start (comment_button, Gtk::PACK_SHRINK);
_packed = false;
_embedded = false;
- _session.engine().Stopped.connect (sigc::mem_fun(*this, &MixerStrip::engine_stopped));
- _session.engine().Running.connect (sigc::mem_fun(*this, &MixerStrip::engine_running));
+ _session->engine().Stopped.connect (*this, invalidator (*this), boost::bind (&MixerStrip::engine_stopped, this), gui_context());
+ _session->engine().Running.connect (*this, invalidator (*this), boost::bind (&MixerStrip::engine_running, this), gui_context());
input_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::input_press), false);
output_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::output_press), false);
- solo_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::solo_press), false);
- solo_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::solo_release), false);
- mute_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::mute_press), false);
- mute_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::mute_release), false);
-
/* we don't need this if its not an audio track, but we don't know that yet and it doesn't
hurt (much).
*/
rec_enable_button->set_name ("MixerRecordEnableButton");
- rec_enable_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::rec_enable_press), false);
- rec_enable_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::rec_enable_release));
/* ditto for this button and busses */
- show_sends_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::show_sends_press), false);
- show_sends_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::show_sends_release));
-
name_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::name_button_button_press), false);
group_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::select_route_group), false);
MixerStrip::~MixerStrip ()
{
- GoingAway(); /* EMIT_SIGNAL */
+ CatchDeletion (this);
delete input_selector;
delete output_selector;
button_table.remove (*show_sends_button);
}
+ processor_box.set_route (rt);
+
RouteUI::set_route (rt);
+ /* map the current state */
+
+ mute_changed (0);
+ update_solo_display ();
+
delete input_selector;
input_selector = 0;
revert_to_default_display ();
- processor_box.set_route (rt);
-
if (set_color_from_route()) {
set_color (unique_random_color());
}
- if (_mixer_owned && (route()->is_master() || route()->is_control())) {
+ if (route()->is_master()) {
+ solo_button->hide ();
+ solo_led_box.hide ();
+ } else {
+ solo_button->show ();
+ solo_led_box.show ();
+ }
+
+ if (_mixer_owned && (route()->is_master() || route()->is_monitor())) {
if (scrollbar_height == 0) {
HScrollbar scrollbar;
}
if (is_audio_track()) {
-
boost::shared_ptr<AudioTrack> at = audio_track();
+ at->FreezeChange.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::map_frozen, this), gui_context());
+ }
- connections.push_back (at->FreezeChange.connect (sigc::mem_fun(*this, &MixerStrip::map_frozen)));
+ if (has_audio_outputs ()) {
+ _mono_button.show ();
+ panners.show_all ();
+ } else {
+ _mono_button.hide ();
+ panners.hide_all ();
+ }
+ if (is_track ()) {
+
button_table.attach (*rec_enable_button, 0, 2, 2, 3);
- rec_enable_button->set_sensitive (_session.writable());
+ rec_enable_button->set_sensitive (_session->writable());
rec_enable_button->show();
- } else if (!is_track()) {
+ } else {
+
/* non-master bus */
if (!_route->is_master()) {
}
}
- if (_route->phase_invert()) {
- name_label.set_text (X_("Ø ") + name_label.get_text());
- } else {
- name_label.set_text (_route->name());
- }
-
- _mono_button.set_name ("MixerMonoButton");
- _mono_button.signal_clicked().connect (sigc::mem_fun (*this, &MixerStrip::mono_button_clicked));
-
switch (_route->meter_point()) {
case MeterInput:
meter_point_label.set_text (_("input"));
delete route_ops_menu;
route_ops_menu = 0;
- ARDOUR_UI::instance()->tooltips().set_tip (comment_button, _route->comment().empty() ?
+ ARDOUR_UI::instance()->set_tip (comment_button, _route->comment().empty() ?
_("Click to Add/Edit Comments"):
_route->comment());
- connections.push_back (_route->meter_change.connect (
- sigc::mem_fun(*this, &MixerStrip::meter_changed)));
- connections.push_back (_route->input()->changed.connect (
- sigc::mem_fun(*this, &MixerStrip::input_changed)));
- connections.push_back (_route->output()->changed.connect (
- sigc::mem_fun(*this, &MixerStrip::output_changed)));
- connections.push_back (_route->route_group_changed.connect (
- sigc::mem_fun(*this, &MixerStrip::route_group_changed)));
+ _route->meter_change.connect (route_connections, invalidator (*this), bind (&MixerStrip::meter_changed, this), gui_context());
+ _route->input()->changed.connect (route_connections, invalidator (*this), ui_bind (&MixerStrip::input_changed, this, _1, _2), gui_context());
+ _route->output()->changed.connect (route_connections, invalidator (*this), ui_bind (&MixerStrip::output_changed, this, _1, _2), gui_context());
+ _route->route_group_changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::route_group_changed, this), gui_context());
if (_route->panner()) {
- connections.push_back (_route->panner()->Changed.connect (
- sigc::mem_fun(*this, &MixerStrip::connect_to_pan)));
+ _route->panner()->Changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::connect_to_pan, this), gui_context());
}
if (is_audio_track()) {
- connections.push_back (audio_track()->DiskstreamChanged.connect (
- sigc::mem_fun(*this, &MixerStrip::diskstream_changed)));
+ audio_track()->DiskstreamChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::diskstream_changed, this), gui_context());
}
- connections.push_back (_route->NameChanged.connect (
- sigc::mem_fun(*this, &RouteUI::name_changed)));
- connections.push_back (_route->comment_changed.connect (
- sigc::mem_fun(*this, &MixerStrip::comment_changed)));
- connections.push_back (_route->gui_changed.connect (
- sigc::mem_fun(*this, &MixerStrip::route_gui_changed)));
+ _route->comment_changed.connect (route_connections, invalidator (*this), ui_bind (&MixerStrip::comment_changed, this, _1), gui_context());
+ _route->gui_changed.connect (route_connections, invalidator (*this), ui_bind (&MixerStrip::route_gui_changed, this, _1, _2), gui_context());
set_stuff_from_route ();
/* now force an update of all the various elements */
mute_changed (0);
- solo_changed (0);
+ update_solo_display ();
name_changed ();
comment_changed (0);
route_group_changed ();
processor_box.show();
- if (!route()->is_master() && !route()->is_control()) {
+ if (!route()->is_master() && !route()->is_monitor()) {
/* we don't allow master or control routes to be hidden */
hide_button.show();
}
bottom_button_table.show();
processor_box.show_all ();
gpm.show_all ();
- panners.show_all ();
gain_meter_alignment.show ();
gain_unit_button.show();
gain_unit_label.show();
MixerStrip::output_press (GdkEventButton *ev)
{
using namespace Menu_Helpers;
- if (!_session.engine().connected()) {
+ if (!_session->engine().connected()) {
MessageDialog msg (_("Not connected to JACK - no I/O changes are possible"));
msg.run ();
return true;
ARDOUR::BundleList current = _route->output()->bundles_connected ();
- boost::shared_ptr<ARDOUR::BundleList> b = _session.bundles ();
+ boost::shared_ptr<ARDOUR::BundleList> b = _session->bundles ();
/* give user bundles first chance at being in the menu */
}
}
- boost::shared_ptr<ARDOUR::RouteList> routes = _session.get_routes ();
+ 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)->input()->bundle(), current);
}
output = _route->output ();
}
- output_selector = new IOSelectorWindow (&_session, output);
+ output_selector = new IOSelectorWindow (_session, output);
}
if (output_selector->is_visible()) {
MixerStrip::edit_input_configuration ()
{
if (input_selector == 0) {
- input_selector = new IOSelectorWindow (&_session, _route->input());
+ input_selector = new IOSelectorWindow (_session, _route->input());
}
if (input_selector->is_visible()) {
input_menu.set_name ("ArdourContextMenu");
citems.clear();
- if (!_session.engine().connected()) {
+ if (!_session->engine().connected()) {
MessageDialog msg (_("Not connected to JACK - no I/O changes are possible"));
msg.run ();
return true;
}
+ if (_session->actively_recording() && _route->record_enabled())
+ return true;
+
switch (ev->button) {
case 1:
ARDOUR::BundleList current = _route->input()->bundles_connected ();
- boost::shared_ptr<ARDOUR::BundleList> b = _session.bundles ();
+ boost::shared_ptr<ARDOUR::BundleList> b = _session->bundles ();
/* give user bundles first chance at being in the menu */
}
}
- boost::shared_ptr<ARDOUR::RouteList> routes = _session.get_routes ();
+ 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)->output()->bundle(), current);
}
{
using namespace Menu_Helpers;
- if (b->ports_are_outputs() == false ||
- route()->input()->default_type() != b->type() ||
- b->nchannels() != _route->n_inputs().get (b->type ())) {
-
+ if (b->ports_are_outputs() == false || b->nchannels() != _route->n_inputs()) {
return;
}
{
using namespace Menu_Helpers;
- if (b->ports_are_inputs() == false ||
- route()->output()->default_type() != b->type() ||
- b->nchannels() != _route->n_outputs().get (b->type ())) {
-
+ if (b->ports_are_inputs() == false || b->nchannels() != _route->n_outputs()) {
return;
}
boost::shared_ptr<ARDOUR::AutomationControl> pan_control
= boost::dynamic_pointer_cast<ARDOUR::AutomationControl>(
- _route->panner()->data().control(Evoral::Parameter(PanAutomation)));
+ _route->panner()->control(Evoral::Parameter(PanAutomation)));
if (pan_control) {
- panstate_connection = pan_control->alist()->automation_state_changed.connect (sigc::mem_fun(panners, &PannerUI::pan_automation_state_changed));
- panstyle_connection = pan_control->alist()->automation_style_changed.connect (sigc::mem_fun(panners, &PannerUI::pan_automation_style_changed));
+ pan_control->alist()->automation_state_changed.connect (panstate_connection, invalidator (*this), boost::bind (&PannerUI::pan_automation_state_changed, &panners), gui_context());
+ pan_control->alist()->automation_style_changed.connect (panstyle_connection, invalidator (*this), boost::bind (&PannerUI::pan_automation_style_changed, &panners), gui_context());
}
- panners.pan_changed (this);
+ panners.panner_changed (this);
}
uint32_t io_count;
uint32_t io_index;
Port *port;
- vector<string> connections;
+ vector<string> port_connections;
uint32_t total_connection_count = 0;
uint32_t io_connection_count = 0;
ostringstream label;
string label_string;
- char * label_cstr;
bool have_label = false;
bool each_io_has_one_connection = true;
} else {
port = route->output()->nth (io_index);
}
-
- connections.clear ();
- port->get_connections(connections);
+
+ port_connections.clear ();
+ port->get_connections(port_connections);
io_connection_count = 0;
- if (!connections.empty()) {
- for (vector<string>::iterator i = connections.begin(); i != connections.end(); ++i) {
+ if (!port_connections.empty()) {
+ for (vector<string>::iterator i = port_connections.begin(); i != port_connections.end(); ++i) {
string& connection_name (*i);
if (io_connection_count == 0) {
break;
}
- label_cstr = new char[label_string.size() + 1];
- strcpy(label_cstr, label_string.c_str());
-
if (for_input) {
- input_label.set_text (label_cstr);
+ input_label.set_text (label_string);
} else {
- output_label.set_text (label_cstr);
+ output_label.set_text (label_string);
}
}
void
MixerStrip::diskstream_changed ()
{
- Gtkmm2ext::UI::instance()->call_slot (sigc::mem_fun(*this, &MixerStrip::update_diskstream_display));
+ Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&MixerStrip::update_diskstream_display, this));
}
void
MixerStrip::input_changed (IOChange /*change*/, void */*src*/)
{
- Gtkmm2ext::UI::instance()->call_slot (sigc::mem_fun(*this, &MixerStrip::update_input_display));
+ Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&MixerStrip::update_input_display, this));
set_width_enum (_width, this);
}
void
MixerStrip::output_changed (IOChange /*change*/, void */*src*/)
{
- Gtkmm2ext::UI::instance()->call_slot (sigc::mem_fun(*this, &MixerStrip::update_output_display));
+ Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&MixerStrip::update_output_display, this));
set_width_enum (_width, this);
}
break;
}
- ARDOUR_UI::instance()->tooltips().set_tip (comment_button,
+ ARDOUR_UI::instance()->set_tip (comment_button,
str.empty() ? _("Click to Add/Edit Comments") : str);
}
if (group_menu == 0) {
- group_menu = new RouteGroupMenu (
- _session,
- (RouteGroup::Property) (RouteGroup::Gain | RouteGroup::Mute | RouteGroup::Solo)
- );
+ PropertyList* plist = new PropertyList();
+
+ plist->add (Properties::gain, true);
+ plist->add (Properties::mute, true);
+ plist->add (Properties::solo, true);
+ group_menu = new RouteGroupMenu (_session, plist);
group_menu->GroupSelected.connect (sigc::mem_fun (*this, &MixerStrip::set_route_group));
}
RouteGroup *rg = _route->route_group();
if (rg) {
- /* XXX: this needs a better algorithm */
- string truncated = rg->name ();
- if (truncated.length () > 5) {
- truncated = truncated.substr (0, 5);
- }
- group_label.set_text (truncated);
+ group_label.set_text (PBD::short_version (rg->name(), 5));
} else {
switch (_width) {
case Wide:
void
-MixerStrip::route_gui_changed (string what_changed, void* ignored)
+MixerStrip::route_gui_changed (string what_changed, void*)
{
ENSURE_GUI_THREAD (*this, &MixerStrip::route_gui_changed, what_changed, ignored)
MenuList& items = route_ops_menu->items();
- items.push_back (MenuElem (_("Save As Template"), sigc::mem_fun(*this, &RouteUI::save_as_template)));
- items.push_back (MenuElem (_("Rename"), sigc::mem_fun(*this, &RouteUI::route_rename)));
+ items.push_back (MenuElem (_("Save As Template..."), sigc::mem_fun(*this, &RouteUI::save_as_template)));
+ items.push_back (MenuElem (_("Rename..."), sigc::mem_fun(*this, &RouteUI::route_rename)));
rename_menu_item = &items.back();
items.push_back (SeparatorElem());
items.push_back (CheckMenuElem (_("Active"), sigc::mem_fun (*this, &RouteUI::toggle_route_active)));
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Adjust latency"), sigc::mem_fun (*this, &RouteUI::adjust_latency)));
+ items.push_back (MenuElem (_("Adjust Latency..."), sigc::mem_fun (*this, &RouteUI::adjust_latency)));
items.push_back (SeparatorElem());
- items.push_back (CheckMenuElem (_("Invert Polarity"), sigc::mem_fun (*this, &RouteUI::toggle_polarity)));
- polarity_menu_item = dynamic_cast<CheckMenuItem *> (&items.back());
- polarity_menu_item->set_active (_route->phase_invert());
- items.push_back (CheckMenuElem (_("Protect against denormals"), sigc::mem_fun (*this, &RouteUI::toggle_denormal_protection)));
+ items.push_back (CheckMenuElem (_("Protect Against Denormals"), sigc::mem_fun (*this, &RouteUI::toggle_denormal_protection)));
denormal_menu_item = dynamic_cast<CheckMenuItem *> (&items.back());
denormal_menu_item->set_active (_route->denormal_protection());
items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &RouteUI::remove_this_route)));
}
-gint
+gboolean
MixerStrip::name_button_button_press (GdkEventButton* ev)
{
- if (ev->button == 1 || ev->button == 3) {
+ if (ev->button == 3) {
list_route_operations ();
/* do not allow rename if the track is record-enabled */
rename_menu_item->set_sensitive (!_route->record_enabled());
route_ops_menu->popup (1, ev->time);
- }
- return FALSE;
+
+ } else if (ev->button == 1) {
+ revert_to_default_display ();
+ }
+
+ return false;
}
void
{
switch (_width) {
case Wide:
- RouteUI::name_changed ();
+ RouteUI::property_changed (PropertyChange (ARDOUR::Properties::name));
break;
case Narrow:
name_label.set_text (PBD::short_version (_route->name(), 5));
break;
}
- if (_route->phase_invert()) {
- name_label.set_text (X_("Ø ") + name_label.get_text());
- }
}
void
switch (at->freeze_state()) {
case AudioTrack::Frozen:
processor_box.set_sensitive (false);
+ hide_redirect_editors ();
break;
default:
processor_box.set_sensitive (true);
break;
}
}
-
- hide_redirect_editors ();
}
void
return;
}
- void* gui = processor->get_gui ();
+ Gtk::Window* w = processor_box.get_processor_ui (processor);
- if (gui) {
- static_cast<Gtk::Widget*>(gui)->hide ();
+ if (w) {
+ w->hide ();
}
}
/** Called when the metering point has changed */
void
-MixerStrip::meter_changed (void *src)
+MixerStrip::meter_changed ()
{
- ENSURE_GUI_THREAD (*this, &MixerStrip::meter_changed, src)
+ ENSURE_GUI_THREAD (*this, &MixerStrip::meter_changed)
switch (_route->meter_point()) {
case MeterInput:
_current_delivery = send;
send->set_metering (true);
- send_gone_connection = _current_delivery->GoingAway.connect (sigc::mem_fun (*this, &MixerStrip::revert_to_default_display));
+ _current_delivery->DropReferences.connect (send_gone_connection, invalidator (*this), boost::bind (&MixerStrip::revert_to_default_display, this), gui_context());
gain_meter().set_controls (_route, send->meter(), send->amp());
gain_meter().setup_meters ();
void
MixerStrip::set_button_names ()
{
- switch (_width) {
+ switch (_width) {
case Wide:
rec_enable_button_label.set_text (_("Rec"));
mute_button_label.set_text (_("Mute"));
- if (!Config->get_solo_control_is_listen_control()) {
- solo_button_label.set_text (_("Solo"));
- } else {
- switch (Config->get_listen_position()) {
- case AfterFaderListen:
- solo_button_label.set_text (_("AFL"));
- break;
- case PreFaderListen:
- solo_button_label.set_text (_("PFL"));
- break;
- }
- }
+ if (_route && _route->solo_safe()) {
+ solo_button_label.set_text (X_("!"));
+ } else {
+ if (!Config->get_solo_control_is_listen_control()) {
+ solo_button_label.set_text (_("Solo"));
+ } else {
+ switch (Config->get_listen_position()) {
+ case AfterFaderListen:
+ solo_button_label.set_text (_("AFL"));
+ break;
+ case PreFaderListen:
+ solo_button_label.set_text (_("PFL"));
+ break;
+ }
+ }
+ }
break;
default:
rec_enable_button_label.set_text (_("R"));
mute_button_label.set_text (_("M"));
- if (!Config->get_solo_control_is_listen_control()) {
- solo_button_label.set_text (_("S"));
- } else {
- switch (Config->get_listen_position()) {
- case AfterFaderListen:
- solo_button_label.set_text (_("A"));
- break;
- case PreFaderListen:
- solo_button_label.set_text (_("P"));
- break;
- }
- }
+ if (_route && _route->solo_safe()) {
+ solo_button_label.set_text (X_("!"));
+ if (!Config->get_solo_control_is_listen_control()) {
+ solo_button_label.set_text (_("S"));
+ } else {
+ switch (Config->get_listen_position()) {
+ case AfterFaderListen:
+ solo_button_label.set_text (_("A"));
+ break;
+ case PreFaderListen:
+ solo_button_label.set_text (_("P"));
+ break;
+ }
+ }
+ }
break;
}
break;
case GDK_r:
+ cerr << "Stole that r\n";
rec_enable_press (&fake);
return true;
break;
break;
case GDK_r:
+ cerr << "Stole that r\n";
rec_enable_release (&fake);
return true;
break;
MixerStrip::on_enter_notify_event (GdkEventCrossing*)
{
Keyboard::magic_widget_grab_focus ();
- grab_focus ();
+
+ if (!panners._bar_spinner_active) {
+ /* This next grab_focus() causes a focus-out event to be sent to, amongst
+ * other things, panner BarControllers. When they receive it, they abort
+ * the use of any SpinButton that might be in use to change pan settings.
+ * Hence we have this horrific hack which stops the grab_focus () call
+ * happening if a bar spinner is active.
+ */
+ grab_focus ();
+ }
return false;
}
projects / ardour.git / blobdiff