auditioner always runs at normal speed, independent of transport speed

[ardour.git] / gtk2_ardour / gain_meter.cc

diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index f03a001b1ad04913bfa6846f41b62ec25f33d82d..02c3967f1614495a937e59b1dc25f4cb6011894f 100644 (file)
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -19,6 +19,12 @@
 
 #include <limits.h>
 
+#include <pangomm.h>
+
+#include <gtkmm/alignment.h>
+#include <gdkmm/color.h>
+#include <gtkmm/style.h>
+
 #include "ardour/amp.h"
 #include "ardour/logmeter.h"
 #include "ardour/route_group.h"
@@ -26,12 +32,11 @@
 #include "ardour/dB.h"
 #include "ardour/utils.h"
 
-#include <pangomm.h>
-#include <gtkmm/style.h>
-#include <gdkmm/color.h>
-#include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/fastmeter.h>
-#include <gtkmm2ext/gtk_ui.h>
+#include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/gtk_ui.h"
+
+#include "widgets/tooltips.h"
+
 #include "pbd/fastlog.h"
 #include "pbd/stacktrace.h"
 
@@ -42,7 +47,6 @@
 #include "utils.h"
 #include "meter_patterns.h"
 #include "timers.h"
-#include "tooltips.h"
 #include "ui_config.h"
 
 #include "ardour/session.h"
@@ -55,7 +59,7 @@
 #include "pbd/i18n.h"
 
 using namespace ARDOUR;
-using namespace ARDOUR_UI_UTILS;
+using namespace ArdourWidgets;
 using namespace PBD;
 using namespace Gtkmm2ext;
 using namespace Gtk;
@@ -119,7 +123,7 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int
        meter_metric_area.signal_button_press_event().connect (sigc::mem_fun (*this, &GainMeterBase::level_meter_button_press));
        meter_metric_area.add_events (Gdk::BUTTON_PRESS_MASK);
 
-       gain_slider->set_tweaks (PixFader::Tweaks(PixFader::NoButtonForward | PixFader::NoVerticalScroll));
+       gain_slider->set_tweaks (ArdourFader::Tweaks(ArdourFader::NoButtonForward | ArdourFader::NoVerticalScroll));
        gain_slider->StartGesture.connect (sigc::mem_fun (*this, &GainMeter::amp_start_touch));
        gain_slider->StopGesture.connect (sigc::mem_fun (*this, &GainMeter::amp_stop_touch));
        gain_slider->set_name ("GainFader");
@@ -258,6 +262,8 @@ GainMeterBase::set_controls (boost::shared_ptr<Route> r,
                                                              sigc::bind (sigc::mem_fun (*this, &GainMeterBase::set_gain_astate), (AutoState) ARDOUR::Write)));
                gain_astate_menu.items().push_back (MenuElem (_("Touch"),
                                                              sigc::bind (sigc::mem_fun (*this, &GainMeterBase::set_gain_astate), (AutoState) ARDOUR::Touch)));
+               gain_astate_menu.items().push_back (MenuElem (_("Latch"),
+                                                             sigc::bind (sigc::mem_fun (*this, &GainMeterBase::set_gain_astate), (AutoState) ARDOUR::Latch)));
 
                connections.push_back (gain_automation_state_button.signal_button_press_event().connect (sigc::mem_fun(*this, &GainMeterBase::gain_automation_state_button_event), false));
                connections.push_back (ChangeGainAutomationState.connect (sigc::mem_fun(*this, &GainMeterBase::set_gain_astate)));
@@ -288,7 +294,12 @@ GainMeterBase::set_gain_astate (AutoState as)
                ChangeGainAutomationState (as);
                return;
        }
-       _amp->set_parameter_automation_state (Evoral::Parameter (GainAutomation), as);
+       if (_amp) {
+               _amp->set_parameter_automation_state (Evoral::Parameter (GainAutomation), as);
+       } else if (_control) {
+               _control->set_automation_state (as);
+               _session->set_dirty ();
+       }
 }
 
 void
@@ -310,7 +321,7 @@ GainMeterBase::setup_gain_adjustment ()
                gain_adjustment.set_upper (GAIN_COEFF_UNITY);
                gain_adjustment.set_step_increment (dB_coeff_step(Config->get_max_gain()) / 10.0);
                gain_adjustment.set_page_increment (dB_coeff_step(Config->get_max_gain()));
-               gain_slider->set_default_value (gain_to_slider_position (GAIN_COEFF_UNITY));
+               gain_slider->set_default_value (gain_to_slider_position_with_max (GAIN_COEFF_UNITY, Config->get_max_gain()));
        } else {
                _data_type = DataType::MIDI;
                gain_adjustment.set_lower (0.0);
@@ -408,7 +419,7 @@ GainMeter::set_type (MeterType t)
 bool
 GainMeterBase::gain_key_press (GdkEventKey* ev)
 {
-       if (key_is_legal_for_numeric_entry (ev->keyval)) {
+       if (ARDOUR_UI_UTILS::key_is_legal_for_numeric_entry (ev->keyval)) {
                /* drop through to normal handling */
                return false;
        }
@@ -617,7 +628,8 @@ GainMeterBase::effective_gain_display ()
 void
 GainMeterBase::gain_changed ()
 {
-       Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&GainMeterBase::effective_gain_display, this));
+       ENSURE_GUI_THREAD (*this, &GainMeterBase::gain_automation_state_changed);
+       effective_gain_display ();
 }
 
 void
@@ -641,7 +653,7 @@ void
 GainMeterBase::update_gain_sensitive ()
 {
        bool x = !(_control->alist()->automation_state() & Play);
-       static_cast<Gtkmm2ext::SliderController*>(gain_slider)->set_sensitive (x);
+       static_cast<ArdourWidgets::SliderController*>(gain_slider)->set_sensitive (x);
 }
 
 gint
@@ -727,7 +739,7 @@ GainMeterBase::amp_start_touch ()
 void
 GainMeterBase::amp_stop_touch ()
 {
-       _control->stop_touch (false, _control->session().transport_frame());
+       _control->stop_touch (_control->session().transport_frame());
        effective_gain_display ();
 }
 
@@ -772,16 +784,19 @@ GainMeterBase::_astate_string (AutoState state, bool shrt)
 
        switch (state) {
        case ARDOUR::Off:
-               sstr = (shrt ? "M" : _("M"));
+               sstr = (shrt ? "M" : S_("Manual|M"));
                break;
        case Play:
-               sstr = (shrt ? "P" : _("P"));
+               sstr = (shrt ? "P" : S_("Play|P"));
                break;
        case Touch:
-               sstr = (shrt ? "T" : _("T"));
+               sstr = (shrt ? "T" : S_("Trim|T"));
+               break;
+       case Latch:
+               sstr = (shrt ? "L" : S_("Latch|L"));
                break;
        case Write:
-               sstr = (shrt ? "W" : _("W"));
+               sstr = (shrt ? "W" : S_("Write|W"));
                break;
        }
 
@@ -813,14 +828,6 @@ GainMeterBase::gain_automation_state_changed ()
        update_gain_sensitive ();
 
        gain_watching.disconnect();
-
-       if (automation_watch_required) {
-               /* start watching automation so that things move */
-               gain_watching = Timers::rapid_connect (sigc::mem_fun (*this, &GainMeterBase::effective_gain_display));
-       } else {
-               /* update once to get the correct value shown as we re-enter off/manual mode */
-               effective_gain_display();
-       }
 }
 
 const ChanCount