more fixups for the gain meter metrics

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2426 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour2_ui_dark.rc.in b/gtk2_ardour/ardour2_ui_dark.rc.in
index 1510b1c1bd28818a6d50b7d4f803e03ac403fcff..ba8e5fe1e1183970f5201d1179c8cd9313b53827 100644 (file)
--- a/gtk2_ardour/ardour2_ui_dark.rc.in
+++ b/gtk2_ardour/ardour2_ui_dark.rc.in
@@ -733,6 +733,38 @@ style "midi_track_base" = "default_base"
   bg[SELECTED] = { 0.20, 0.20, 0.20 }
 }
 
+style "track_controls_inactive" 
+{
+       bg[NORMAL] =      { 0.60, 0.60, 0.66 }
+       bg[ACTIVE] =      { 0.60, 0.60, 0.66 }
+       bg[INSENSITIVE] = { 0.60, 0.60, 0.66 }
+       bg[SELECTED] =    { 0.60, 0.60, 0.66 }
+       bg[PRELIGHT] =    { 0.60, 0.60, 0.66 }
+
+       #font_name = "sans 18"
+       fg[NORMAL] = { 0.7, 0.8, 0.2 }  
+}
+
+style "audio_track_metrics" = "audio_track_base"
+{
+       font_name = "%FONT_TINY%"
+}
+
+style "audio_bus_metrics" = "audio_bus_base"
+{
+       font_name = "%FONT_TINY%"
+}
+
+style "audio_track_metrics_inactive" = "track_controls_inactive"
+{
+       font_name = "%FONT_TINY%"
+}
+
+style "audio_bus_metrics_inactive" = "track_controls_inactive"
+{
+       font_name = "%FONT_TINY%"
+}
+
 style "track_name_display"
 {
        font_name = "%FONT_NORMAL%"
@@ -1098,11 +1130,6 @@ style "tearoff_arrow" = "medium_bold_entry"
        bg[PRELIGHT] = { 0.80, 0.80, 0.80 }
 }
 
-style "meter_metrics_strip" = "audio_track_base"
-{
-       font_name = "%FONT_TINY%"
-}
-
 style "location_row_button" = "default_buttons_menus"
 {
        font_name = "%FONT_BIG%"
@@ -1320,13 +1347,24 @@ widget "*BBTRuler" style:highest "editor_time_ruler"
 widget "*FramesRuler" style:highest "editor_time_ruler"
 widget "*MinSecRuler" style:highest "editor_time_ruler"
 widget "*BaseFrame" style:highest "base_frame"
+
 widget "*AudioTrackStripBase" style:highest "audio_track_base"
+widget "*AudioBusStripBase" style:highest "audio_bus_base"
 widget "*MidiTrackStripBase" style:highest "midi_track_base"
+widget "*AudioTrackStripBaseInactive" style:highest "track_controls_inactive"
+widget "*AudioBusStripBaseInactive" style:highest "track_controls_inactive"
+widget "*MidiTrackStripBaseInactive" style:highest "track_controls_inactive"
+widget "*FaderMetricsStrip" style:highest "audio_track_metrics"
+widget "*AudioTrackMetrics" style:highest "audio_track_metrics"
+widget "*AudioBusMetrics" style:highest "audio_bus_metrics"
+widget "*AudioTrackMetricsInactive" style:highest "audio_track_metrics_inactive"
+widget "*AudioBusMetricsInactive" style:highest "audio_bus_metrics_inactive"
+
 widget "*TimeAxisViewControlsBaseUnselected" style:highest "audio_track_base"
 widget "*AudioTrackControlsBaseUnselected" style:highest "audio_track_base"
 widget "*MidiTrackControlsBaseUnselected" style:highest "midi_track_base"
 widget "*AudioTrackFader" style:highest "gain_fader"
-widget "*AudioBusStripBase" style:highest "audio_bus_base"
+
 widget "*BusControlsBaseUnselected" style:highest "audio_bus_base"
 widget "*AudioBusFader" style:highest "gain_fader"
 widget "*TrackSeparator" style:highest "track_separator"
@@ -1358,9 +1396,6 @@ widget "*AutomationTrackName" style:highest "automation_track_name"
 widget "*AudioTrackControlsBaseInactiveSelected" style:highest "track_controls_inactive"
 widget "*BusControlsBaseInactiveSelected" style:highest "track_controls_inactive"
 widget "*AutomationTrackControlsBaseInactiveSelected" style:highest "track_controls_inactive"
-widget "*AudioTrackStripBaseInactive" style:highest "track_controls_inactive"
-widget "*MidiTrackStripBaseInactive" style:highest "track_controls_inactive"
-widget "*AudioBusStripBaseInactive" style:highest "track_controls_inactive"
 widget "*AudioTrackControlsBaseSelected" style:highest "edit_controls_base_selected"
 widget "*MidiTrackControlsBaseSelected" style:highest "edit_controls_base_selected"
 widget "*BusControlsBaseSelected" style:highest "edit_controls_base_selected"
@@ -1457,8 +1492,7 @@ widget "*PluginSaveButton" style:highest "small_button"
 widget "*PluginSaveButton*" style:highest "small_button"
 widget "*PluginLoadButton" style:highest "small_button"
 widget "*PluginLoadButton*" style:highest "small_button"
-widget "*FaderMetricsStrip" style:highest "meter_metrics_strip"
-widget "*MeterMetricsStrip" style:highest "meter_metrics_strip"
+
 widget "*MetricDialogFrame" style:highest "base_frame"
 widget "*MetricEntry" style:highest "medium_bold_entry"
 widget "*MetricButton" style:highest "default_buttons_menus"

diff --git a/gtk2_ardour/ardour2_ui_light.rc.in b/gtk2_ardour/ardour2_ui_light.rc.in
index c9c054783af8818d4112f659632ec470d2aa3b15..b8c3683e91ba8d0c9fd1590a852ad1912e97c48d 100644 (file)
--- a/gtk2_ardour/ardour2_ui_light.rc.in
+++ b/gtk2_ardour/ardour2_ui_light.rc.in
@@ -737,6 +737,38 @@ style "midi_track_base" = "default_base"
   bg[SELECTED] = { 0.70, 0.70, 0.80 } 
 }
 
+style "track_controls_inactive" 
+{
+       bg[NORMAL] =      { 0.60, 0.60, 0.66 }
+       bg[ACTIVE] =      { 0.60, 0.60, 0.66 }
+       bg[INSENSITIVE] = { 0.60, 0.60, 0.66 }
+       bg[SELECTED] =    { 0.60, 0.60, 0.66 }
+       bg[PRELIGHT] =    { 0.60, 0.60, 0.66 }
+
+       #font_name = "sans 18"
+       fg[NORMAL] = { 0.7, 0.8, 0.2 }  
+}
+
+style "audio_track_metrics" = "audio_track_base"
+{
+       font_name = "%FONT_TINY%"
+}
+
+style "audio_bus_metrics" = "audio_bus_base"
+{
+       font_name = "%FONT_TINY%"
+}
+
+style "audio_track_metrics_inactive" = "track_controls_inactive"
+{
+       font_name = "%FONT_TINY%"
+}
+
+style "audio_bus_metrics_inactive" = "track_controls_inactive"
+{
+       font_name = "%FONT_TINY%"
+}
+
 style "track_name_display"
 {
        font_name = "%FONT_NORMAL%"
@@ -1102,11 +1134,6 @@ style "tearoff_arrow" = "medium_bold_entry"
        bg[PRELIGHT] = { 0.30, 0.30, 0.30 }
 }
 
-style "meter_metrics_strip" = "audio_track_base"
-{
-       font_name = "%FONT_TINY%"
-}
-
 style "location_row_button" = "default_buttons_menus"
 {
        font_name = "%FONT_SMALL%"
@@ -1324,11 +1351,24 @@ widget "*BBTRuler" style:highest "editor_time_ruler"
 widget "*FramesRuler" style:highest "editor_time_ruler"
 widget "*MinSecRuler" style:highest "editor_time_ruler"
 widget "*BaseFrame" style:highest "base_frame"
-widget "*AudioTrackStripBase*" style:highest "audio_track_base"
+
+widget "*AudioTrackStripBase" style:highest "audio_track_base"
+widget "*AudioBusStripBase" style:highest "audio_bus_base"
+widget "*MidiTrackStripBase" style:highest "midi_track_base"
+widget "*AudioTrackStripBaseInactive" style:highest "track_controls_inactive"
+widget "*AudioBusStripBaseInactive" style:highest "track_controls_inactive"
+widget "*MidiTrackStripBaseInactive" style:highest "track_controls_inactive"
+widget "*FaderMetricsStrip" style:highest "audio_track_metrics"
+widget "*AudioTrackMetrics" style:highest "audio_track_metrics"
+widget "*AudioBusMetrics" style:highest "audio_bus_metrics"
+widget "*AudioTrackMetricsInactive" style:highest "audio_track_metrics_inactive"
+widget "*AudioBusMetricsInactive" style:highest "audio_bus_metrics_inactive"
+
 widget "*TimeAxisViewControlsBaseUnselected" style:highest "audio_track_base"
 widget "*AudioTrackControlsBaseUnselected" style:highest "audio_track_base"
+widget "*MidiTrackControlsBaseUnselected" style:highest "midi_track_base"
 widget "*AudioTrackFader" style:highest "gain_fader"
-widget "*AudioBusStripBase" style:highest "audio_bus_base"
+
 widget "*BusControlsBaseUnselected" style:highest "audio_bus_base"
 widget "*AudioBusFader" style:highest "gain_fader"
 widget "*TrackSeparator" style:highest "track_separator"
@@ -1360,9 +1400,8 @@ widget "*AutomationTrackName" style:highest "automation_track_name"
 widget "*AudioTrackControlsBaseInactiveSelected" style:highest "track_controls_inactive"
 widget "*BusControlsBaseInactiveSelected" style:highest "track_controls_inactive"
 widget "*AutomationTrackControlsBaseInactiveSelected" style:highest "track_controls_inactive"
-widget "*AudioTrackStripBaseInactive" style:highest "track_controls_inactive"
-widget "*AudioBusStripBaseInactive" style:highest "track_controls_inactive"
 widget "*AudioTrackControlsBaseSelected" style:highest "edit_controls_base_selected"
+widget "*MidiTrackControlsBaseSelected" style:highest "edit_controls_base_selected"
 widget "*BusControlsBaseSelected" style:highest "edit_controls_base_selected"
 widget "*AutomationTrackControlsBase" style:highest "automation_track_controls_base"
 widget "*AutomationTrackControlsBaseSelected" style:highest "edit_controls_base_selected"
@@ -1457,8 +1496,7 @@ widget "*PluginSaveButton" style:highest "small_button"
 widget "*PluginSaveButton*" style:highest "small_button"
 widget "*PluginLoadButton" style:highest "small_button"
 widget "*PluginLoadButton*" style:highest "small_button"
-widget "*FaderMetricsStrip" style:highest "meter_metrics_strip"
-widget "*MeterMetricsStrip" style:highest "meter_metrics_strip"
+
 widget "*MetricDialogFrame" style:highest "base_frame"
 widget "*MetricEntry" style:highest "medium_bold_entry"
 widget "*MetricButton" style:highest "default_buttons_menus"

diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index 25eba68401f19b2483f1116795e0ddd7725e84a6..791d6704cc253b8f0807d1cf20871a6998507694 100644 (file)
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -113,7 +113,7 @@ GainMeter::GainMeter (boost::shared_ptr<IO> io, Session& s)
        peak_display.set_label (_("-inf"));
        peak_display.unset_flags (Gtk::CAN_FOCUS);
 
-       meter_metric_area.set_name ("MeterMetricsStrip");
+       meter_metric_area.set_name ("AudioTrackMetrics");
        set_size_request_to_display_given_text (meter_metric_area, "-50", 0, 0);
 
        meter_packer.set_spacing (2);
@@ -226,6 +226,9 @@ GainMeter::set_width (Width w)
 Glib::RefPtr<Gdk::Pixmap>
 GainMeter::render_metrics (Gtk::Widget& w)
 {
+       //cerr << "name: " << w.get_name();//DEBUG
+       //cerr << " bg_red = " << w.get_style()->get_bg(Gtk::STATE_NORMAL).get_red();//DEBUG
+       //cerr << " fg_red = " << w.get_style()->get_fg(Gtk::STATE_NORMAL).get_red();//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));
@@ -268,13 +271,15 @@ gint
 GainMeter::meter_metrics_expose (GdkEventExpose *ev)
 {
        static Glib::RefPtr<Gtk::Style> meter_style;
-
+       //cerr << "GainMeter::meter_metrics_expose() called on " << meter_metric_area.get_name();//DEBUG
+       //cerr << " style_changed = " << style_changed;//DEBUG
        if (style_changed) {
                meter_style = meter_metric_area.get_style();
+       //      cerr << " get_style() called ";//DEBUG
        }
        Glib::RefPtr<Gdk::Window> win (meter_metric_area.get_window());
-       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));
+       //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_INSENSITIVE));
        GdkRectangle base_rect;
        GdkRectangle draw_rect;
        gint width, height;
@@ -293,12 +298,13 @@ GainMeter::meter_metrics_expose (GdkEventExpose *ev)
                pixmap = render_metrics (meter_metric_area);
        } else {
                pixmap = i->second;
+       //      cerr << " re-used " << i->first;//DEBUG
        }
 
        gdk_rectangle_intersect (&ev->area, &base_rect, &draw_rect);
-       win->draw_rectangle (bg_gc, false, 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);
-       
+       //win->draw_rectangle (bg_gc, false, 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);
+       //cerr << endl;//DEBUG
        style_changed = false;
        return true;
 }
@@ -640,7 +646,8 @@ GainMeter::gain_changed (void *src)
 void
 GainMeter::set_meter_strip_name (const char * name)
 {
-       // meter_metric_area.set_name (name);
+       meter_metric_area.set_name (name);
+       style_changed = true;
 }
 
 void

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index cd382c41e6e34972b8144c5d03a239749976d9ec..0bb9e40b19e0b75adac43882909567ad22e9a093 100644 (file)
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -1167,19 +1167,19 @@ MixerStrip::route_active_changed ()
        if (is_audio_track()) {
                if (_route->active()) {
                        set_name ("AudioTrackStripBase");
-                       gpm.set_meter_strip_name ("AudioTrackStripBase");
+                       gpm.set_meter_strip_name ("AudioTrackMetrics");
                } else {
                        set_name ("AudioTrackStripBaseInactive");
-                       gpm.set_meter_strip_name ("AudioTrackStripBaseInactive");
+                       gpm.set_meter_strip_name ("AudioTrackMetricsInactive");
                }
                gpm.set_fader_name ("AudioTrackFader");
        } else { // FIXME: assumed audio bus
                if (_route->active()) {
                        set_name ("AudioBusStripBase");
-                       gpm.set_meter_strip_name ("AudioBusStripBase");
+                       gpm.set_meter_strip_name ("AudioBusMetrics");
                } else {
                        set_name ("AudioBusStripBaseInactive");
-                       gpm.set_meter_strip_name ("AudioBusStripBaseInactive");
+                       gpm.set_meter_strip_name ("AudioBusMetricsInactive");
                }
                gpm.set_fader_name ("AudioBusFader");
        }

diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index 7e92f8357949fad841aee54de77502201205347d..e123b6a7d8436cb28193c974071aaa900313dbd9 100644 (file)
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -124,7 +124,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        RedirectBox pre_redirect_box;
        RedirectBox post_redirect_box;
        GainMeter   gpm;
-               PannerUI    panners;
+       PannerUI    panners;
        
        Gtk::Table button_table;
        Gtk::Table middle_button_table;