last minute cleanups before beta6

git-svn-id: svn://localhost/ardour2/trunk@1009 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/SConstruct b/SConstruct
index 71a533e7092864b88ff85e0364dfc9e161792fe7..b7031ff80ecb887821b80d2263a8d7f17c28cc69 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -15,7 +15,7 @@ import SCons.Node.FS
 SConsignFile()
 EnsureSConsVersion(0, 96)
 
-version = '2.0beta5.1'
+version = '2.0beta6'
 
 subst_dict = { }
 

diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc
index f8ace8244f9f04fbc3cf480b54ae26ee97f7886e..2be25f76aabed687c8f5ce1e83dce3a89ce6f956 100644 (file)
--- a/gtk2_ardour/audio_time_axis.cc
+++ b/gtk2_ardour/audio_time_axis.cc
@@ -98,19 +98,11 @@ 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);

diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index eb96791d2846595dd5c32b4ea82372ba4ac88ac0..f5f0f1dd103f1031c38e765b87601ead9f16ff51 100644 (file)
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -104,9 +104,6 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
 
        ignore_toggle = false;
 
-       mute_button->set_active (false);
-       solo_button->set_active (false);
-       
        mute_button->set_name ("TrackMuteButton");
        solo_button->set_name ("SoloButton");
        edit_group_button.set_name ("TrackGroupButton");
@@ -131,7 +128,6 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
        mute_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::mute_release), false);
 
        if (is_track()) {
-               rec_enable_button->set_active (false);
                rec_enable_button->set_name ("TrackRecordEnableButton");
                rec_enable_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::rec_enable_press));
                controls_table.attach (*rec_enable_button, 5, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
@@ -177,18 +173,12 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
        /* map current state of the route */
 
        update_diskstream_display ();
-       solo_changed(0);
-       mute_changed(0);
-       //redirects_changed (0);
-       //reset_redirect_automation_curves ();
+       redirects_changed (0);
+       reset_redirect_automation_curves ();
        y_position = -1;
 
-       _route->mute_changed.connect (mem_fun(*this, &RouteUI::mute_changed));
-       _route->solo_changed.connect (mem_fun(*this, &RouteUI::solo_changed));
        _route->redirects_changed.connect (mem_fun(*this, &RouteTimeAxisView::redirects_changed));
        _route->name_changed.connect (mem_fun(*this, &RouteTimeAxisView::route_name_changed));
-       _route->solo_safe_changed.connect (mem_fun(*this, &RouteUI::solo_changed));
-
 
        if (is_track()) {
 

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index bb24dcc426943b886b38f88e66ec93e33da8591e..109926c4c67a44c67b75a544b6afc8ac4c2634c5 100644 (file)
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -72,7 +72,17 @@ RouteUI::RouteUI (boost::shared_ptr<ARDOUR::Route> rt, ARDOUR::Session& sess, co
 
         mute_button = manage (new BindableToggleButton (_route->mute_control(), m_name ));
         solo_button = manage (new BindableToggleButton (_route->solo_control(), s_name ));
+
+       mute_button->unset_flags (Gtk::CAN_FOCUS);
+       solo_button->unset_flags (Gtk::CAN_FOCUS);
+
+       _route->mute_changed.connect (mem_fun(*this, &RouteUI::mute_changed));
+       _route->solo_changed.connect (mem_fun(*this, &RouteUI::solo_changed));
+       _route->solo_safe_changed.connect (mem_fun(*this, &RouteUI::solo_changed));
        
+       update_solo_display ();
+       update_mute_display ();
+
        if (is_track()) {
                boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track>(_route);
 
@@ -86,9 +96,6 @@ RouteUI::RouteUI (boost::shared_ptr<ARDOUR::Route> rt, ARDOUR::Session& sess, co
                
                update_rec_display ();
        } 
-
-       mute_button->unset_flags (Gtk::CAN_FOCUS);
-       solo_button->unset_flags (Gtk::CAN_FOCUS);
        
        /* map the current state */