remove debug output from last commit
[ardour.git] / gtk2_ardour / mixer_strip.cc
index b089883c80a2d5a98f650af89ea1abaf0f589c32..70e0a6aa1865f31e1e396a5f5cd42b0215a3e600 100644 (file)
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <cmath>
+#include <algorithm>
 
 #include <sigc++/bind.h>
 
@@ -63,6 +63,9 @@ using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;
 using namespace Gtkmm2ext;
+using namespace std;
+
+int MixerStrip::scrollbar_height = 0;
 
 #ifdef VARISPEED_IN_MIXER_STRIP
 static void 
@@ -110,8 +113,8 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
        comment_window = 0;
        comment_area = 0;
 
-       width_button.add (*(manage (new Gtk::Image (get_xpm("lr.xpm")))));
-       hide_button.add (*(manage (new Gtk::Image (get_xpm("small_x.xpm")))));
+       width_button.add (*(manage (new Gtk::Image (::get_icon("strip_width")))));
+       hide_button.add (*(manage (new Gtk::Image (::get_icon("hide")))));
 
        input_label.set_text (_("Input"));
        input_button.add (input_label);
@@ -124,49 +127,39 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
        output_label.set_name ("MixerIOButtonLabel");
 
        _route->meter_change.connect (mem_fun(*this, &MixerStrip::meter_changed));
-               meter_point_button.add (meter_point_label);
-               meter_point_button.set_name ("MixerStripMeterPreButton");
-               meter_point_label.set_name ("MixerStripMeterPreButton");
-               
-               switch (_route->meter_point()) {
-               case MeterInput:
-                       meter_point_label.set_text (_("input"));
-                       break;
-                       
-               case MeterPreFader:
-                       meter_point_label.set_text (_("pre"));
-                       break;
-                       
-               case MeterPostFader:
-                       meter_point_label.set_text (_("post"));
-                       break;
-               }
+       meter_point_button.add (meter_point_label);
+       meter_point_button.set_name ("MixerStripMeterPreButton");
+       meter_point_label.set_name ("MixerStripMeterPreButton");
+       
+       switch (_route->meter_point()) {
+       case MeterInput:
+               meter_point_label.set_text (_("input"));
+               break;
                
-               /* TRANSLATORS: this string should be longest of the strings
-                  used to describe meter points. In english, its "input".
-               */
+       case MeterPreFader:
+               meter_point_label.set_text (_("pre"));
+               break;
                
-               set_size_request_to_display_given_text (meter_point_button, _("tupni"), 5, 5);
-
-
-               bottom_button_table.attach (meter_point_button, 1, 2, 0, 1);
-
-
+       case MeterPostFader:
+               meter_point_label.set_text (_("post"));
+               break;
+       }
+       
+       /* TRANSLATORS: this string should be longest of the strings
+          used to describe meter points. In english, it's "input".
+       */
+       set_size_request_to_display_given_text (meter_point_button, _("tupni"), 5, 5);
+    
+       bottom_button_table.attach (meter_point_button, 1, 2, 0, 1);
+    
        meter_point_button.signal_button_press_event().connect (mem_fun (gpm, &GainMeter::meter_press), false);
        /* XXX what is this meant to do? */
        //meter_point_button.signal_button_release_event().connect (mem_fun (gpm, &GainMeter::meter_release), false);
 
-       solo_button->set_name ("MixerSoloButton");
-       mute_button->set_name ("MixerMuteButton");
-
        hide_button.set_events (hide_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
 
-       width_button.unset_flags (Gtk::CAN_FOCUS);
-       hide_button.unset_flags (Gtk::CAN_FOCUS);
-       input_button.unset_flags (Gtk::CAN_FOCUS);
-       output_button.unset_flags (Gtk::CAN_FOCUS);
-       solo_button->unset_flags (Gtk::CAN_FOCUS);
-       mute_button->unset_flags (Gtk::CAN_FOCUS);
+       mute_button->set_name ("MixerMuteButton");
+       solo_button->set_name ("MixerSoloButton");
 
        button_table.set_homogeneous (true);
        button_table.set_spacings (0);
@@ -185,9 +178,10 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
 
        if (is_audio_track()) {
                
+               rec_enable_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::rec_enable_press), false);
+               rec_enable_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::rec_enable_release));
+
                rec_enable_button->set_name ("MixerRecordEnableButton");
-               rec_enable_button->unset_flags (Gtk::CAN_FOCUS);
-               rec_enable_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::rec_enable_press));
 
                AudioTrack* at = audio_track();
 
@@ -236,15 +230,17 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
        global_vpacker.set_border_width (0);
        global_vpacker.set_spacing (0);
 
-       Gtk::VBox *whvbox = manage (new Gtk::VBox);
+       VBox *whvbox = manage (new VBox);
 
        width_button.set_name ("MixerWidthButton");
        hide_button.set_name ("MixerHideButton");
+       top_event_box.set_name ("MixerTopEventBox");
 
        width_button.signal_clicked().connect (mem_fun(*this, &MixerStrip::width_clicked));
        hide_button.signal_clicked().connect (mem_fun(*this, &MixerStrip::hide_clicked));
 
        width_hide_box.pack_start (width_button, false, true);
+       width_hide_box.pack_start (top_event_box, true, true);
        width_hide_box.pack_end (hide_button, false, true);
        Gtk::Alignment *gain_meter_alignment = Gtk::manage(new Gtk::Alignment());
        gain_meter_alignment->set_padding(0, 4, 0, 0);
@@ -263,6 +259,19 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
        global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK);
        global_vpacker.pack_start (comment_button, Gtk::PACK_SHRINK);
 
+       if (route()->master() || route()->control()) {
+               
+               if (scrollbar_height == 0) {
+                       HScrollbar scrollbar;
+                       Gtk::Requisition requisition(scrollbar.size_request ());
+                       scrollbar_height = requisition.height;
+               }
+
+               EventBox* spacer = manage (new EventBox);
+               spacer->set_size_request (-1, scrollbar_height);
+               global_vpacker.pack_start (*spacer, false, false);
+       }
+
        global_frame.add (global_vpacker);
        global_frame.set_shadow_type (Gtk::SHADOW_IN);
        global_frame.set_name ("BaseFrame");
@@ -382,8 +391,7 @@ MixerStrip::set_stuff_from_route ()
                } else {
                        _marked_for_display = true;
                }
-       }
-       else {
+       } else {
                /* backwards compatibility */
                _marked_for_display = true;
        }
@@ -405,52 +413,56 @@ MixerStrip::set_width (Width w)
        ensure_xml_node ();
        
        _width = w;
-
+       
        switch (w) {
        case Wide:
                set_size_request (-1, -1);
                xml_node->add_property ("strip_width", "wide");
-
-               if (rec_enable_button) {
-                       rec_enable_button->set_label (_("record"));
+               
+               if (rec_enable_button)  {
+                       ((Gtk::Label*)rec_enable_button->get_child())->set_text (_("record"));
                }
-               mute_button->set_label  (_("mute"));
-               solo_button->set_label (_("solo"));
+               ((Gtk::Label*)mute_button->get_child())->set_text  (_("Mute"));
+               ((Gtk::Label*)solo_button->get_child())->set_text (_("Solo"));
 
                if (_route->comment() == "") {
-                      comment_button.set_label (_("comments"));
+                      comment_button.unset_bg (STATE_NORMAL);
+                      ((Gtk::Label*)comment_button.get_child())->set_text (_("comments"));
                } else {
-                      comment_button.set_label (_("*comments*"));
+                      comment_button.modify_bg (STATE_NORMAL, color());
+                      ((Gtk::Label*)comment_button.get_child())->set_text (_("*comments*"));
                }
 
-               gpm.gain_automation_style_button.set_label (gpm.astyle_string(_route->gain_automation_curve().automation_style()));
-               gpm.gain_automation_state_button.set_label (gpm.astate_string(_route->gain_automation_curve().automation_state()));
-               panners.pan_automation_style_button.set_label (panners.astyle_string(_route->panner().automation_style()));
-               panners.pan_automation_state_button.set_label (panners.astate_string(_route->panner().automation_state()));
+               ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (gpm.astyle_string(_route->gain_automation_curve().automation_style()));
+               ((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (gpm.astate_string(_route->gain_automation_curve().automation_state()));
+               ((Gtk::Label*)panners.pan_automation_style_button.get_child())->set_text (panners.astyle_string(_route->panner().automation_style()));
+               ((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text (panners.astate_string(_route->panner().automation_state()));
                Gtkmm2ext::set_size_request_to_display_given_text (name_button, "long", 2, 2);
                break;
 
        case Narrow:
-               set_size_request (50, -1);
                xml_node->add_property ("strip_width", "narrow");
 
                if (rec_enable_button) {
-                       rec_enable_button->set_label (_("Rec"));
+                       ((Gtk::Label*)rec_enable_button->get_child())->set_text (_("Rec"));
                }
-               mute_button->set_label (_("M"));
-               solo_button->set_label (_("S"));
+               ((Gtk::Label*)mute_button->get_child())->set_text (_("M"));
+               ((Gtk::Label*)solo_button->get_child())->set_text (_("S"));
 
                if (_route->comment() == "") {
-                      comment_button.set_label (_("Cmt"));
+                      comment_button.unset_bg (STATE_NORMAL);
+                      ((Gtk::Label*)comment_button.get_child())->set_text (_("Cmt"));
                } else {
-                      comment_button.set_label (_("*Cmt*"));
+                      comment_button.modify_bg (STATE_NORMAL, color());
+                      ((Gtk::Label*)comment_button.get_child())->set_text (_("*Cmt*"));
                }
 
-               gpm.gain_automation_style_button.set_label (gpm.short_astyle_string(_route->gain_automation_curve().automation_style()));
-               gpm.gain_automation_state_button.set_label (gpm.short_astate_string(_route->gain_automation_curve().automation_state()));
-               panners.pan_automation_style_button.set_label (panners.short_astyle_string(_route->panner().automation_style()));
-               panners.pan_automation_state_button.set_label (panners.short_astate_string(_route->panner().automation_state()));
+               ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (gpm.short_astyle_string(_route->gain_automation_curve().automation_style()));
+               ((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (gpm.short_astate_string(_route->gain_automation_curve().automation_state()));
+               ((Gtk::Label*)panners.pan_automation_style_button.get_child())->set_text (panners.short_astyle_string(_route->panner().automation_style()));
+               ((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text (panners.short_astate_string(_route->panner().automation_state()));
                Gtkmm2ext::set_size_request_to_display_given_text (name_button, "longest label", 2, 2);
+               set_size_request (max (50, gpm.get_gm_width()), -1);
                break;
        }
 
@@ -499,7 +511,7 @@ MixerStrip::output_press (GdkEventButton *ev)
                citems.push_back (SeparatorElem());
                
                _session.foreach_connection (this, &MixerStrip::add_connection_to_output_menu);
-               
+
                output_menu.popup (1, ev->time);
                break;
                
@@ -555,13 +567,13 @@ MixerStrip::input_press (GdkEventButton *ev)
        switch (ev->button) {
 
        case 1:
-
                citems.push_back (MenuElem (_("Edit"), mem_fun(*this, &MixerStrip::edit_input_configuration)));
                citems.push_back (SeparatorElem());
                citems.push_back (MenuElem (_("Disconnect"), mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_input)));
                citems.push_back (SeparatorElem());
                
                _session.foreach_connection (this, &MixerStrip::add_connection_to_input_menu);
+
                input_menu.popup (1, ev->time);
                break;
                
@@ -759,6 +771,42 @@ MixerStrip::output_changed (IOChange change, void *src)
        Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_output_display));
 }
 
+
+void 
+MixerStrip::comment_editor_done_editing() {
+       string str =  comment_area->get_buffer()->get_text();
+       if (_route->comment() != str) {
+               _route->set_comment (str, this);
+
+               switch (_width) {
+                  
+               case Wide:
+                       if (! str.empty()) {
+                               comment_button.modify_bg (STATE_NORMAL, color());
+                               ((Gtk::Label*)comment_button.get_child())->set_text (_("*Comments*"));
+                       } else {
+                               comment_button.unset_bg (STATE_NORMAL);
+                               ((Gtk::Label*)comment_button.get_child())->set_text (_("Comments"));
+                       }
+                       break;
+                  
+               case Narrow:
+                       if (! str.empty()) {
+                               comment_button.modify_bg (STATE_NORMAL, color());
+                               ((Gtk::Label*)comment_button.get_child())->set_text (_("*Cmt*"));
+                       } else {
+                               comment_button.unset_bg (STATE_NORMAL);
+                               ((Gtk::Label*)comment_button.get_child())->set_text (_("Cmt"));
+                       } 
+                       break;
+               }
+                
+               ARDOUR_UI::instance()->tooltips().set_tip (comment_button, 
+                               str.empty() ? _("Click to Add/Edit Comments") : str);
+       }
+
+}
+
 void
 MixerStrip::comment_button_clicked ()
 {
@@ -766,38 +814,13 @@ MixerStrip::comment_button_clicked ()
                setup_comment_editor ();
        }
 
-        int x, y, cw_width, cw_height;
+    int x, y, cw_width, cw_height;
 
        if (comment_window->is_visible()) {
-              string str =  comment_area->get_buffer()->get_text();
-              if (_route->comment() != str) {
-                _route->set_comment (str, this);
+               comment_window->hide ();
+               return;
+       }
 
-                switch (_width) {
-                  
-                case Wide:
-                  if (! str.empty()) {
-                    comment_button.set_label (_("*Comments*"));
-                  } else {
-                    comment_button.set_label (_("Comments"));
-                     }
-                  break;
-                  
-                case Narrow:
-                  if (! str.empty()) {
-                    comment_button.set_label (_("*Cmt*"));
-                  } else {
-                    comment_button.set_label (_("Cmt"));
-                  } 
-                  break;
-                }
-                
-                ARDOUR_UI::instance()->tooltips().set_tip (comment_button, 
-                                                           str.empty() ? _("Click to Add/Edit Comments") : str);
-              }
-              comment_window->hide ();
-              return;
-       } 
        comment_window->get_size (cw_width, cw_height);
        comment_window->get_position(x, y);
        comment_window->move(x, y - (cw_height / 2) - 45);
@@ -808,7 +831,6 @@ MixerStrip::comment_button_clicked ()
 
        comment_window->show();
        comment_window->present();
-
 }
 
 void
@@ -821,6 +843,7 @@ MixerStrip::setup_comment_editor ()
        comment_window = new ArdourDialog (title, false);
        comment_window->set_position (Gtk::WIN_POS_MOUSE);
        comment_window->set_skip_taskbar_hint (true);
+       comment_window->signal_hide().connect (mem_fun(*this, &MixerStrip::comment_editor_done_editing));
 
        comment_area = manage (new TextView());
        comment_area->set_name ("MixerTrackCommentArea");
@@ -936,6 +959,7 @@ void
 MixerStrip::show_route_color ()
 {
        name_button.modify_bg (STATE_NORMAL, color());
+       top_event_box.modify_bg (STATE_NORMAL, color());
        route_active_changed ();
 }
 
@@ -1077,11 +1101,17 @@ MixerStrip::width_clicked ()
 void
 MixerStrip::hide_clicked ()
 {
+    // LAME fix to reset the button status for when it is redisplayed (part 1)
+    hide_button.set_sensitive(false);
+    
        if (_embedded) {
                 Hiding(); /* EMIT_SIGNAL */
        } else {
                _mixer.hide_strip (this);
        }
+       
+    // (part 2)
+       hide_button.set_sensitive(true);
 }
 
 void
@@ -1159,21 +1189,11 @@ MixerStrip::mix_group() const
 void
 MixerStrip::engine_stopped ()
 {
-        input_button.set_sensitive (false);
-       if (rec_enable_button) {
-               rec_enable_button->set_sensitive (false);
-       }
-       output_button.set_sensitive (false);
 }
 
 void
 MixerStrip::engine_running ()
 {
-        input_button.set_sensitive (true);
-       if (rec_enable_button) {
-               rec_enable_button->set_sensitive (true);
-       }
-       output_button.set_sensitive (true);
 }
 
 void