update ALSA backend, MIDI device config

[ardour.git] / gtk2_ardour / gain_meter.cc

diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index b7b53a64bf0909faa179c7a23e32530574d6cae0..7e781cafd93cd1d6724f33f68dfd89264a229c2b 100644 (file)
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -32,7 +32,6 @@
 #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"
 
@@ -99,6 +98,7 @@ 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(1.0);
 
        peak_display.set_name ("MixerStripPeakDisplay");
        set_size_request_to_display_given_text (peak_display, "-80.g", 2, 6); /* note the descender */
@@ -144,8 +144,7 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int
 void
 GainMeterBase::set_flat_buttons ()
 {
-printf("set_flat_butt\n");
-//     gain_slider->set_flat_buttons( ARDOUR_UI::config()->get_flat_buttons() );
+//     gain_slider->set_flat_buttons( ARDOUR_UI::config()->flat_buttons.get() );
 }
 
 GainMeterBase::~GainMeterBase ()
@@ -275,19 +274,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);
@@ -904,6 +913,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 +1020,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);