Make sure we don't deactivate un-activated plugins or re-activate already activated...

[ardour.git] / gtk2_ardour / audio_time_axis.cc

diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc
index f8ace8244f9f04fbc3cf480b54ae26ee97f7886e..1766da943c42e9004135c3764133d30daa57f140 100644 (file)
--- a/gtk2_ardour/audio_time_axis.cc
+++ b/gtk2_ardour/audio_time_axis.cc
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <cstdlib>
@@ -30,7 +29,6 @@
 
 #include <pbd/error.h>
 #include <pbd/stl_delete.h>
-#include <pbd/whitespace.h>
 #include <pbd/memento_command.h>
 
 #include <gtkmm2ext/gtk_ui.h>
@@ -98,41 +96,27 @@ AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
 
        ignore_toggle = false;
 
-       mute_button->set_active (false);
-       solo_button->set_active (false);
-       
        if (is_audio_track())
                controls_ebox.set_name ("AudioTimeAxisViewControlsBaseUnselected");
        else // bus
                controls_ebox.set_name ("AudioBusControlsBaseUnselected");
 
-       /* map current state of the route */
-
-       redirects_changed (0);
-       reset_redirect_automation_curves ();
-
        ensure_xml_node ();
 
        set_state (*xml_node);
        
        _route->panner().Changed.connect (mem_fun(*this, &AudioTimeAxisView::update_pans));
 
-       if (is_audio_track()) {
+       update_control_names ();
 
-               controls_ebox.set_name ("AudioTrackControlsBaseUnselected");
-               controls_base_selected_name = "AudioTrackControlsBaseSelected";
-               controls_base_unselected_name = "AudioTrackControlsBaseUnselected";
+       if (is_audio_track()) {
 
                /* ask for notifications of any new RegionViews */
                _view->RegionViewAdded.connect (mem_fun(*this, &AudioTimeAxisView::region_view_added));
                _view->attach ();
-
-       } else { /* bus */
-
-               controls_ebox.set_name ("AudioBusControlsBaseUnselected");
-               controls_base_selected_name = "AudioBusControlsBaseSelected";
-               controls_base_unselected_name = "AudioBusControlsBaseUnselected";
        }
+
+       post_construct ();
 }
 
 AudioTimeAxisView::~AudioTimeAxisView ()
@@ -260,14 +244,40 @@ AudioTimeAxisView::append_extra_display_menu_items ()
        waveform_item->set_active (editor.show_waveforms());
        ignore_toggle = false;
 
+       waveform_items.push_back (SeparatorElem());
+       
        RadioMenuItem::Group group;
-
+       
        waveform_items.push_back (RadioMenuElem (group, _("Traditional"), bind (mem_fun(*this, &AudioTimeAxisView::set_waveform_shape), Traditional)));
        traditional_item = static_cast<RadioMenuItem *> (&waveform_items.back());
 
        waveform_items.push_back (RadioMenuElem (group, _("Rectified"), bind (mem_fun(*this, &AudioTimeAxisView::set_waveform_shape), Rectified)));
        rectified_item = static_cast<RadioMenuItem *> (&waveform_items.back());
 
+       waveform_items.push_back (SeparatorElem());
+       
+       RadioMenuItem::Group group2;
+
+       waveform_items.push_back (RadioMenuElem (group2, _("Linear"), bind (mem_fun(*this, &AudioTimeAxisView::set_waveform_scale), LinearWaveform)));
+       linearscale_item = static_cast<RadioMenuItem *> (&waveform_items.back());
+
+       waveform_items.push_back (RadioMenuElem (group2, _("Logarithmic"), bind (mem_fun(*this, &AudioTimeAxisView::set_waveform_scale), LogWaveform)));
+       logscale_item = static_cast<RadioMenuItem *> (&waveform_items.back());
+
+       // setting initial item state
+       AudioStreamView* asv = audio_view();
+       if (asv) {
+               ignore_toggle = true;
+               if (asv->get_waveform_shape() == Rectified) 
+                       rectified_item->set_active(true);
+               else traditional_item->set_active(true);
+
+               if (asv->get_waveform_scale() == LogWaveform) 
+                       logscale_item->set_active(true);
+               else linearscale_item->set_active(true);
+               ignore_toggle = false;
+       }
+
        items.push_back (MenuElem (_("Waveform"), *waveform_menu));
 }
 
@@ -310,13 +320,25 @@ AudioTimeAxisView::set_waveform_shape (WaveformShape shape)
 {
        AudioStreamView* asv = audio_view();
 
-       if (asv) {
+       if (asv && !ignore_toggle) {
                asv->set_waveform_shape (shape);
        }
 
        map_frozen ();
 }      
 
+void
+AudioTimeAxisView::set_waveform_scale (WaveformScale scale)
+{
+       AudioStreamView* asv = audio_view();
+
+       if (asv && !ignore_toggle) {
+               asv->set_waveform_scale (scale);
+       }
+
+       map_frozen ();
+}      
+
 void
 AudioTimeAxisView::add_gain_automation_child ()
 {
@@ -337,7 +359,7 @@ AudioTimeAxisView::add_gain_automation_child ()
                                       *gain_track->canvas_display,
                                       _route->gain_automation_curve());
 
-       line->set_line_color (color_map[cAutomationLine]);
+       line->set_line_color (ARDOUR_UI::config()->canvasvar_AutomationLine.get());
        
 
        gain_track->add_line (*line);
@@ -417,11 +439,9 @@ AudioTimeAxisView::update_pans ()
                                              (*p)->automation());
 
                if (p == _route->panner().begin()) {
-                       /* first line is a nice orange */
-                       line->set_line_color (color_map[cLeftPanAutomationLine]);
+                       line->set_line_color (ARDOUR_UI::config()->canvasvar_AutomationLine.get());
                } else {
-                       /* second line is a nice blue */
-                       line->set_line_color (color_map[cRightPanAutomationLine]);
+                       line->set_line_color (ARDOUR_UI::config()->canvasvar_AutomationLine.get());
                }
 
                pan_track->add_line (*line);
@@ -431,7 +451,6 @@ AudioTimeAxisView::update_pans ()
 void
 AudioTimeAxisView::toggle_gain_track ()
 {
-
        bool showit = gain_automation_item->get_active();
 
        if (showit != gain_track->marked_for_display()) {
@@ -591,7 +610,19 @@ void
 AudioTimeAxisView::route_active_changed ()
 {
        RouteTimeAxisView::route_active_changed ();
+       update_control_names ();
+}
 
+
+/**
+ *    Set up the names of the controls so that they are coloured
+ *    correctly depending on whether this route is inactive or
+ *    selected.
+ */
+
+void
+AudioTimeAxisView::update_control_names ()
+{
        if (is_audio_track()) {
                if (_route->active()) {
                        controls_ebox.set_name ("AudioTrackControlsBaseUnselected");