mark mixer strip width and hide buttons as square
[ardour.git] / gtk2_ardour / mixer_strip.cc
index 99637371887d36702bacaa313cf60b8f6f3e5237..0153ac5f1f1dbe1260926c06a1273797b81a876e 100644 (file)
@@ -84,7 +84,7 @@ MixerStrip* MixerStrip::_entered_mixer_strip;
 PBD::Signal1<void,MixerStrip*> MixerStrip::CatchDeletion;
 
 MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
-       : AxisView(sess)
+       : SessionHandlePtr (sess)
        , RouteUI (sess)
        , _mixer(mx)
        , _mixer_owned (in_mixer)
@@ -99,9 +99,11 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
        , meter_point_button (_("pre"))
        , monitor_section_button (0)
        , midi_input_enable_button (0)
+       , _plugin_insert_cnt (0)
        , _comment_button (_("Comments"))
        , trim_control (ArdourKnob::default_elements, ArdourKnob::Flags (ArdourKnob::Detent | ArdourKnob::ArcToZero))
        , _visibility (X_("mixer-element-visibility"))
+       , control_slave_ui (sess)
 {
        init ();
 
@@ -115,7 +117,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
 }
 
 MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr<Route> rt, bool in_mixer)
-       : AxisView(sess)
+       : SessionHandlePtr (sess)
        , RouteUI (sess)
        , _mixer(mx)
        , _mixer_owned (in_mixer)
@@ -133,6 +135,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr<Route> rt
        , _comment_button (_("Comments"))
        , trim_control (ArdourKnob::default_elements, ArdourKnob::Flags (ArdourKnob::Detent | ArdourKnob::ArcToZero))
        , _visibility (X_("mixer-element-visibility"))
+       , control_slave_ui (sess)
 {
        init ();
        set_route (rt);
@@ -159,9 +162,11 @@ MixerStrip::init ()
        }
 
        width_button.set_icon (ArdourIcon::StripWidth);
+       hide_button.set_tweaks (ArdourButton::Square);
        set_tooltip (width_button, t);
 
        hide_button.set_icon (ArdourIcon::CloseCross);
+       hide_button.set_tweaks (ArdourButton::Square);
        set_tooltip (&hide_button, _("Hide this mixer strip"));
 
        input_button_box.set_spacing(2);
@@ -210,15 +215,6 @@ MixerStrip::init ()
        }
        solo_iso_table.show ();
 
-       vca_button = manage (new ArdourButton (ArdourButton::default_elements));
-       vca_button->set_no_show_all (true);
-       vca_button->set_name (X_("vca assign"));
-       vca_button->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
-       vca_button->signal_button_release_event().connect (sigc::mem_fun (*this, &MixerStrip::vca_button_release), false);
-       UI::instance()->set_tip (*vca_button, _("VCA assignments"));
-       vca_button->set_text (_("-vca-"));
-       vca_button->show ();
-
        rec_mon_table.set_homogeneous (true);
        rec_mon_table.set_row_spacings (2);
        rec_mon_table.set_col_spacings (2);
@@ -314,7 +310,7 @@ MixerStrip::init ()
        global_vpacker.pack_start (solo_iso_table, Gtk::PACK_SHRINK);
        global_vpacker.pack_start (mute_solo_table, Gtk::PACK_SHRINK);
        global_vpacker.pack_start (gpm, Gtk::PACK_SHRINK);
-       global_vpacker.pack_start (*vca_button, Gtk::PACK_SHRINK);
+       global_vpacker.pack_start (control_slave_ui, Gtk::PACK_SHRINK);
        global_vpacker.pack_start (bottom_button_table, Gtk::PACK_SHRINK);
        if (!ARDOUR::Profile->get_trx()) {
                global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK);
@@ -396,7 +392,7 @@ MixerStrip::init ()
        _visibility.add (&solo_iso_table, X_("SoloIsoLock"), _("Solo Iso / Lock"), false);
        _visibility.add (&output_button, X_("Output"), _("Output"), false);
        _visibility.add (&_comment_button, X_("Comments"), _("Comments"), false);
-       _visibility.add (vca_button, X_("VCA"), _("VCA Assigns"), false);
+       _visibility.add (&control_slave_ui, X_("VCA"), _("VCA Assigns"), false);
 
        parameter_changed (X_("mixer-element-visibility"));
        UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &MixerStrip::parameter_changed));
@@ -449,6 +445,15 @@ MixerStrip::mixer_strip_leave_event (GdkEventCrossing *ev)
        return false;
 }
 
+string
+MixerStrip::name() const
+{
+       if (_route) {
+               return _route->name();
+       }
+       return string();
+}
+
 void
 MixerStrip::set_route (boost::shared_ptr<Route> rt)
 {
@@ -473,6 +478,8 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 
        RouteUI::set_route (rt);
 
+       control_slave_ui.set_stripable (boost::dynamic_pointer_cast<Stripable> (rt));
+
        /* ProcessorBox needs access to _route so that it can read
           GUI object state.
        */
@@ -639,12 +646,6 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        }
 
        _route->comment_changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::setup_comment_button, this), gui_context());
-       _route->PropertyChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::property_changed, this, _1), gui_context());
-
-       _route->gain_control()->VCAStatusChange.connect (route_connections,
-                                                        invalidator (*this),
-                                                        boost::bind (&MixerStrip::update_vca_display, this),
-                                                        gui_context());
 
        set_stuff_from_route ();
 
@@ -652,10 +653,10 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 
        update_mute_display ();
        update_solo_display ();
-       update_vca_display ();
        name_changed ();
        comment_changed ();
        route_group_changed ();
+       update_track_number_visibility ();
 
        connect_to_pan ();
        panners.setup_pan ();
@@ -949,7 +950,7 @@ MixerStrip::input_press (GdkEventButton *ev)
                return true;
        }
 
-       if (_session->actively_recording() && _route->record_enabled())
+       if (_session->actively_recording() && is_track() && track()->rec_enable_control()->get_value())
                return true;
 
        switch (ev->button) {
@@ -1526,9 +1527,9 @@ MixerStrip::select_route_group (GdkEventButton *ev)
 
                        PropertyList* plist = new PropertyList();
 
-                       plist->add (Properties::gain, true);
-                       plist->add (Properties::mute, true);
-                       plist->add (Properties::solo, true);
+                       plist->add (Properties::group_gain, true);
+                       plist->add (Properties::group_mute, true);
+                       plist->add (Properties::group_solo, true);
 
                        group_menu = new RouteGroupMenu (_session, plist);
                }
@@ -1577,6 +1578,18 @@ MixerStrip::show_passthru_color ()
        reset_strip_style ();
 }
 
+
+void
+MixerStrip::help_count_plugins (boost::weak_ptr<Processor> p)
+{
+       boost::shared_ptr<Processor> processor (p.lock ());
+       if (!processor || !processor->display_to_user()) {
+               return;
+       }
+       if (boost::dynamic_pointer_cast<PluginInsert> (processor)) {
+               ++_plugin_insert_cnt;
+       }
+}
 void
 MixerStrip::build_route_ops_menu ()
 {
@@ -1617,7 +1630,9 @@ MixerStrip::build_route_ops_menu ()
                i->signal_activate().connect (sigc::hide_return (sigc::bind (sigc::mem_fun (*_route, &Route::set_strict_io), !_route->strict_io())));
        }
 
-       if (1 /* TODO IFF >= 1 plugin-insert */) {
+       _plugin_insert_cnt = 0;
+       _route->foreach_processor (sigc::mem_fun (*this, &MixerStrip::help_count_plugins));
+       if (_plugin_insert_cnt > 0) {
                items.push_back (SeparatorElem());
                items.push_back (MenuElem (_("Pin Connections..."), sigc::mem_fun (*this, &RouteUI::manage_pins)));
        }
@@ -1630,9 +1645,6 @@ MixerStrip::build_route_ops_menu ()
        denormal_menu_item = dynamic_cast<Gtk::CheckMenuItem *> (&items.back());
        denormal_menu_item->set_active (_route->denormal_protection());
 
-       items.push_back (SeparatorElem());
-       items.push_back (MenuElem (_("Remote Control ID..."), sigc::mem_fun (*this, &RouteUI::open_remote_control_id_dialog)));
-
        if (_route) {
                /* note that this relies on selection being shared across editor and
                   mixer (or global to the backend, in the future), which is the only
@@ -1664,7 +1676,7 @@ MixerStrip::name_button_button_press (GdkEventButton* ev)
                list_route_operations ();
 
                /* do not allow rename if the track is record-enabled */
-               rename_menu_item->set_sensitive (!_route->record_enabled());
+               rename_menu_item->set_sensitive (!is_track() || !track()->rec_enable_control()->get_value());
                route_ops_menu->popup (1, ev->time);
 
                return true;
@@ -1680,7 +1692,7 @@ MixerStrip::name_button_button_release (GdkEventButton* ev)
                list_route_operations ();
 
                /* do not allow rename if the track is record-enabled */
-               rename_menu_item->set_sensitive (!_route->record_enabled());
+               rename_menu_item->set_sensitive (!is_track() || !track()->rec_enable_control()->get_value());
                route_ops_menu->popup (1, ev->time);
        }
 
@@ -1694,7 +1706,7 @@ MixerStrip::number_button_button_press (GdkEventButton* ev)
                list_route_operations ();
 
                /* do not allow rename if the track is record-enabled */
-               rename_menu_item->set_sensitive (!_route->record_enabled());
+               rename_menu_item->set_sensitive (!is_track() || !track()->rec_enable_control()->get_value());
                route_ops_menu->popup (1, ev->time);
 
                return true;
@@ -1711,16 +1723,16 @@ MixerStrip::list_route_operations ()
 }
 
 void
-MixerStrip::set_selected (bool yn)
+MixerStrip::show_selected ()
 {
-       AxisView::set_selected (yn);
-       if (_selected) {
+       if (selected()) {
                global_frame.set_shadow_type (Gtk::SHADOW_ETCHED_OUT);
                global_frame.set_name ("MixerStripSelectedFrame");
        } else {
                global_frame.set_shadow_type (Gtk::SHADOW_IN);
                global_frame.set_name ("MixerStripFrame");
        }
+
        global_frame.queue_draw ();
 
 //     if (!yn)
@@ -1728,10 +1740,8 @@ MixerStrip::set_selected (bool yn)
 }
 
 void
-MixerStrip::property_changed (const PropertyChange& what_changed)
+MixerStrip::route_property_changed (const PropertyChange& what_changed)
 {
-       RouteUI::property_changed (what_changed);
-
        if (what_changed.contains (ARDOUR::Properties::name)) {
                name_changed ();
        }
@@ -2140,7 +2150,7 @@ MixerStrip::set_button_names ()
                        monitor_section_button->set_text (_("Mon"));
                }
 
-               if (_route && _route->solo_safe()) {
+               if (_route && _route->solo_safe_control()->solo_safe()) {
                        solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive));
                } else {
                        solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() & ~Gtkmm2ext::Insensitive));
@@ -2169,7 +2179,7 @@ MixerStrip::set_button_names ()
                        monitor_section_button->set_text (S_("Mon|O"));
                }
 
-               if (_route && _route->solo_safe()) {
+               if (_route && _route->solo_safe_control()->solo_safe()) {
                        solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive));
                } else {
                        solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() & ~Gtkmm2ext::Insensitive));
@@ -2261,11 +2271,9 @@ MixerStrip::parameter_changed (string p)
                   our VisibilityGroup to reflect these changes in our widgets.
                */
                _visibility.set_state (UIConfiguration::instance().get_mixer_strip_visibility ());
-       }
-       else if (p == "track-name-number") {
+       } else if (p == "track-name-number") {
                name_changed ();
-       }
-       else if (p == "use-monitor-bus") {
+       } else if (p == "use-monitor-bus") {
                if (monitor_section_button) {
                        if (mute_button->get_parent()) {
                                mute_button->get_parent()->remove(*mute_button);
@@ -2283,6 +2291,8 @@ MixerStrip::parameter_changed (string p)
                                mute_button->show();
                        }
                }
+       } else if (p == "track-name-number") {
+               update_track_number_visibility();
        }
 }
 
@@ -2487,105 +2497,43 @@ MixerStrip::set_meter_type (MeterType t)
 }
 
 void
-MixerStrip::vca_menu_toggle (CheckMenuItem* menuitem, uint32_t n)
+MixerStrip::update_track_number_visibility ()
 {
-       if (!_route) {
-               return;
-       }
-
-       boost::shared_ptr<VCA> vca = _session->vca_manager().vca_by_number (n);
-
-       if (!vca) {
-               return;
-       }
+       DisplaySuspender ds;
+       bool show_label = _session->config.get_track_name_number();
 
-       if (!_selected) {
-               /* if this strip is not selected, add it before carrying out
-                  changes to assignment. the user probably didn't notice
-                  that they were clicking on an unselected track.
-               */
-               _mixer.select_strip (*this);
+       if (_route && _route->is_master()) {
+               show_label = false;
        }
 
-       if (!menuitem->get_active()) {
-               cerr << "Unassign from " << n << endl;
-               _mixer.do_vca_unassign (vca);
+       if (show_label) {
+               number_label.show ();
+               // see ArdourButton::on_size_request(), we should probably use a global size-group here instead.
+               // except the width of the number label is subtracted from the name-hbox, so we
+               // need to explictly calculate it anyway until the name-label & entry become ArdourWidgets.
+               int tnw = (2 + std::max(2u, _session->track_number_decimals())) * number_label.char_pixel_width();
+               if (tnw & 1) --tnw;
+               number_label.set_size_request(tnw, -1);
+               number_label.show ();
        } else {
-               cerr << "Assign to " << n << endl;
-               _mixer.do_vca_assign (vca);
+               number_label.hide ();
        }
 }
 
-void
-MixerStrip::vca_assign (boost::shared_ptr<VCA> vca)
+Gdk::Color
+MixerStrip::color () const
 {
-       if (!vca || !_route) {
-               return;
-       }
-       _route->gain_control()->add_master (vca);
-       vca->add_solo_mute_target (_route);
+       return route_color ();
 }
 
-void
-MixerStrip::vca_unassign (boost::shared_ptr<VCA> vca)
+bool
+MixerStrip::marked_for_display () const
 {
-       if (!_route) {
-               return;
-       }
-
-       if (!vca) {
-               /* null VCA means drop all VCA assignments */
-               _route->gain_control()->clear_masters ();
-               /* XXX Need to remove all solo/mute target entries */
-       } else {
-               _route->gain_control()->remove_master (vca);
-               vca->remove_solo_mute_target (_route);
-       }
+       return !_route->presentation_info().hidden();
 }
 
 bool
-MixerStrip::vca_button_release (GdkEventButton* ev)
+MixerStrip::set_marked_for_display (bool yn)
 {
-       using namespace Gtk::Menu_Helpers;
-
-       if (!_session) {
-               return false;
-       }
-
-       /* primary click only */
-
-       if (ev->button != 1) {
-               return false;
-       }
-
-       if (!_route) {
-               /* no route - nothing to do */
-               return false;
-       }
-
-       VCAList vcas (_session->vca_manager().vcas());
-
-       if (vcas.empty()) {
-               /* XXX should probably show a message saying "No VCA masters" */
-               return true;
-       }
-
-       Menu* menu = new Menu;
-       MenuList& items = menu->items();
-
-       items.push_back (MenuElem (_("Unassign"), sigc::bind (sigc::mem_fun (_mixer, &Mixer_UI::do_vca_unassign), boost::shared_ptr<VCA>())));
-
-       for (VCAList::iterator v = vcas.begin(); v != vcas.end(); ++v) {
-               items.push_back (CheckMenuElem ((*v)->name()));
-               CheckMenuItem* item = dynamic_cast<CheckMenuItem*> (&items.back());
-               if (_route->slaved_to (*v)) {
-                       cerr << "Yes, slaved to " << (*v)->name() << " aka " << (*v)->number() << endl;
-                       item->set_active (true);
-               }
-               item->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &MixerStrip::vca_menu_toggle), item, (*v)->number()));
-       }
-
-       menu->popup (1, ev->time);
-
-       return true;
+       return RouteUI::mark_hidden (!yn);
 }