X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fvca_master_strip.cc;h=eacc1a0ecd3844c63f7497e9a1d698cfbe9bada6;hb=41bd6d3721f20e5c7a668c4566cef65a06a95c7f;hp=9fadf7dd30abd933daec97ef3ec42d25371c7398;hpb=45eff0fa9f0c3091783a51634657b91d16a7444e;p=ardour.git diff --git a/gtk2_ardour/vca_master_strip.cc b/gtk2_ardour/vca_master_strip.cc index 9fadf7dd30..eacc1a0ecd 100644 --- a/gtk2_ardour/vca_master_strip.cc +++ b/gtk2_ardour/vca_master_strip.cc @@ -17,9 +17,8 @@ */ #include -#include -#include "pbd/convert.h" +#include "pbd/string_convert.h" #include "ardour/rc_configuration.h" #include "ardour/session.h" @@ -28,12 +27,12 @@ #include "gtkmm2ext/doi.h" #include "gtkmm2ext/keyboard.h" +#include "widgets/tooltips.h" #include "ardour_dialog.h" #include "floating_text_entry.h" #include "gui_thread.h" #include "mixer_ui.h" -#include "tooltips.h" #include "ui_config.h" #include "utils.h" #include "vca_master_strip.h" @@ -41,7 +40,7 @@ #include "pbd/i18n.h" using namespace ARDOUR; -using namespace ARDOUR_UI_UTILS; +using namespace ArdourWidgets; using namespace Gtkmm2ext; using namespace Gtk; using namespace PBD; @@ -60,7 +59,7 @@ VCAMasterStrip::VCAMasterStrip (Session* s, boost::shared_ptr v) /* set color for the VCA, if not already done. */ if (!_vca->presentation_info().color_set()) { - _vca->presentation_info().set_color (gdk_color_to_rgba (unique_random_color())); + _vca->presentation_info().set_color (ARDOUR_UI_UTILS::gdk_color_to_rgba (unique_random_color())); } control_slave_ui.set_stripable (boost::dynamic_pointer_cast (v)); @@ -88,12 +87,17 @@ VCAMasterStrip::VCAMasterStrip (Session* s, boost::shared_ptr v) solo_mute_box.pack_start (mute_button, true, true); solo_mute_box.pack_start (solo_button, true, true); - number_label.set_text (to_string (v->number(), std::dec)); + mute_button.set_controllable (_vca->mute_control()); + solo_button.set_controllable (_vca->solo_control()); + + number_label.set_text (PBD::to_string (v->number())); number_label.set_elements((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::Text|ArdourButton::Inactive)); number_label.set_no_show_all (); number_label.set_name ("generic button"); number_label.set_alignment (.5, .5); number_label.set_fallthrough_to_parent (true); + number_label.set_inactive_color (_vca->presentation_info().color ()); + number_label.signal_button_release_event().connect (sigc::mem_fun (*this, &VCAMasterStrip::number_button_press), false); update_bottom_padding (); @@ -107,17 +111,18 @@ VCAMasterStrip::VCAMasterStrip (Session* s, boost::shared_ptr v) vertical_button.set_active_color (_vca->presentation_info().color ()); set_tooltip (vertical_button, _("Click to show slaves only")); /* tooltip updated dynamically */ - global_vpacker.set_border_width (1); - global_vpacker.set_spacing (2); + global_vpacker.set_border_width (0); + global_vpacker.set_spacing (0); gain_meter.set_spacing(4); - global_vpacker.pack_start (number_label, false, false); - global_vpacker.pack_start (hide_button, false, false); - global_vpacker.pack_start (vertical_button, true, true); - global_vpacker.pack_start (solo_mute_box, false, false); - global_vpacker.pack_start (gain_meter, false, false); - global_vpacker.pack_start (control_slave_ui, false, false); - global_vpacker.pack_start (bottom_padding, false, false); + global_vpacker.pack_start (number_label, false, false, 1); + global_vpacker.pack_start (hide_button, false, false, 1); + global_vpacker.pack_start (vertical_button, true, true, 1); + global_vpacker.pack_start (solo_mute_box, false, false, 1); + global_vpacker.pack_start (gain_meter, false, false, 1); + global_vpacker.pack_start (control_slave_ui, false, false, 1); + global_vpacker.pack_start (gain_meter.gain_automation_state_button, false, false, 1); + global_vpacker.pack_start (bottom_padding, false, false, 0); global_frame.add (global_vpacker); global_frame.set_shadow_type (Gtk::SHADOW_IN); @@ -128,13 +133,13 @@ VCAMasterStrip::VCAMasterStrip (Session* s, boost::shared_ptr v) global_vpacker.show (); global_frame.show (); top_padding.show (); - bottom_padding.show (); vertical_button.show (); hide_button.show (); number_label.show (); gain_meter.show (); solo_mute_box.show_all (); control_slave_ui.show (); + gain_meter.gain_automation_state_button.show (); /* force setting of visible selected status */ @@ -146,7 +151,7 @@ VCAMasterStrip::VCAMasterStrip (Session* s, boost::shared_ptr v) mute_changed (); spill_change (boost::shared_ptr()); - Mixer_UI::instance()->show_vca_change.connect (sigc::mem_fun (*this, &VCAMasterStrip::spill_change)); + Mixer_UI::instance()->show_spill_change.connect (sigc::mem_fun (*this, &VCAMasterStrip::spill_change)); _vca->PropertyChanged.connect (vca_connections, invalidator (*this), boost::bind (&VCAMasterStrip::vca_property_changed, this, _1), gui_context()); _vca->presentation_info().PropertyChanged.connect (vca_connections, invalidator (*this), boost::bind (&VCAMasterStrip::vca_property_changed, this, _1), gui_context()); @@ -163,9 +168,9 @@ VCAMasterStrip::VCAMasterStrip (Session* s, boost::shared_ptr v) VCAMasterStrip::~VCAMasterStrip () { - if ((_session && !_session->deletion_in_progress()) && Mixer_UI::instance()->showing_vca_slaves_for (_vca)) { + if ((_session && !_session->deletion_in_progress()) && Mixer_UI::instance()->showing_spill_for (_vca)) { /* cancel spill for this VCA */ - Mixer_UI::instance()->show_vca_slaves (boost::shared_ptr()); + Mixer_UI::instance()->show_spill (boost::shared_ptr()); } delete delete_dialog; @@ -177,12 +182,16 @@ VCAMasterStrip::~VCAMasterStrip () void VCAMasterStrip::self_delete () { - if ((_session && !_session->deletion_in_progress()) && Mixer_UI::instance()->showing_vca_slaves_for (_vca)) { + if ((_session && !_session->deletion_in_progress()) && Mixer_UI::instance()->showing_spill_for (_vca)) { /* cancel spill for this VCA */ - Mixer_UI::instance()->show_vca_slaves (boost::shared_ptr()); + Mixer_UI::instance()->show_spill (boost::shared_ptr()); } /* Drop reference immediately, delete self when idle */ _vca.reset (); + gain_meter.set_controls (boost::shared_ptr(), + boost::shared_ptr(), + boost::shared_ptr(), + boost::shared_ptr()); delete_when_idle (this); } @@ -221,22 +230,19 @@ VCAMasterStrip::update_bottom_padding () { std::string viz = UIConfiguration::instance().get_mixer_strip_visibility (); - ArdourButton meter_point_button (_("pre")); ArdourButton output_button (_("Output")); ArdourButton comment_button (_("Comments")); - meter_point_button.set_name ("mixer strip button"); output_button.set_name ("mixer strip button"); comment_button.set_name ("generic button"); + if (viz.find ("VCA") == std::string::npos) { + control_slave_ui.hide (); + } else { + control_slave_ui.show (); + } int h = 0; - if (1) { - Gtk::Window window (WINDOW_TOPLEVEL); - window.add (meter_point_button); - Gtk::Requisition requisition(meter_point_button.size_request ()); - h += requisition.height; - } if (viz.find ("Output") != std::string::npos) { Gtk::Window window (WINDOW_TOPLEVEL); window.add (output_button); @@ -249,7 +255,13 @@ VCAMasterStrip::update_bottom_padding () Gtk::Requisition requisition(comment_button.size_request ()); h += requisition.height + 2; } - bottom_padding.set_size_request (-1, h); + if (h <= 0) { + bottom_padding.set_size_request (-1, 1); + bottom_padding.hide (); + } else { + bottom_padding.set_size_request (-1, h); + bottom_padding.show (); + } } string @@ -387,6 +399,19 @@ VCAMasterStrip::vertical_button_press (GdkEventButton* ev) return true; } +bool +VCAMasterStrip::number_button_press (GdkEventButton* ev) +{ + if (Keyboard::is_context_menu_event (ev)) { + if (!context_menu) { + build_context_menu (); + } + context_menu->popup (1, ev->time); + return true; + } + return false; +} + void VCAMasterStrip::start_name_edit () { @@ -411,6 +436,7 @@ VCAMasterStrip::vca_property_changed (PropertyChange const & what_changed) if (what_changed.contains (ARDOUR::Properties::color)) { vertical_button.set_active_color (_vca->presentation_info().color ()); + number_label.set_inactive_color (_vca->presentation_info().color ()); } if (what_changed.contains (ARDOUR::Properties::hidden)) { @@ -422,7 +448,7 @@ void VCAMasterStrip::update_vca_name () { /* 20 is a rough guess at the number of letters we can fit. */ - vertical_button.set_text (short_version (_vca->name(), 20)); + vertical_button.set_text (short_version (_vca->full_name(), 20)); } void @@ -434,6 +460,9 @@ VCAMasterStrip::build_context_menu () items.push_back (MenuElem (_("Rename"), sigc::mem_fun (*this, &VCAMasterStrip::start_name_edit))); items.push_back (MenuElem (_("Color..."), sigc::mem_fun (*this, &VCAMasterStrip::start_color_edit))); items.push_back (SeparatorElem()); + items.push_back (MenuElem (_("Assign Selected Channels"), sigc::mem_fun (*this, &VCAMasterStrip::assign_all_selected))); + items.push_back (MenuElem (_("Drop Selected Channels"), sigc::mem_fun (*this, &VCAMasterStrip::unassign_all_selected))); + items.push_back (SeparatorElem()); items.push_back (MenuElem (_("Drop All Slaves"), sigc::mem_fun (*this, &VCAMasterStrip::drop_all_slaves))); items.push_back (SeparatorElem()); items.push_back (MenuElem (_("Remove"), sigc::mem_fun (*this, &VCAMasterStrip::remove))); @@ -442,15 +471,15 @@ VCAMasterStrip::build_context_menu () void VCAMasterStrip::spill () { - if (Mixer_UI::instance()->showing_vca_slaves_for (_vca)) { - Mixer_UI::instance()->show_vca_slaves (boost::shared_ptr()); + if (Mixer_UI::instance()->showing_spill_for (_vca)) { + Mixer_UI::instance()->show_spill (boost::shared_ptr()); } else { - Mixer_UI::instance()->show_vca_slaves (_vca); + Mixer_UI::instance()->show_spill (_vca); } } void -VCAMasterStrip::spill_change (boost::shared_ptr vca) +VCAMasterStrip::spill_change (boost::shared_ptr vca) { if (vca != _vca) { vertical_button.set_active_state (Gtkmm2ext::Off); @@ -471,20 +500,32 @@ VCAMasterStrip::remove () _session->vca_manager().remove_vca (_vca); } +void +VCAMasterStrip::assign_all_selected () +{ + Mixer_UI::instance()->do_vca_assign (_vca); +} + +void +VCAMasterStrip::unassign_all_selected () +{ + Mixer_UI::instance()->do_vca_unassign (_vca); +} + void VCAMasterStrip::drop_all_slaves () { _vca->Drop (); /* EMIT SIGNAL */ - if (Mixer_UI::instance()->showing_vca_slaves_for (_vca)) { - Mixer_UI::instance()->show_vca_slaves (boost::shared_ptr()); + if (Mixer_UI::instance()->showing_spill_for (_vca)) { + Mixer_UI::instance()->show_spill (boost::shared_ptr()); } } Gdk::Color VCAMasterStrip::color () const { - return gdk_color_from_rgba (_vca->presentation_info().color ()); + return ARDOUR_UI_UTILS::gdk_color_from_rgba (_vca->presentation_info().color ()); } string @@ -496,30 +537,7 @@ VCAMasterStrip::state_id () const void VCAMasterStrip::start_color_edit () { - Gtk::ColorSelectionDialog* color_dialog = new Gtk::ColorSelectionDialog; - - color_dialog->get_colorsel()->set_has_opacity_control (false); - color_dialog->get_colorsel()->set_has_palette (true); - - Gdk::Color c = gdk_color_from_rgba (_vca->presentation_info().color ()); - - color_dialog->get_colorsel()->set_previous_color (c); - color_dialog->get_colorsel()->set_current_color (c); - - color_dialog->signal_response().connect (sigc::bind (sigc::mem_fun (*this, &VCAMasterStrip::finish_color_edit), color_dialog)); - color_dialog->present (); -} - -void -VCAMasterStrip::finish_color_edit (int response, Gtk::ColorSelectionDialog* dialog) -{ - switch (response) { - case RESPONSE_OK: - _vca->presentation_info().set_color (gdk_color_to_rgba (dialog->get_colorsel()->get_current_color())); - break; - } - - delete_when_idle (dialog); + _color_picker.popup (_vca); } bool