adjust h-size of color theme manager "Reset to Defaults" button

[ardour.git] / gtk2_ardour / audio_time_axis.cc

diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc
index 01eda95d15aab936673f3c5c32561f66a30f4729..d67edd7aeafc01b6a5e6c062e8fb3edcdc5acae0 100644 (file)
--- a/gtk2_ardour/audio_time_axis.cc
+++ b/gtk2_ardour/audio_time_axis.cc
@@ -32,17 +32,15 @@
 #include "pbd/memento_command.h"
 
 #include "gtkmm2ext/gtk_ui.h"
-#include "gtkmm2ext/selector.h"
-#include "gtkmm2ext/bindable_button.h"
 #include "gtkmm2ext/utils.h"
 
+#include "widgets/ardour_button.h"
+
 #include "ardour/event_type_map.h"
 #include "ardour/pannable.h"
 #include "ardour/panner.h"
 #include "ardour/panner_shell.h"
 
-#include "ardour_button.h"
-#include "ardour_ui.h"
 #include "audio_time_axis.h"
 #include "automation_line.h"
 #include "enums.h"
@@ -50,25 +48,27 @@
 #include "automation_time_axis.h"
 #include "keyboard.h"
 #include "playlist_selector.h"
-#include "prompter.h"
 #include "public_editor.h"
 #include "audio_region_view.h"
 #include "audio_streamview.h"
+#include "ui_config.h"
 #include "utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
+using namespace ArdourWidgets;
 using namespace ARDOUR_UI_UTILS;
 using namespace PBD;
 using namespace Gtk;
 using namespace Editing;
 
 AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session* sess, ArdourCanvas::Canvas& canvas)
-       : AxisView(sess)
+       : SessionHandlePtr (sess)
        , RouteTimeAxisView(ed, sess, canvas)
 {
+       UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &AudioTimeAxisView::parameter_changed));
 }
 
 void
@@ -106,6 +106,10 @@ AudioTimeAxisView::set_route (boost::shared_ptr<Route> rt)
                create_automation_child (GainAutomation, false);
        }
 
+       if (automation_child (TrimAutomation) == 0) {
+               create_automation_child (TrimAutomation, false);
+       }
+
        /* if set_state above didn't create a mute automation child, we need to make one */
        if (automation_child (MuteAutomation) == 0) {
                create_automation_child (MuteAutomation, false);
@@ -113,7 +117,7 @@ AudioTimeAxisView::set_route (boost::shared_ptr<Route> rt)
 
        if (_route->panner_shell()) {
                _route->panner_shell()->Changed.connect (*this, invalidator (*this),
-                                                         boost::bind (&AudioTimeAxisView::ensure_pan_views, this, false), gui_context());
+                                                        boost::bind (&AudioTimeAxisView::ensure_pan_views, this, false), gui_context());
        }
 
        /* map current state of the route */
@@ -180,14 +184,14 @@ AudioTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool
        AutomationTracks::iterator existing = _automation_tracks.find (param);
 
        if (existing != _automation_tracks.end()) {
-               
+
                /* automation track created because we had existing data for
                 * the processor, but visibility may need to be controlled
                 * since it will have been set visible by default.
                 */
 
                existing->second->set_marked_for_display (show);
-               
+
                if (!no_redraw) {
                        request_redraw ();
                }
@@ -199,9 +203,13 @@ AudioTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool
 
                create_gain_automation_child (param, show);
 
+       } else if (param.type() == TrimAutomation) {
+
+               create_trim_automation_child (param, show);
+
        } else if (param.type() == PanWidthAutomation ||
-                   param.type() == PanElevationAutomation ||
-                   param.type() == PanAzimuthAutomation) {
+                  param.type() == PanElevationAutomation ||
+                  param.type() == PanAzimuthAutomation) {
 
                ensure_pan_views (show);
 
@@ -212,7 +220,7 @@ AudioTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool
        } else if (param.type() == MuteAutomation) {
 
                create_mute_automation_child (param, show);
-               
+
 
        } else {
                error << "AudioTimeAxisView: unknown automation child " << EventTypeMap::instance().to_symbol(param) << endmsg;
@@ -272,6 +280,14 @@ AudioTimeAxisView::route_active_changed ()
        update_control_names ();
 }
 
+void
+AudioTimeAxisView::parameter_changed (string const & p)
+{
+       if (p == "vertical-region-gap") {
+               _view->update_contents_height ();
+       }
+}
+
 
 /**
  *    Set up the names of the controls so that they are coloured
@@ -300,7 +316,7 @@ AudioTimeAxisView::update_control_names ()
                }
        }
 
-       if (get_selected()) {
+       if (selected()) {
                controls_ebox.set_name (controls_base_selected_name);
                time_axis_frame.set_name (controls_base_selected_name);
        } else {