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

diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index 3af9641070..50592c7757 100644
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -101,8 +101,8 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int
 	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 * ARDOUR_UI::ui_scale);
+	fader_girth = rint (fader_girth * ARDOUR_UI::ui_scale);
 
 	if (horizontal) {
 		gain_slider = manage (new HSliderController (&gain_adjustment, boost::shared_ptr<PBD::Controllable>(), fader_length, fader_girth));
@@ -265,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_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);
@@ -544,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:
@@ -936,7 +936,7 @@ GainMeterBase::redraw_metrics()
 	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 * ARDOUR_UI::ui_scale))
 
 GainMeter::GainMeter (Session* s, int fader_length)
 	: GainMeterBase (s, false, fader_length, 24)
@@ -953,8 +953,6 @@ GainMeter::GainMeter (Session* s, int fader_length)
 	}
 	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);
 
@@ -1122,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