restore the functionality of the join-play-range button, and remove a couple of unuse...

git-svn-id: svn://localhost/ardour2/branches/3.0@10853 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index e7e0a6da0b4b344c28fbffebc933d7db6ff93960..8262d76c0a0297aa74b1bbddff65902bba5b51e3 100644 (file)
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -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 ();

diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index f940890244da0576b50e7ee11f23151db4b209e6..6b637e214ec9ce13f72c79dcd49240a7086e1b96 100644 (file)
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -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());
+}