more flat_button refactoring. try centering the gain and peak displays

[ardour.git] / gtk2_ardour / gain_meter.cc

diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index 67f9ce9370260f0705f3fb50231f4a4c7be3874c..420d356c903d737392990ba1520af293cefdadad 100644 (file)
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -30,9 +30,7 @@
 #include <gdkmm/color.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/fastmeter.h>
-#include <gtkmm2ext/barcontroller.h>
 #include <gtkmm2ext/gtk_ui.h>
-#include "midi++/manager.h"
 #include "pbd/fastlog.h"
 #include "pbd/stacktrace.h"
 
@@ -55,6 +53,7 @@
 #include "i18n.h"
 
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 using namespace PBD;
 using namespace Gtkmm2ext;
 using namespace Gtk;
@@ -99,12 +98,14 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int
        gain_display.signal_activate().connect (sigc::mem_fun (*this, &GainMeter::gain_activated));
        gain_display.signal_focus_in_event().connect (sigc::mem_fun (*this, &GainMeter::gain_focused), false);
        gain_display.signal_focus_out_event().connect (sigc::mem_fun (*this, &GainMeter::gain_focused), false);
+       gain_display.set_alignment(0.5);
 
        peak_display.set_name ("MixerStripPeakDisplay");
        set_size_request_to_display_given_text (peak_display, "-80.g", 2, 6); /* note the descender */
        max_peak = minus_infinity();
-       peak_display.set_label (_("-inf"));
+       peak_display.set_text (_("-inf"));
        peak_display.unset_flags (Gtk::CAN_FOCUS);
+       peak_display.set_alignment(0.5);
 
        gain_automation_style_button.set_name ("mixer strip button");
        gain_automation_state_button.set_name ("mixer strip button");
@@ -136,16 +137,6 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int
        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));
-       
-//     PBD::ScopedConnection _config_connection;
-//     Config->ParameterChanged.connect ( _config_connection, MISSING_INVALIDATOR, boost::bind(&GainMeterBase::set_flat_buttons, this, _1), gui_context() );
-}
-
-void
-GainMeterBase::set_flat_buttons ()
-{
-printf("set_flat_butt\n");
-//     gain_slider->set_flat_buttons( ARDOUR_UI::config()->flat_buttons.get() );
 }
 
 GainMeterBase::~GainMeterBase ()
@@ -275,19 +266,29 @@ void
 GainMeterBase::setup_meters (int len)
 {
        int meter_width = 5;
+       uint32_t meter_channels = 0;
+       if (_meter) {
+               meter_channels = _meter->input_streams().n_total();
+       } else if (_route) {
+               meter_channels = _route->shared_peak_meter()->input_streams().n_total();
+       }
 
        switch (_width) {
                case Wide:
-                       meter_ticks1_area.show();
-                       meter_ticks2_area.show();
-                       if (_route && _route->shared_peak_meter()->input_streams().n_total() == 1) {
+                       //meter_ticks1_area.show();
+                       //meter_ticks2_area.show();
+                       meter_metric_area.show();
+                       if (meter_channels == 1) {
                                meter_width = 10;
                        }
                        break;
                case Narrow:
-                       meter_width = 2;
-                       meter_ticks1_area.hide();
-                       meter_ticks2_area.hide();
+                       if (meter_channels > 1) {
+                               meter_width = 4;
+                       }
+                       //meter_ticks1_area.hide();
+                       //meter_ticks2_area.hide();
+                       meter_metric_area.hide();
                        break;
        }
        level_meter->setup_meters(len, meter_width);
@@ -354,7 +355,7 @@ GainMeterBase::reset_peak_display ()
        _meter->reset_max();
        level_meter->clear_meters();
        max_peak = -INFINITY;
-       peak_display.set_label (_("-inf"));
+       peak_display.set_text (_("-inf"));
        peak_display.set_name ("MixerStripPeakDisplay");
 }
 
@@ -853,10 +854,10 @@ GainMeterBase::update_meters()
        if (mpeak > max_peak) {
                max_peak = mpeak;
                if (mpeak <= -200.0f) {
-                       peak_display.set_label (_("-inf"));
+                       peak_display.set_text (_("-inf"));
                } else {
                        snprintf (buf, sizeof(buf), "%.1f", mpeak);
-                       peak_display.set_label (buf);
+                       peak_display.set_text (buf);
                }
        }
        if (mpeak >= Config->get_meter_peak()) {
@@ -864,7 +865,7 @@ GainMeterBase::update_meters()
        }
 }
 
-void GainMeterBase::color_handler(bool dpi)
+void GainMeterBase::color_handler(bool /*dpi*/)
 {
        setup_meters();
 }
@@ -904,6 +905,11 @@ GainMeter::GainMeter (Session* s, int fader_length)
        }
        gain_display_box.pack_start (gain_display, true, true);
 
+       if (peak_display.get_parent()) {
+               peak_display.get_parent()->remove (gain_display);
+       }
+       gain_display_box.pack_start (peak_display, true, true);
+
        meter_metric_area.set_name ("AudioTrackMetrics");
        meter_metric_area.set_size_request(24, -1);
 
@@ -1006,6 +1012,7 @@ GainMeter::get_gm_width ()
 {
        Gtk::Requisition sz;
        int min_w = 0;
+       sz.width = 0;
        meter_metric_area.size_request (sz);
        min_w += sz.width;
        level_meter->size_request (sz);