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 dcbf99d3a54b39ebb6dae4f4206bcef0628ec4a3..f67682019ed082627a88f8e3a95c26d4d170b943 100644 (file)
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -26,10 +26,13 @@
 #include <ardour/session_route.h>
 #include <ardour/dB.h>
 
+#include <gtkmm/style.h>
+#include <gdkmm/color.h>
 #include <gtkmm2ext/utils.h>
 #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>
 
@@ -43,6 +46,7 @@
 
 #include <ardour/session.h>
 #include <ardour/route.h>
+#include <ardour/meter.h>
 
 #include "i18n.h"
 
@@ -83,6 +87,7 @@ GainMeter::GainMeter (boost::shared_ptr<IO> io, Session& s)
        ignore_toggle = false;
        meter_menu = 0;
        next_release_selects = false;
+       style_changed = true;
 
        gain_slider = manage (new VSliderController (slider,
                                                     &gain_adjustment,
@@ -100,6 +105,7 @@ GainMeter::GainMeter (boost::shared_ptr<IO> io, Session& s)
        gain_display.signal_focus_in_event().connect (mem_fun (*this, &GainMeter::gain_focused), false);
        gain_display.signal_focus_out_event().connect (mem_fun (*this, &GainMeter::gain_focused), false);
 
+       gain_display_box.set_name ("MeterMetricsStrip");
        gain_display_box.set_homogeneous (true);
        gain_display_box.set_spacing (2);
        gain_display_box.pack_start (gain_display, true, true);
@@ -137,9 +143,12 @@ GainMeter::GainMeter (boost::shared_ptr<IO> io, Session& s)
        fader_vbox->pack_start (*fader_centering_box, false, false, 0);
 
        hbox.set_spacing (2);
-       hbox.pack_start (*fader_vbox, true, true);
 
-       set_width(Narrow);
+       if (_io->default_type() == ARDOUR::DataType::AUDIO) {
+               hbox.pack_start (*fader_vbox, true, true);
+       }
+       
+       set_width (Narrow);
 
        Route* r;
 
@@ -202,6 +211,8 @@ 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));
+
+       UI::instance()->theme_changed.connect (mem_fun(*this, &GainMeter::on_theme_changed));
 }
 
 void
@@ -223,6 +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
        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));
@@ -264,9 +276,20 @@ 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) {
+               meter_style = meter_metric_area.get_style();
+       }
+               
        Glib::RefPtr<Gdk::Window> win (meter_metric_area.get_window());
-       Glib::RefPtr<Gdk::GC> fg_gc (meter_metric_area.get_style()->get_fg_gc (Gtk::STATE_NORMAL));
-       Glib::RefPtr<Gdk::GC> bg_gc (meter_metric_area.get_style()->get_bg_gc (Gtk::STATE_NORMAL));
+       Glib::RefPtr<Gdk::GC> fg_gc (meter_style->get_fg_gc (Gtk::STATE_NORMAL));
+       Glib::RefPtr<Gdk::GC> bg_gc (meter_style->get_bg_gc (Gtk::STATE_NORMAL));
+
        GdkRectangle base_rect;
        GdkRectangle draw_rect;
        gint width, height;
@@ -281,7 +304,7 @@ GainMeter::meter_metrics_expose (GdkEventExpose *ev)
        Glib::RefPtr<Gdk::Pixmap> pixmap;
        std::map<string,Glib::RefPtr<Gdk::Pixmap> >::iterator i = metric_pixmaps.find (meter_metric_area.get_name());
 
-       if (i == metric_pixmaps.end()) {
+       if (i == metric_pixmaps.end() || style_changed) {
                pixmap = render_metrics (meter_metric_area);
        } else {
                pixmap = i->second;
@@ -289,11 +312,18 @@ GainMeter::meter_metrics_expose (GdkEventExpose *ev)
 
        gdk_rectangle_intersect (&ev->area, &base_rect, &draw_rect);
        win->draw_rectangle (bg_gc, true, draw_rect.x, draw_rect.y, draw_rect.width, draw_rect.height);
-       win->draw_drawable (bg_gc, pixmap, draw_rect.x, draw_rect.y, draw_rect.x, draw_rect.y, draw_rect.width, draw_rect.height);
+       win->draw_drawable (fg_gc, pixmap, draw_rect.x, draw_rect.y, draw_rect.x, draw_rect.y, draw_rect.width, draw_rect.height);
        
+       style_changed = false;
        return true;
 }
 
+void
+GainMeter::on_theme_changed()
+{
+       style_changed = true;
+}
+
 GainMeter::~GainMeter ()
 {
        if (meter_menu) {
@@ -317,11 +347,11 @@ GainMeter::update_meters ()
        
        for (n = 0, i = meters.begin(); i != meters.end(); ++i, ++n) {
                if ((*i).packed) {
-                       peak = _io->peak_input_power (n);
+                       peak = _io->peak_meter().peak_power (n);
 
-                       (*i).meter->set (log_meter (peak), peak);
+                       (*i).meter->set (log_meter (peak));
 
-                       mpeak = _io->max_peak_power(n);
+                       mpeak = _io->peak_meter().max_peak_power(n);
                        
                        if (mpeak > max_peak) {
                                max_peak = mpeak;
@@ -385,7 +415,7 @@ GainMeter::hide_all_meters ()
 void
 GainMeter::setup_meters ()
 {
-       uint32_t nmeters = _io->n_outputs();
+       uint32_t nmeters = _io->n_outputs().n_total();
        guint16 width;
 
        hide_all_meters ();
@@ -395,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();
+                       nmeters = r->n_inputs().n_total();
+                       break;
+               case MeterPreFader:
+                       nmeters = r->pre_fader_streams().n_total();
                        break;
                case MeterPostFader:
-                       nmeters = r->n_outputs();
+                       nmeters = r->n_outputs().n_total();
                        break;
                }
 
        } else {
 
-               nmeters = _io->n_outputs();
+               nmeters = _io->n_outputs().n_total();
 
        }
 
@@ -427,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 ();
        }
 
@@ -450,8 +482,7 @@ GainMeter::setup_meters ()
 int
 GainMeter::get_gm_width ()
 {
-       Gtk::Requisition sz;
-       hbox.size_request (sz);
+       Gtk::Requisition sz = hbox.size_request ();
        return sz.width;
 }
 
@@ -490,7 +521,7 @@ GainMeter::reset_peak_display ()
 {
        Route * r;
        if ((r = dynamic_cast<Route*> (_io.get())) != 0) {
-               r->reset_max_peak_meters();
+               r->peak_meter().reset_max();
        }
 
        max_peak = -INFINITY;