#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"
#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"
#include "utils.h"
#include "meter_patterns.h"
#include "timers.h"
-#include "tooltips.h"
#include "ui_config.h"
#include "ardour/session.h"
#include "pbd/i18n.h"
using namespace ARDOUR;
-using namespace ARDOUR_UI_UTILS;
+using namespace ArdourWidgets;
using namespace PBD;
using namespace Gtkmm2ext;
using namespace Gtk;
if (horizontal) {
gain_slider = manage (new HSliderController (&gain_adjustment, boost::shared_ptr<PBD::Controllable>(), fader_length, fader_girth));
+ gain_slider->set_tweaks (ArdourFader::Tweaks(ArdourFader::NoButtonForward | ArdourFader::NoVerticalScroll));
} else {
gain_slider = manage (new VSliderController (&gain_adjustment, boost::shared_ptr<PBD::Controllable>(), fader_length, fader_girth));
+ gain_slider->set_tweaks (ArdourFader::NoButtonForward);
}
level_meter = new LevelMeterHBox(_session);
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->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");
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)));
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
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;
}
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
void
GainMeterBase::amp_start_touch ()
{
- _control->start_touch (_control->session().transport_frame());
+ _control->start_touch (_control->session().transport_sample());
}
void
GainMeterBase::amp_stop_touch ()
{
- _control->stop_touch (false, _control->session().transport_frame());
+ _control->stop_touch (_control->session().transport_sample());
effective_gain_display ();
}
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;
}