Remove redundant call (there's no session, nothing to save)

[ardour.git] / gtk2_ardour / panner_ui.cc

diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc
index e8f3a8f4359094887cd253c37875ba5815d73387..d41a6a9719ac6f9f0006579b31338795e98bd5b1 100644 (file)
--- a/gtk2_ardour/panner_ui.cc
+++ b/gtk2_ardour/panner_ui.cc
@@ -27,12 +27,13 @@
 #include "ardour/panner_shell.h"
 #include "ardour/session.h"
 
+#include "widgets/tooltips.h"
+
 #include "panner_ui.h"
 #include "panner2d.h"
 #include "gui_thread.h"
 #include "stereo_panner.h"
 #include "timers.h"
-#include "tooltips.h"
 #include "mono_panner.h"
 #include "ui_config.h"
 
@@ -43,7 +44,6 @@ using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtkmm2ext;
 using namespace Gtk;
-using namespace ARDOUR_UI_UTILS;
 
 PannerUI::PannerUI (Session* s)
        : _current_nouts (-1)
@@ -67,7 +67,7 @@ PannerUI::PannerUI (Session* s)
 
        pan_automation_state_button.set_name ("MixerAutomationPlaybackButton");
 
-       set_tooltip (pan_automation_state_button, _("Pan automation mode"));
+       ArdourWidgets::set_tooltip (pan_automation_state_button, _("Pan automation mode"));
 
        //set_size_request_to_display_given_text (pan_automation_state_button, X_("O"), 2, 2);
 
@@ -154,6 +154,9 @@ PannerUI::build_astate_menu ()
        pan_astate_menu->items().push_back (MenuElem (_("Touch"), sigc::bind (
                        sigc::mem_fun (_panner.get(), &Panner::set_automation_state),
                        (AutoState) Touch)));
+       pan_astate_menu->items().push_back (MenuElem (_("Latch"), sigc::bind (
+                       sigc::mem_fun (_panner.get(), &Panner::set_automation_state),
+                       (AutoState) Latch)));
 
 }
 
@@ -305,7 +308,7 @@ PannerUI::setup_pan ()
                twod_panner->set_size_request (-1, rintf(61.f * scale));
                twod_panner->set_send_drawing_mode (_send_mode);
 
-               /* and finally, add it to the panner frame */
+               /* and finally, add it to the panner sample */
 
                pan_vbox.pack_start (*twod_panner, false, false);
        }
@@ -342,7 +345,7 @@ PannerUI::start_touch (boost::weak_ptr<AutomationControl> wac)
        if (!ac) {
                return;
        }
-       ac->start_touch (ac->session().transport_frame());
+       ac->start_touch (ac->session().transport_sample());
 }
 
 void
@@ -352,7 +355,7 @@ PannerUI::stop_touch (boost::weak_ptr<AutomationControl> wac)
        if (!ac) {
                return;
        }
-       ac->stop_touch (false, ac->session().transport_frame());
+       ac->stop_touch (ac->session().transport_sample());
 }
 
 bool
@@ -532,14 +535,6 @@ PannerUI::pan_automation_state_changed ()
        }
 
        update_pan_sensitive ();
-
-       /* start watching automation so that things move */
-
-       pan_watching.disconnect();
-
-       if (x) {
-               pan_watching = Timers::rapid_connect (sigc::mem_fun (*this, &PannerUI::effective_pan_display));
-       }
 }
 
 string
@@ -569,6 +564,9 @@ PannerUI::_astate_string (AutoState state, bool shrt)
        case Touch:
                sstr = (shrt ? "T" : S_("Touch|T"));
                break;
+       case Latch:
+               sstr = (shrt ? "L" : S_("Latch|L"));
+               break;
        case Write:
                sstr = (shrt ? "W" : S_("Write|W"));
                break;