The petty tidying up remnants of a noble, yet utterly failed, tempo lines experiment.

[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 34566d4de285e0623c3b922360b04943be12ca2a..a991bffe54f5742ee608f04dcf047297d6b76c08 100644 (file)
--- a/gtk2_ardour/audio_time_axis.cc
+++ b/gtk2_ardour/audio_time_axis.cc
@@ -73,7 +73,6 @@ using namespace PBD;
 using namespace Gtk;
 using namespace Editing;
 
-
 AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session& sess, boost::shared_ptr<Route> rt, Canvas& canvas)
        : AxisView(sess)
        , RouteTimeAxisView(ed, sess, rt, canvas)
@@ -93,15 +92,11 @@ AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
        mute_button->set_active (false);
        solo_button->set_active (false);
        
-       if (is_audio_track())
-               controls_ebox.set_name ("AudioTimeAxisViewControlsBaseUnselected");
-       else // bus
+       if (is_audio_track()) {
+               controls_ebox.set_name ("AudioTrackControlsBaseUnselected");
+       } else { // bus
                controls_ebox.set_name ("AudioBusControlsBaseUnselected");
-
-       /* map current state of the route */
-
-       processors_changed ();
-       reset_processor_automation_curves ();
+       }
 
        ensure_xml_node ();
 
@@ -109,22 +104,40 @@ AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
        
        _route->panner().Changed.connect (bind (mem_fun(*this, &AudioTimeAxisView::update_pans), false));
 
+       /* map current state of the route */
+
+       processors_changed ();
+       reset_processor_automation_curves ();
+       update_pans (false);
        update_control_names ();
 
        if (is_audio_track()) {
 
                /* ask for notifications of any new RegionViews */
                _view->RegionViewAdded.connect (mem_fun(*this, &AudioTimeAxisView::region_view_added));
-               _view->attach ();
-       }
 
-       post_construct ();
+               if (!editor.have_idled()) {
+                       /* first idle will do what we need */
+               } else {
+                       first_idle ();
+               } 
+
+       } else {
+               post_construct ();
+       }
 }
 
 AudioTimeAxisView::~AudioTimeAxisView ()
 {
 }
 
+void
+AudioTimeAxisView::first_idle ()
+{
+       _view->attach ();
+       post_construct ();
+}
+
 AudioStreamView*
 AudioTimeAxisView::audio_view()
 {
@@ -149,6 +162,7 @@ AudioTimeAxisView::hide ()
        TimeAxisView::hide ();
 }
 
+
 void
 AudioTimeAxisView::append_extra_display_menu_items ()
 {
@@ -305,7 +319,7 @@ AudioTimeAxisView::set_waveform_scale (WaveformScale scale)
 }      
 
 void
-AudioTimeAxisView::create_automation_child (Parameter param, bool show)
+AudioTimeAxisView::create_automation_child (const Parameter& param, bool show)
 {
        if (param.type() == GainAutomation) {
 
@@ -331,7 +345,7 @@ AudioTimeAxisView::create_automation_child (Parameter param, bool show)
                update_pans (show);
 
        } else {
-               error << "AudioTimeAxisView: unknown automation child " << param.to_string() << endmsg;
+               error << "AudioTimeAxisView: unknown automation child " << param.symbol() << endmsg;
        }
 }
 
@@ -350,7 +364,7 @@ AudioTimeAxisView::update_pans (bool show)
                }
 
                boost::shared_ptr<AutomationTimeAxisView> pan_track(new AutomationTimeAxisView (_session,
-                                       _route, _route/*FIXME*/, pan_control, 
+                                       _route, _route, pan_control, 
                                        editor,
                                        *this,
                                        false,
@@ -457,24 +471,26 @@ AudioTimeAxisView::update_control_names ()
 {
        if (is_audio_track()) {
                if (_route->active()) {
-                       controls_ebox.set_name ("AudioTrackControlsBaseUnselected");
                        controls_base_selected_name = "AudioTrackControlsBaseSelected";
                        controls_base_unselected_name = "AudioTrackControlsBaseUnselected";
                } else {
-                       controls_ebox.set_name ("AudioTrackControlsBaseInactiveUnselected");
                        controls_base_selected_name = "AudioTrackControlsBaseInactiveSelected";
                        controls_base_unselected_name = "AudioTrackControlsBaseInactiveUnselected";
                }
        } else {
                if (_route->active()) {
-                       controls_ebox.set_name ("BusControlsBaseUnselected");
                        controls_base_selected_name = "BusControlsBaseSelected";
                        controls_base_unselected_name = "BusControlsBaseUnselected";
                } else {
-                       controls_ebox.set_name ("BusControlsBaseInactiveUnselected");
                        controls_base_selected_name = "BusControlsBaseInactiveSelected";
                        controls_base_unselected_name = "BusControlsBaseInactiveUnselected";
                }
        }
+
+       if (get_selected()) {
+               controls_ebox.set_name (controls_base_selected_name);
+       } else {
+               controls_ebox.set_name (controls_base_unselected_name);
+       }
 }