smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 15:54:57 +01:00
Code Issues Projects Releases Wiki Activity

last minute cleanups before beta6

Browse source 
git-svn-id: svn://localhost/ardour2/trunk@1009 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2006-10-26 01:48:26 +00:00
parent 5695b1790e
commit aef6bdba1c
4 changed files with 13 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
SConstruct
View file

@ -15,7 +15,7 @@ import SCons.Node.FS
SConsignFile() SConsignFile()
EnsureSConsVersion(0, 96) EnsureSConsVersion(0, 96)
version = '2.0beta5.1' version = '2.0beta6'
subst_dict = { } subst_dict = { }

8
gtk2_ardour/audio_time_axis.cc
View file

@ -98,19 +98,11 @@ AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
ignore_toggle = false; ignore_toggle = false;
mute_button->set_active (false);
solo_button->set_active (false);
if (is_audio_track()) if (is_audio_track())
controls_ebox.set_name ("AudioTimeAxisViewControlsBaseUnselected"); controls_ebox.set_name ("AudioTimeAxisViewControlsBaseUnselected");
else // bus else // bus
controls_ebox.set_name ("AudioBusControlsBaseUnselected"); controls_ebox.set_name ("AudioBusControlsBaseUnselected");
/* map current state of the route */
redirects_changed (0);
reset_redirect_automation_curves ();
ensure_xml_node (); ensure_xml_node ();
set_state (*xml_node); set_state (*xml_node);

14
gtk2_ardour/route_time_axis.cc
View file

@ -104,9 +104,6 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
ignore_toggle = false; ignore_toggle = false;
mute_button->set_active (false);
solo_button->set_active (false);
mute_button->set_name ("TrackMuteButton"); mute_button->set_name ("TrackMuteButton");
solo_button->set_name ("SoloButton"); solo_button->set_name ("SoloButton");
edit_group_button.set_name ("TrackGroupButton"); 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); mute_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::mute_release), false);
if (is_track()) { if (is_track()) {
rec_enable_button->set_active (false);
rec_enable_button->set_name ("TrackRecordEnableButton"); rec_enable_button->set_name ("TrackRecordEnableButton");
rec_enable_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::rec_enable_press)); 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); 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 */ /* map current state of the route */
update_diskstream_display (); update_diskstream_display ();
solo_changed(0); redirects_changed (0);
mute_changed(0); reset_redirect_automation_curves ();
//redirects_changed (0);
//reset_redirect_automation_curves ();
y_position = -1; 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->redirects_changed.connect (mem_fun(*this, &RouteTimeAxisView::redirects_changed));
_route->name_changed.connect (mem_fun(*this, &RouteTimeAxisView::route_name_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()) { if (is_track()) {

13
gtk2_ardour/route_ui.cc
View file

@ -73,6 +73,16 @@ RouteUI::RouteUI (boost::shared_ptr<ARDOUR::Route> rt, ARDOUR::Session& sess, co
mute_button = manage (new BindableToggleButton (_route->mute_control(), m_name )); mute_button = manage (new BindableToggleButton (_route->mute_control(), m_name ));
solo_button = manage (new BindableToggleButton (_route->solo_control(), s_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()) { if (is_track()) {
boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track>(_route); boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track>(_route);
@ -87,9 +97,6 @@ RouteUI::RouteUI (boost::shared_ptr<ARDOUR::Route> rt, ARDOUR::Session& sess, co
update_rec_display (); update_rec_display ();
} }
mute_button->unset_flags (Gtk::CAN_FOCUS);
solo_button->unset_flags (Gtk::CAN_FOCUS);
/* map the current state */ /* map the current state */
map_frozen (); map_frozen ();