patch from lincoln to make MIDI track height changes no longer just grow note height...
[ardour.git] / gtk2_ardour / mixer_strip.cc
index 64b388f030d2fde63ea4f96dfb655ef410472c5e..bbef4ffbf61db9b92694e85f69f8a3e412c23cbf 100644 (file)
@@ -28,7 +28,6 @@
 #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"
@@ -77,13 +77,14 @@ PBD::Signal1<void,MixerStrip*> MixerStrip::CatchDeletion;
 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, boost::bind (&MixerStrip::plugin_selector, this), mx.selection(), this, in_mixer)
        , gpm (sess, 250)
        , panners (sess)
        , _mono_button (_("Mono"))
        , button_table (4, 2)
+       , solo_led_table (2, 2)
        , middle_button_table (1, 2)
        , bottom_button_table (1, 2)
        , meter_point_label (_("pre"))
@@ -103,7 +104,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)
        , 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)
@@ -115,7 +116,6 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr<Route> rt
        , comment_button (_("Comments"))
 {
        init ();
-       set_button_names ();
        set_route (rt);
 }
 
@@ -185,6 +185,44 @@ MixerStrip::init ()
        solo_button->set_name ("MixerSoloButton");
         invert_button->set_name ("MixerInvertButton");
 
+        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);
 
@@ -237,6 +275,7 @@ MixerStrip::init ()
        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 (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);
@@ -326,6 +365,11 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 
        RouteUI::set_route (rt);
 
+       /* map the current state */
+
+       mute_changed (0);
+       update_solo_display ();
+
        delete input_selector;
        input_selector = 0;
 
@@ -342,8 +386,10 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 
         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())) {
@@ -360,16 +406,18 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        }
 
        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());
+       }
 
+       if (is_track ()) {
+               
                button_table.attach (*rec_enable_button, 0, 2, 2, 3);
                rec_enable_button->set_sensitive (_session->writable());
                rec_enable_button->show();
 
-       } else if (!is_track()) {
+       } else {
+               
                /* non-master bus */
 
                if (!_route->is_master()) {
@@ -378,11 +426,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
                }
        }
 
-       if (_route->phase_invert()) {
-               name_label.set_text (X_("Ø ") + name_label.get_text());
-       } else {
-               name_label.set_text (_route->name());
-       }
+       invert_button->set_active (_route->phase_invert ());
 
        _mono_button.set_name ("MixerMonoButton");
        _mono_button.signal_clicked().connect (sigc::mem_fun (*this, &MixerStrip::mono_button_clicked));
@@ -433,7 +477,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        /* 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 ();
@@ -1377,8 +1421,8 @@ MixerStrip::build_route_ops_menu ()
 
        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)));
@@ -1387,10 +1431,10 @@ MixerStrip::build_route_ops_menu ()
 
        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 (_("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());
 
@@ -1403,17 +1447,21 @@ MixerStrip::build_route_ops_menu ()
        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
@@ -1449,9 +1497,6 @@ MixerStrip::name_changed ()
                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
@@ -1732,35 +1777,42 @@ MixerStrip::set_button_names ()
        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;
 
        }