#include "pbd/fastlog.h"
#include "pbd/stacktrace.h"
-#include "ardour_ui.h"
#include "gain_meter.h"
-#include "global_signals.h"
#include "logmeter.h"
#include "gui_thread.h"
#include "keyboard.h"
#include "utils.h"
#include "meter_patterns.h"
#include "timers.h"
+#include "tooltips.h"
+#include "ui_config.h"
#include "ardour/session.h"
#include "ardour/route.h"
next_release_selects = false;
_width = Wide;
- fader_length = rint (fader_length * ARDOUR_UI::config()->get_font_scale() / 102400.);
- fader_girth = rint (fader_girth * ARDOUR_UI::config()->get_font_scale() / 102400.);
+ fader_length = rint (fader_length * UIConfiguration::instance().get_ui_scale());
+ fader_girth = rint (fader_girth * UIConfiguration::instance().get_ui_scale());
if (horizontal) {
gain_slider = manage (new HSliderController (&gain_adjustment, boost::shared_ptr<PBD::Controllable>(), fader_length, fader_girth));
max_peak = minus_infinity();
peak_display.set_text (_("-inf"));
peak_display.set_alignment(0.5);
-
+
/* stuff related to the fact that the peak display is not, in
- fact, supposed to be a text entry.
+ fact, supposed to be a text entry.
*/
peak_display.set_events (peak_display.get_events() & ~(Gdk::EventMask (Gdk::LEAVE_NOTIFY_MASK|Gdk::ENTER_NOTIFY_MASK|Gdk::POINTER_MOTION_MASK)));
peak_display.signal_map().connect (sigc::bind (sigc::ptr_fun (reset_cursor_to_default), &peak_display));
gain_automation_style_button.set_name ("mixer strip button");
gain_automation_state_button.set_name ("mixer strip button");
- ARDOUR_UI::instance()->set_tip (gain_automation_state_button, _("Fader automation mode"));
- ARDOUR_UI::instance()->set_tip (gain_automation_style_button, _("Fader automation type"));
+ set_tooltip (gain_automation_state_button, _("Fader automation mode"));
+ set_tooltip (gain_automation_style_button, _("Fader automation type"));
gain_automation_style_button.unset_flags (Gtk::CAN_FOCUS);
gain_automation_state_button.unset_flags (Gtk::CAN_FOCUS);
gain_astate_menu.set_name ("ArdourContextMenu");
gain_astyle_menu.set_name ("ArdourContextMenu");
- gain_adjustment.signal_value_changed().connect (sigc::mem_fun(*this, &GainMeterBase::gain_adjusted));
+ gain_adjustment.signal_value_changed().connect (sigc::mem_fun(*this, &GainMeterBase::fader_moved));
peak_display.signal_button_release_event().connect (sigc::mem_fun(*this, &GainMeterBase::peak_button_release), false);
gain_display.signal_key_press_event().connect (sigc::mem_fun(*this, &GainMeterBase::gain_key_press), false);
RedrawMetrics.connect (sigc::mem_fun(*this, &GainMeterBase::redraw_metrics));
UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &GainMeterBase::on_theme_changed));
- ColorsChanged.connect (sigc::bind(sigc::mem_fun (*this, &GainMeterBase::color_handler), false));
- DPIReset.connect (sigc::bind(sigc::mem_fun (*this, &GainMeterBase::color_handler), true));
+ UIConfiguration::instance().ColorsChanged.connect (sigc::bind(sigc::mem_fun (*this, &GainMeterBase::color_handler), false));
+ UIConfiguration::instance().DPIReset.connect (sigc::bind(sigc::mem_fun (*this, &GainMeterBase::color_handler), true));
}
GainMeterBase::~GainMeterBase ()
void
GainMeterBase::set_controls (boost::shared_ptr<Route> r,
boost::shared_ptr<PeakMeter> pm,
- boost::shared_ptr<Amp> amp)
+ boost::shared_ptr<Amp> amp,
+ boost::shared_ptr<GainControl> control)
{
- connections.clear ();
+ connections.clear ();
model_connections.drop_connections ();
- if (!pm && !amp) {
+ /* no meter and no control? nothing to do ... */
+
+ if (!pm && !control) {
level_meter->set_meter (0);
gain_slider->set_controllable (boost::shared_ptr<PBD::Controllable>());
_meter.reset ();
_amp.reset ();
_route.reset ();
+ _control.reset ();
return;
}
_meter = pm;
_amp = amp;
_route = r;
+ _control = control;
- level_meter->set_meter (pm.get());
- gain_slider->set_controllable (amp->gain_control());
+ level_meter->set_meter (pm.get());
+ gain_slider->set_controllable (_control);
if (amp) {
amp->ConfigurationChanged.connect (
connections.push_back (gain_automation_style_button.signal_button_press_event().connect (sigc::mem_fun(*this, &GainMeterBase::gain_automation_style_button_event), false));
connections.push_back (gain_automation_state_button.signal_button_press_event().connect (sigc::mem_fun(*this, &GainMeterBase::gain_automation_state_button_event), false));
- boost::shared_ptr<AutomationControl> gc = amp->gain_control();
-
- gc->alist()->automation_state_changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeter::gain_automation_state_changed, this), gui_context());
- gc->alist()->automation_style_changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeter::gain_automation_style_changed, this), gui_context());
+ _control->alist()->automation_state_changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeter::gain_automation_state_changed, this), gui_context());
+ _control->alist()->automation_style_changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeter::gain_automation_style_changed, this), gui_context());
gain_automation_state_changed ();
}
- amp->gain_control()->Changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeterBase::gain_changed, this), gui_context());
+ _control->Changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeterBase::gain_changed, this), gui_context());
gain_changed ();
show_gain ();
if (_amp->output_streams().n_midi() <= _amp->output_streams().n_audio()) {
_data_type = DataType::AUDIO;
- gain_adjustment.set_lower (0.0);
- gain_adjustment.set_upper (1.0);
+ gain_adjustment.set_lower (GAIN_COEFF_ZERO);
+ 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 (1));
+ gain_slider->set_default_value (gain_to_slider_position (GAIN_COEFF_UNITY));
} else {
_data_type = DataType::MIDI;
gain_adjustment.set_lower (0.0);
ignore_toggle = false;
effective_gain_display ();
-
+
_previous_amp_output_streams = _amp->output_streams ();
}
// if they use different LC_NUMERIC conventions,
// we will honor them.
- PBD::LocaleGuard lg ("");
+ PBD::LocaleGuard lg;
if (sscanf (gain_display.get_text().c_str(), "%f", &f) != 1) {
return;
}
/* clamp to displayable values */
if (_data_type == DataType::AUDIO) {
f = min (f, 6.0f);
- _amp->set_gain (dB_to_coefficient(f), this);
+ _control->set_value (dB_to_coefficient(f), Controllable::NoGroup);
} else {
f = min (fabs (f), 2.0f);
- _amp->set_gain (f, this);
+ _control->set_value (f, Controllable::NoGroup);
}
if (gain_display.has_focus()) {
}
void
-GainMeterBase::gain_adjusted ()
+GainMeterBase::fader_moved ()
{
- gain_t value;
+ if (!ignore_toggle) {
- /* convert from adjustment range (0..1) to gain coefficient */
+ gain_t value;
+ const gain_t master_gain = _control->get_master_gain ();
+
+ /* convert from adjustment range (0..1) to gain coefficient */
+
+ if (_data_type == DataType::AUDIO) {
+
+ if (_control->slaved ()) {
+
+ /* fader has been moved. The initial position of the fader
+ reflects any master gain (see ::gain_changed() below). So
+ when we reset the actual gain value, we have to remove the
+ influence of the master gain (if any).
+
+ but ... the fader is non-linear. a given number of dB will have a
+ relatively small effect on fader position far from the 0dB
+ position, and a larger effect near to it.
+
+ so... we take the current gain value, and compute where the
+ fader was BEFORE it was moved. Then we compute how the
+ position delta that the master gain caused.
+
+ once we have that value, we subtract it from the current
+ fader position, which gives us the current fader position as
+ if there was no master.
+ */
+
+ const gain_t current_value = _control->get_value (); /* current value */
+ const float position_delta_caused_by_master = gain_to_slider_position_with_max (current_value * master_gain, Config->get_max_gain()) -
+ gain_to_slider_position_with_max (current_value, Config->get_max_gain());
+
+ /* this is "where would the fader be now if the master
+ wan't changing things?"
+ */
+
+ const float adjusted_position = min (gain_adjustment.get_upper(), max (gain_adjustment.get_lower(), gain_adjustment.get_value() - position_delta_caused_by_master));
+
+ value = slider_position_to_gain_with_max (adjusted_position, Config->get_max_gain());
+
+ } else {
+
+ value = slider_position_to_gain_with_max (gain_adjustment.get_value(), Config->get_max_gain());
+ }
- if (_data_type == DataType::AUDIO) {
- value = slider_position_to_gain_with_max (gain_adjustment.get_value(), Config->get_max_gain());
- } else {
- value = gain_adjustment.get_value();
- }
-
- if (!ignore_toggle) {
- if (_route && _route->amp() == _amp) {
- _route->set_gain (value, this);
} else {
- _amp->set_gain (value, this);
+ value = gain_adjustment.get_value();
+ }
+
+ if (_route && _control == _route->gain_control()) {
+ _route->set_gain (value, Controllable::UseGroup);
+ } else {
+ _control->set_value (value, Controllable::NoGroup);
}
}
void
GainMeterBase::effective_gain_display ()
{
- float value = 0.0;
+ gain_t fader_position = 0;
switch (_data_type) {
case DataType::AUDIO:
- value = gain_to_slider_position_with_max (_amp->gain(), Config->get_max_gain());
+ /* the position of the fader should reflect any master gain,
+ * not just the control's own inherent value
+ */
+ fader_position = gain_to_slider_position_with_max (_control->get_value() * _control->get_master_gain(), Config->get_max_gain());
break;
case DataType::MIDI:
- value = _amp->gain ();
+ fader_position = _control->get_value ();
break;
}
- if (gain_adjustment.get_value() != value) {
+ if (gain_adjustment.get_value() != fader_position) {
ignore_toggle = true;
- gain_adjustment.set_value (value);
+ gain_adjustment.set_value (fader_position);
ignore_toggle = false;
}
}
void
GainMeterBase::update_gain_sensitive ()
{
- bool x = !(_amp->gain_control()->alist()->automation_state() & Play);
+ bool x = !(_control->alist()->automation_state() & Play);
static_cast<Gtkmm2ext::SliderController*>(gain_slider)->set_sensitive (x);
}
void
GainMeterBase::amp_start_touch ()
{
- _amp->gain_control()->start_touch (_amp->session().transport_frame());
+ _control->start_touch (_control->session().transport_frame());
}
void
GainMeterBase::amp_stop_touch ()
{
- _amp->gain_control()->stop_touch (false, _amp->session().transport_frame());
+ _control->stop_touch (false, _control->session().transport_frame());
}
gint
{
switch (_width) {
case Wide:
- gain_automation_style_button.set_text (astyle_string(_amp->gain_control()->alist()->automation_style()));
+ gain_automation_style_button.set_text (astyle_string(_control->alist()->automation_style()));
break;
case Narrow:
- gain_automation_style_button.set_text (short_astyle_string(_amp->gain_control()->alist()->automation_style()));
+ gain_automation_style_button.set_text (short_astyle_string(_control->alist()->automation_style()));
break;
}
}
void
GainMeterBase::gain_automation_state_changed ()
{
- ENSURE_GUI_THREAD (*this, &GainMeterBase::gain_automation_state_changed)
-
- bool x;
+ ENSURE_GUI_THREAD (*this, &GainMeterBase::gain_automation_state_changed);
switch (_width) {
case Wide:
- gain_automation_state_button.set_text (astate_string(_amp->gain_control()->alist()->automation_state()));
+ gain_automation_state_button.set_text (astate_string(_control->alist()->automation_state()));
break;
case Narrow:
- gain_automation_state_button.set_text (short_astate_string(_amp->gain_control()->alist()->automation_state()));
+ gain_automation_state_button.set_text (short_astate_string(_control->alist()->automation_state()));
break;
}
- x = (_amp->gain_control()->alist()->automation_state() != ARDOUR::Off);
+ const bool automation_watch_required = (_control->alist()->automation_state() != ARDOUR::Off);
- if (gain_automation_state_button.get_active() != x) {
+ if (gain_automation_state_button.get_active() != automation_watch_required) {
ignore_toggle = true;
- gain_automation_state_button.set_active (x);
+ gain_automation_state_button.set_active (automation_watch_required);
ignore_toggle = false;
}
update_gain_sensitive ();
- /* start watching automation so that things move */
-
gain_watching.disconnect();
- if (x) {
+ 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();
}
}
peak_display.set_text (buf);
}
}
- if (mpeak >= ARDOUR_UI::config()->get_meter_peak()) {
+ if (mpeak >= UIConfiguration::instance().get_meter_peak()) {
peak_display.set_name ("MixerStripPeakDisplayPeak");
}
}
meter_ticks2_area.queue_draw ();
}
-#define PX_SCALE(pxmin, dflt) rint(std::max((double)pxmin, (double)dflt * scale))
+#define PX_SCALE(pxmin, dflt) rint(std::max((double)pxmin, (double)dflt * UIConfiguration::instance().get_ui_scale()))
GainMeter::GainMeter (Session* s, int fader_length)
: GainMeterBase (s, false, fader_length, 24)
}
gain_display_box.pack_start (peak_display, true, true);
- const double scale = ARDOUR_UI::config()->get_font_scale() / 102400.;
-
meter_metric_area.set_name ("AudioTrackMetrics");
meter_metric_area.set_size_request(PX_SCALE(24, 24), -1);
gain_automation_style_button.set_name ("mixer strip button");
gain_automation_state_button.set_name ("mixer strip button");
- ARDOUR_UI::instance()->set_tip (gain_automation_state_button, _("Fader automation mode"));
- ARDOUR_UI::instance()->set_tip (gain_automation_style_button, _("Fader automation type"));
+ set_tooltip (gain_automation_state_button, _("Fader automation mode"));
+ set_tooltip (gain_automation_style_button, _("Fader automation type"));
gain_automation_style_button.unset_flags (Gtk::CAN_FOCUS);
gain_automation_state_button.unset_flags (Gtk::CAN_FOCUS);
set_spacing (PX_SCALE(2, 2));
pack_start (gain_display_box, Gtk::PACK_SHRINK);
- pack_start (hbox, Gtk::PACK_SHRINK);
+ pack_start (hbox, true, true);
meter_alignment.set (0.5, 0.5, 0.0, 1.0);
meter_alignment.add (*level_meter);
void
GainMeter::set_controls (boost::shared_ptr<Route> r,
boost::shared_ptr<PeakMeter> meter,
- boost::shared_ptr<Amp> amp)
+ boost::shared_ptr<Amp> amp,
+ boost::shared_ptr<GainControl> control)
{
if (meter_hbox.get_parent()) {
hbox.remove (meter_hbox);
// fader_vbox->remove (gain_automation_state_button);
// }
- GainMeterBase::set_controls (r, meter, amp);
+ GainMeterBase::set_controls (r, meter, amp, control);
if (_meter) {
_meter->ConfigurationChanged.connect (
GainMeterBase::get_controllable()
{
if (_amp) {
- return _amp->gain_control();
+ return _control;
} else {
return boost::shared_ptr<PBD::Controllable>();
}
bool
GainMeterBase::level_meter_button_press (GdkEventButton* ev)
{
- return !!LevelMeterButtonPress (ev); /* EMIT SIGNAL */
+ return static_cast<bool>(LevelMeterButtonPress (ev)); /* EMIT SIGNAL */
}
void
projects / ardour.git / blobdiff