restore the functionality of the join-play-range button, and remove a couple of unused controllables

git-svn-id: svn://localhost/ardour2/branches/3.0@10853 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-12-01 23:22:05 +00:00
parent 93d8451d9e
commit 8e046a1127
2 changed files with 10 additions and 2 deletions

View File

@ -417,8 +417,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
boost::shared_ptr<TransportControllable> auto_loop_controllable;
boost::shared_ptr<TransportControllable> play_selection_controllable;
boost::shared_ptr<TransportControllable> rec_controllable;
boost::shared_ptr<TransportControllable> shuttle_controllable;
boost::shared_ptr<TransportControllable> join_play_range_controllable;
void join_play_range_clicked ();
void set_transport_controllable_state (const XMLNode&);
XMLNode& get_transport_controllable_state ();

View File

@ -295,6 +295,8 @@ ARDOUR_UI::setup_transport ()
act = ActionManager::get_action (X_("Transport"), X_("ToggleExternalSync"));
sync_button.set_related_action (act);
join_play_range_button.signal_clicked.connect (sigc::mem_fun (*this, &ARDOUR_UI::join_play_range_clicked));
/* clocks, etc. */
ARDOUR_UI::Clock.connect (sigc::mem_fun (primary_clock, &AudioClock::set));
@ -631,3 +633,9 @@ ARDOUR_UI::click_button_clicked (GdkEventButton* ev)
rc_option_editor->set_current_page (_("Misc"));
return true;
}
void
ARDOUR_UI::join_play_range_clicked ()
{
join_play_range_button.set_active (!join_play_range_button.get_active());
}