X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgain_meter.cc;h=50592c77576dc3f55cca41e397d445d7784b241f;hb=4802094541a61082415cb03df52a6cf4bccc841d;hp=00c64d02f650163625b835f5514ac6ad52611c01;hpb=bb792c0e07f38d1610ec0cd4c76cf05dbb20a207;p=ardour.git

diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index 00c64d02f6..50592c7757 100644
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -43,12 +43,14 @@
 #include "public_editor.h"
 #include "utils.h"
 #include "meter_patterns.h"
+#include "timers.h"
 
 #include "ardour/session.h"
 #include "ardour/route.h"
 #include "ardour/meter.h"
 #include "ardour/audio_track.h"
 #include "ardour/midi_track.h"
+#include "ardour/dB.h"
 
 #include "i18n.h"
 
@@ -61,7 +63,6 @@ using namespace std;
 using Gtkmm2ext::Keyboard;
 using namespace ArdourMeter;
 
-
 static void
 reset_cursor_to_default (Gtk::Entry* widget)
 {
@@ -82,11 +83,14 @@ reset_cursor_to_default_state (Gtk::StateType, Gtk::Entry* widget)
 }
 
 GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int fader_girth)
-	: gain_adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()), 0.0, 1.0, 0.01, 0.1)
+	: gain_adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()),  // value
+	                   0.0,  // lower
+	                   1.0,  // upper
+	                   dB_coeff_step(Config->get_max_gain()) / 10.0,  // step increment
+	                   dB_coeff_step(Config->get_max_gain()))  // page increment
 	, gain_automation_style_button ("")
 	, gain_automation_state_button ("")
 	, _data_type (DataType::AUDIO)
-
 {
 	using namespace Menu_Helpers;
 
@@ -97,10 +101,13 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int
 	next_release_selects = false;
 	_width = Wide;
 
+	fader_length = rint (fader_length * ARDOUR_UI::ui_scale);
+	fader_girth = rint (fader_girth * ARDOUR_UI::ui_scale);
+
 	if (horizontal) {
-		gain_slider = manage (new HSliderController (&gain_adjustment, fader_length, fader_girth));
+		gain_slider = manage (new HSliderController (&gain_adjustment, boost::shared_ptr<PBD::Controllable>(), fader_length, fader_girth));
 	} else {
-		gain_slider = manage (new VSliderController (&gain_adjustment, fader_length, fader_girth));
+		gain_slider = manage (new VSliderController (&gain_adjustment, boost::shared_ptr<PBD::Controllable>(), fader_length, fader_girth));
 	}
 
 	level_meter = new LevelMeterHBox(_session);
@@ -258,11 +265,11 @@ GainMeterBase::setup_gain_adjustment ()
 
 	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_step_increment (0.01);
-		gain_adjustment.set_page_increment (0.1);
-		gain_slider->set_default_value (gain_to_slider_position (1));
+		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 (GAIN_COEFF_UNITY));
 	} else {
 		_data_type = DataType::MIDI;
 		gain_adjustment.set_lower (0.0);
@@ -537,7 +544,7 @@ GainMeterBase::gain_adjusted ()
 void
 GainMeterBase::effective_gain_display ()
 {
-	float value = 0.0;
+	float value = GAIN_COEFF_ZERO;
 
 	switch (_data_type) {
 	case DataType::AUDIO:
@@ -610,7 +617,7 @@ next_meter_point (MeterPoint mp)
 		break;
 	}
 
-	/*NOTREACHED*/
+	abort(); /*NOTREACHED*/
 	return MeterInput;
 }
 
@@ -869,7 +876,7 @@ GainMeterBase::gain_automation_state_changed ()
 	gain_watching.disconnect();
 
 	if (x) {
-		gain_watching = ARDOUR_UI::RapidScreenUpdate.connect (sigc::mem_fun (*this, &GainMeterBase::effective_gain_display));
+		gain_watching = Timers::rapid_connect (sigc::mem_fun (*this, &GainMeterBase::effective_gain_display));
 	}
 }
 
@@ -894,7 +901,7 @@ GainMeterBase::update_meters()
 			peak_display.set_text (buf);
 		}
 	}
-	if (mpeak >= Config->get_meter_peak()) {
+	if (mpeak >= ARDOUR_UI::config()->get_meter_peak()) {
 		peak_display.set_name ("MixerStripPeakDisplayPeak");
 	}
 }
@@ -929,6 +936,8 @@ GainMeterBase::redraw_metrics()
 	meter_ticks2_area.queue_draw ();
 }
 
+#define PX_SCALE(pxmin, dflt) rint(std::max((double)pxmin, (double)dflt * ARDOUR_UI::ui_scale))
+
 GainMeter::GainMeter (Session* s, int fader_length)
 	: GainMeterBase (s, false, fader_length, 24)
 	, gain_display_box(true, 0)
@@ -945,7 +954,7 @@ GainMeter::GainMeter (Session* s, int fader_length)
 	gain_display_box.pack_start (peak_display, true, true);
 
 	meter_metric_area.set_name ("AudioTrackMetrics");
-	meter_metric_area.set_size_request(24, -1);
+	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");
@@ -956,8 +965,8 @@ GainMeter::GainMeter (Session* s, int fader_length)
 	gain_automation_style_button.unset_flags (Gtk::CAN_FOCUS);
 	gain_automation_state_button.unset_flags (Gtk::CAN_FOCUS);
 
-	gain_automation_state_button.set_size_request(15, 15);
-	gain_automation_style_button.set_size_request(15, 15);
+	gain_automation_state_button.set_size_request (PX_SCALE(12, 15), PX_SCALE(12, 15));
+	gain_automation_style_button.set_size_request (PX_SCALE(12, 15), PX_SCALE(12, 15));
 
 	fader_vbox = manage (new Gtk::VBox());
 	fader_vbox->set_spacing (0);
@@ -968,7 +977,7 @@ GainMeter::GainMeter (Session* s, int fader_length)
 
 	hbox.pack_start (fader_alignment, true, true);
 
-	set_spacing (2);
+	set_spacing (PX_SCALE(2, 2));
 
 	pack_start (gain_display_box, Gtk::PACK_SHRINK);
 	pack_start (hbox, Gtk::PACK_SHRINK);
@@ -979,8 +988,8 @@ GainMeter::GainMeter (Session* s, int fader_length)
 	meter_metric_area.signal_expose_event().connect (
 		sigc::mem_fun(*this, &GainMeter::meter_metrics_expose));
 
-	meter_ticks1_area.set_size_request(3,-1);
-	meter_ticks2_area.set_size_request(3,-1);
+	meter_ticks1_area.set_size_request (PX_SCALE(3, 3), -1);
+	meter_ticks2_area.set_size_request (PX_SCALE(3, 3), -1);
 
 	meter_ticks1_area.signal_expose_event().connect (
 			sigc::mem_fun(*this, &GainMeter::meter_ticks1_expose));
@@ -992,6 +1001,7 @@ GainMeter::GainMeter (Session* s, int fader_length)
 	meter_hbox.pack_start (meter_ticks2_area, false, false);
 	meter_hbox.pack_start (meter_metric_area, false, false);
 }
+#undef PX_SCALE
 
 GainMeter::~GainMeter () { }
 
@@ -1110,7 +1120,7 @@ GainMeterBase::get_controllable()
 bool
 GainMeterBase::level_meter_button_press (GdkEventButton* ev)
 {
-	return !!LevelMeterButtonPress (ev); /* EMIT SIGNAL */
+	return static_cast<bool>(LevelMeterButtonPress (ev)); /* EMIT SIGNAL */
 }
 
 void