X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_ui.cc;h=e06355637e9251afd3d61a13fead54137ed31b52;hb=813b92c85b77e67b75778aaa6727eb58303ada45;hp=8b4056d4f841efa1f0d24ff4d00cb6ae6cf4e86b;hpb=d30266dfc33f6918709e0c8ab1cab82151927fe5;p=ardour.git diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 8b4056d4f8..e06355637e 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -50,26 +50,28 @@ #include "ardour/session.h" #include "ardour/template_utils.h" +#include "ardour_button.h" +#include "ardour_dialog.h" #include "ardour_ui.h" +#include "automation_time_axis.h" #include "editor.h" -#include "route_ui.h" -#include "ardour_button.h" -#include "keyboard.h" -#include "utils.h" -#include "plugin_pin_dialog.h" -#include "prompter.h" +#include "group_tabs.h" +#include "gui_object.h" #include "gui_thread.h" -#include "ardour_dialog.h" +#include "keyboard.h" #include "latency_gui.h" #include "mixer_strip.h" -#include "automation_time_axis.h" +#include "plugin_pin_dialog.h" +#include "prompter.h" +#include "rgb_macros.h" #include "route_time_axis.h" -#include "group_tabs.h" +#include "route_ui.h" #include "timers.h" #include "ui_config.h" +#include "utils.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace Gtk; using namespace Gtkmm2ext; using namespace ARDOUR; @@ -83,8 +85,7 @@ boost::weak_ptr RouteUI::_showing_sends_to; std::string RouteUI::program_port_prefix; RouteUI::RouteUI (ARDOUR::Session* sess) - : AxisView(sess) - , mute_menu(0) + : mute_menu(0) , solo_menu(0) , sends_menu(0) , record_menu(0) @@ -100,13 +101,16 @@ RouteUI::RouteUI (ARDOUR::Session* sess) boost::to_lower (lpn); program_port_prefix = lpn + ":"; // e.g. "ardour:" } - if (sess) init (); + + if (sess) { + init (); + } } RouteUI::~RouteUI() { if (_route) { - gui_object_state().remove_node (route_state_id()); + ARDOUR_UI::instance()->gui_object_state->remove_node (route_state_id()); } _route.reset (); /* drop reference to route, so that it can be cleaned up */ @@ -150,7 +154,6 @@ RouteUI::init () multiple_mute_change = false; multiple_solo_change = false; _i_am_the_modifier = 0; - vca_button = 0; input_selector = 0; output_selector = 0; @@ -249,7 +252,7 @@ RouteUI::set_route (boost::shared_ptr rp) _route = rp; if (set_color_from_route()) { - set_color (unique_random_color()); + set_color (gdk_color_to_rgba (AxisView::unique_random_color ())); } if (self_destruct) { @@ -282,10 +285,10 @@ RouteUI::set_route (boost::shared_ptr rp) } - _route->PropertyChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::property_changed, this, _1), gui_context()); + _route->PropertyChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::route_property_changed, this, _1), gui_context()); + _route->presentation_info().PropertyChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::route_gui_changed, this, _1), gui_context ()); _route->io_changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::setup_invert_buttons, this), gui_context ()); - _route->gui_changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::route_gui_changed, this, _1), gui_context ()); if (_session->writable() && is_track()) { boost::shared_ptr t = boost::dynamic_pointer_cast(_route); @@ -343,6 +346,7 @@ RouteUI::set_route (boost::shared_ptr rp) check_rec_enable_sensitivity (); maybe_add_route_print_mgr (); route_color_changed(); + route_gui_changed (PropertyChange (Properties::selected)); } void @@ -458,8 +462,7 @@ RouteUI::mute_press (GdkEventButton* ev) _mute_release->routes = rl; } - _session->set_control (_route->mute_control(), _route->muted_by_self() ? 0.0 : 1.0, Controllable::UseGroup); - + _route->mute_control()->set_value (!_route->muted_by_self(), Controllable::UseGroup); } } } @@ -596,9 +599,7 @@ RouteUI::solo_press(GdkEventButton* ev) /* ??? we need a just_one_listen() method */ } else { DisplaySuspender ds; - boost::shared_ptr cl (new ControlList); - cl->push_back (_route->solo_control()); - _session->set_controls (cl, 1.0, Controllable::NoGroup); + _route->solo_control()->set_value (1.0, Controllable::NoGroup); } } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) { @@ -753,7 +754,7 @@ RouteUI::rec_enable_press(GdkEventButton* ev) } else { boost::shared_ptr trk = track(); - _session->set_control (trk->rec_enable_control(), !trk->rec_enable_control()->get_value(), Controllable::UseGroup); + trk->rec_enable_control()->set_value (!trk->rec_enable_control()->get_value(), Controllable::UseGroup); } } @@ -1284,47 +1285,17 @@ RouteUI::update_mute_display () mute_button->set_active_state (mute_active_state (_session, _route)); } -void -RouteUI::update_vca_display () -{ - if (!vca_button) { - return; - } - - VCAList vcas (_session->vca_manager().vcas()); - string label; - - for (VCAList::iterator v = vcas.begin(); v != vcas.end(); ++v) { - if (_route->slaved_to (*v)) { - if (!label.empty()) { - label += ' '; - } - label += PBD::to_string ((*v)->number(), std::dec); - } - } - - if (label.empty()) { - label = _("-vca-"); - vca_button->set_active_state (Gtkmm2ext::Off); - } else { - vca_button->set_active_state (Gtkmm2ext::ExplicitActive); - } - - vca_button->set_text (label); -} void RouteUI::route_rec_enable_changed () { - blink_rec_display(true); //this lets the button change "immediately" rather than wait for the next blink - update_monitoring_display (); + blink_rec_display (true); //this lets the button change "immediately" rather than wait for the next blink } void RouteUI::session_rec_enable_changed () { - blink_rec_display(true); //this lets the button change "immediately" rather than wait for the next blink - update_monitoring_display (); + blink_rec_display (true); //this lets the button change "immediately" rather than wait for the next blink } void @@ -1596,10 +1567,11 @@ void RouteUI::choose_color () { bool picked; - Gdk::Color const color = Gtkmm2ext::UI::instance()->get_color (_("Color Selection"), picked, &_color); + Gdk::Color c (gdk_color_from_rgb (_route->presentation_info().color())); + Gdk::Color const color = Gtkmm2ext::UI::instance()->get_color (_("Color Selection"), picked, &c); if (picked) { - set_color(color); + set_color (gdk_color_to_rgba (color)); } } @@ -1607,22 +1579,9 @@ RouteUI::choose_color () * the route is in a group which shares its color with its routes. */ void -RouteUI::set_color (const Gdk::Color & c) +RouteUI::set_color (uint32_t c) { - /* leave _color alone in the group case so that tracks can retain their - * own pre-group colors. - */ - - char buf[64]; - _color = c; - snprintf (buf, sizeof (buf), "%d:%d:%d", c.get_red(), c.get_green(), c.get_blue()); - - /* note: we use the route state ID here so that color is the same for both - the time axis view and the mixer strip - */ - - gui_object_state().set_property (route_state_id(), X_("color"), buf); - _route->gui_changed ("color", (void *) 0); /* EMIT_SIGNAL */ + _route->presentation_info().set_color (c); } /** @return GUI state ID for things that are common to the route in all its representations */ @@ -1635,21 +1594,11 @@ RouteUI::route_state_id () const int RouteUI::set_color_from_route () { - const string str = gui_object_state().get_string (route_state_id(), X_("color")); - - if (str.empty()) { - return 1; + if (_route->presentation_info().color_set()) { + return 0; /* nothing to do */ } - int r, g, b; - - sscanf (str.c_str(), "%d:%d:%d", &r, &g, &b); - - _color.set_red (r); - _color.set_green (g); - _color.set_blue (b); - - return 0; + return 1; /* pick a color */ } /** @return true if this name should be used for the route, otherwise false */ @@ -1717,14 +1666,6 @@ RouteUI::route_rename () } -void -RouteUI::property_changed (const PropertyChange& what_changed) -{ - if (what_changed.contains (ARDOUR::Properties::name)) { - name_label.set_text (_route->name()); - } -} - void RouteUI::toggle_comment_editor () { @@ -1889,12 +1830,6 @@ RouteUI::has_audio_outputs () const return (_route->n_outputs().n_audio() > 0); } -string -RouteUI::name() const -{ - return _route->name(); -} - void RouteUI::map_frozen () { @@ -2046,61 +1981,6 @@ RouteUI::page_gain_down () _route->gain_control()->set_value (dB_to_coefficient (accurate_coefficient_to_dB (_route->gain_control()->get_value()) - 0.5), Controllable::UseGroup); } -void -RouteUI::open_remote_control_id_dialog () -{ - ArdourDialog dialog (_("Remote Control ID")); - SpinButton* spin = 0; - - dialog.get_vbox()->set_border_width (18); - - if (Config->get_remote_model() == UserOrdered) { - uint32_t const limit = _session->ntracks() + _session->nbusses () + 4; - - HBox* hbox = manage (new HBox); - hbox->set_spacing (6); - hbox->pack_start (*manage (new Label (_("Remote control ID:")))); - spin = manage (new SpinButton); - spin->set_digits (0); - spin->set_increments (1, 10); - spin->set_range (0, limit); - spin->set_value (_route->presentation_info().group_order()); - hbox->pack_start (*spin); - dialog.get_vbox()->pack_start (*hbox); - - dialog.add_button (Stock::CANCEL, RESPONSE_CANCEL); - dialog.add_button (Stock::APPLY, RESPONSE_ACCEPT); - } else { - Label* l = manage (new Label()); - if (_route->is_master() || _route->is_monitor()) { - l->set_markup (string_compose (_("The remote control ID of %1 is: %2\n\n\n" - "The remote control ID of %3 cannot be changed."), - Gtkmm2ext::markup_escape_text (_route->name()), - _route->presentation_info().group_order(), - (_route->is_master() ? _("the master bus") : _("the monitor bus")))); - } else { - l->set_markup (string_compose (_("The remote control ID of %5 is: %2\n\n\n" - "Remote Control IDs are currently determined by track/bus ordering in %6.\n\n" - "%3Use the User Interaction tab of the Preferences window if you want to change this%4"), - (is_track() ? _("track") : _("bus")), - _route->presentation_info().group_order(), - "", - "", - Gtkmm2ext::markup_escape_text (_route->name()), - PROGRAM_NAME)); - } - dialog.get_vbox()->pack_start (*l); - dialog.add_button (Stock::OK, RESPONSE_CANCEL); - } - - dialog.show_all (); - int const r = dialog.run (); - - if (r == RESPONSE_ACCEPT && spin) { - _route->set_presentation_group_order_explicit (spin->get_value_as_int ()); - } -} - void RouteUI::setup_invert_buttons () { @@ -2136,9 +2016,9 @@ RouteUI::setup_invert_buttons () } if (N <= _max_invert_buttons) { - UI::instance()->set_tip (*b, string_compose (_("Left-click to invert (phase reverse) channel %1 of this track. Right-click to show menu."), i + 1)); + UI::instance()->set_tip (*b, string_compose (_("Left-click to invert polarity of channel %1 of this track. Right-click to show menu."), i + 1)); } else { - UI::instance()->set_tip (*b, _("Click to show a menu of channels for inversion (phase reverse)")); + UI::instance()->set_tip (*b, _("Click to show a menu of channels to invert polarity")); } _invert_buttons.push_back (b); @@ -2257,9 +2137,9 @@ RouteUI::request_redraw () /** The Route's gui_changed signal has been emitted */ void -RouteUI::route_gui_changed (string what_changed) +RouteUI::route_gui_changed (PropertyChange const& what_changed) { - if (what_changed == "color") { + if (what_changed.contains (Properties::color)) { if (set_color_from_route () == 0) { route_color_changed (); } @@ -2285,18 +2165,55 @@ RouteUI::track_mode_changed (void) /** @return the color that this route should use; it maybe its own, or it maybe that of its route group. */ + Gdk::Color -RouteUI::color () const +RouteUI::route_color () const { + Gdk::Color c; RouteGroup* g = _route->route_group (); + string p; if (g && g->is_color()) { - Gdk::Color c; set_color_from_rgba (c, GroupTabs::group_color (g)); - return c; + } else { + + /* deal with older 4.x color, which was stored in the GUI object state */ + + string p = ARDOUR_UI::instance()->gui_object_state->get_string (route_state_id(), X_("color")); + + if (!p.empty()) { + + /* old v4.x or earlier session. Use this information */ + + int red, green, blue; + char colon; + + stringstream ss (p); + + /* old color format version was: + + 16bit value for red:16 bit value for green:16 bit value for blue + + decode to rgb .. + */ + + ss >> red; + ss >> colon; + ss >> green; + ss >> colon; + ss >> blue; + + red >>= 2; + green >>= 2; + blue >>= 2; + + _route->presentation_info().set_color (RGBA_TO_UINT (red, green, blue, 255)); + } + + set_color_from_rgba (c, _route->presentation_info().color()); } - return _color; + return c; } void @@ -2411,3 +2328,20 @@ RouteUI::manage_pins () proxy->present(); } } + +bool +RouteUI::mark_hidden (bool yn) +{ + if (yn != _route->presentation_info().hidden()) { + _route->presentation_info().set_hidden (yn); + return true; // things changed + } + return false; +} + +boost::shared_ptr +RouteUI::stripable () const +{ + return _route; +} +