From aef6bdba1c9a9d01556bbed7bb21d2c297694ed1 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 26 Oct 2006 01:48:26 +0000 Subject: last minute cleanups before beta6 git-svn-id: svn://localhost/ardour2/trunk@1009 d708f5d6-7413-0410-9779-e7cbd77b26cf --- SConstruct | 2 +- gtk2_ardour/audio_time_axis.cc | 8 -------- gtk2_ardour/route_time_axis.cc | 14 ++------------ gtk2_ardour/route_ui.cc | 13 ++++++++++--- 4 files changed, 13 insertions(+), 24 deletions(-) diff --git a/SConstruct b/SConstruct index 71a533e709..b7031ff80e 100644 --- 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 f8ace8244f..2be25f76aa 100644 --- 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 eb96791d28..f5f0f1dd10 100644 --- 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 bb24dcc426..109926c4c6 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -72,7 +72,17 @@ RouteUI::RouteUI (boost::shared_ptr 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 t = boost::dynamic_pointer_cast(_route); @@ -86,9 +96,6 @@ RouteUI::RouteUI (boost::shared_ptr 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 */ -- cgit v1.2.3