Use signal_toggled instead of signal_clicked in ThemeManager so a theme is only ...

[ardour.git] / gtk2_ardour / gain_meter.cc

diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index 9ad23bb80cefd33679b2a1e81532348edb35453e..f67682019ed082627a88f8e3a95c26d4d170b943 100644 (file)
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -32,6 +32,7 @@
 #include <gtkmm2ext/fastmeter.h>
 #include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/barcontroller.h>
+#include <gtkmm2ext/gtk_ui.h>
 #include <midi++/manager.h>
 #include <pbd/fastlog.h>
 
@@ -211,7 +212,7 @@ GainMeter::GainMeter (boost::shared_ptr<IO> io, Session& s)
        ResetAllPeakDisplays.connect (mem_fun(*this, &GainMeter::reset_peak_display));
        ResetGroupPeakDisplays.connect (mem_fun(*this, &GainMeter::reset_group_peak_display));
 
-       ThemeChanged.connect (mem_fun(*this, &GainMeter::redraw_pixmaps));
+       UI::instance()->theme_changed.connect (mem_fun(*this, &GainMeter::on_theme_changed));
 }
 
 void
@@ -233,7 +234,7 @@ GainMeter::set_width (Width w)
 Glib::RefPtr<Gdk::Pixmap>
 GainMeter::render_metrics (Gtk::Widget& w)
 {
-       cerr << "GainMeter::render_metrics() called, red = " << w.get_style()->get_bg(Gtk::STATE_NORMAL).get_red() << endl;//DEBUG
+       //cerr << "GainMeter::render_metrics() called, red = " << w.get_style()->get_bg(Gtk::STATE_NORMAL).get_red() << endl;//DEBUG
        Glib::RefPtr<Gdk::Window> win (w.get_window());
        Glib::RefPtr<Gdk::GC> fg_gc (w.get_style()->get_fg_gc (Gtk::STATE_NORMAL));
        Glib::RefPtr<Gdk::GC> bg_gc (w.get_style()->get_bg_gc (Gtk::STATE_NORMAL));
@@ -275,6 +276,10 @@ GainMeter::render_metrics (Gtk::Widget& w)
 gint
 GainMeter::meter_metrics_expose (GdkEventExpose *ev)
 {
+       /* Only draw dB scale if we're metering audio */
+       if (_io->n_inputs().n_audio() + _io->n_outputs().n_audio() == 0)
+               return true;
+
        static Glib::RefPtr<Gtk::Style> meter_style;
        
        if (style_changed) {
@@ -313,8 +318,8 @@ GainMeter::meter_metrics_expose (GdkEventExpose *ev)
        return true;
 }
 
-int
-GainMeter::redraw_pixmaps(string blah)
+void
+GainMeter::on_theme_changed()
 {
        style_changed = true;
 }
@@ -410,7 +415,7 @@ GainMeter::hide_all_meters ()
 void
 GainMeter::setup_meters ()
 {
-       uint32_t nmeters = _io->n_outputs().n_audio();
+       uint32_t nmeters = _io->n_outputs().n_total();
        guint16 width;
 
        hide_all_meters ();
@@ -420,18 +425,20 @@ GainMeter::setup_meters ()
        if ((r = dynamic_cast<Route*> (_io.get())) != 0) {
 
                switch (r->meter_point()) {
-               case MeterPreFader:
                case MeterInput:
-                       nmeters = r->n_inputs().n_audio();
+                       nmeters = r->n_inputs().n_total();
+                       break;
+               case MeterPreFader:
+                       nmeters = r->pre_fader_streams().n_total();
                        break;
                case MeterPostFader:
-                       nmeters = r->n_outputs().n_audio();
+                       nmeters = r->n_outputs().n_total();
                        break;
                }
 
        } else {
 
-               nmeters = _io->n_outputs().n_audio();
+               nmeters = _io->n_outputs().n_total();
 
        }
 
@@ -452,7 +459,7 @@ GainMeter::setup_meters ()
        /* pack them backwards */
 
        if (_width == Wide) {
-               meter_packer.pack_end (meter_metric_area, false, false);
+               meter_packer.pack_end (meter_metric_area, false, false);
                meter_metric_area.show_all ();
        }