fix mistaken "do not roll" conclusion in TransportFSM::compute_should_roll()

[ardour.git] / gtk2_ardour / control_point.h

diff --git a/gtk2_ardour/control_point.h b/gtk2_ardour/control_point.h
index 1a7a1f22b8ebe154f9874d4f8e9f54f4315925cf..88b074f6f9d7e76082cf1f4e9b103ecd61404778 100644 (file)
--- a/gtk2_ardour/control_point.h
+++ b/gtk2_ardour/control_point.h
@@ -1,21 +1,23 @@
 /*
-    Copyright (C) 2002-2007 Paul Davis
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
+ * Copyright (C) 2007-2011 David Robillard <d@drobilla.net>
+ * Copyright (C) 2010-2012 Carl Hetherington <carl@carlh.net>
+ * Copyright (C) 2012-2014 Paul Davis <paul@linuxaudiosystems.com>
+ * Copyright (C) 2015-2017 Robin Gareus <robin@gareus.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #ifndef __ardour_control_point_h__
 #define __ardour_control_point_h__
@@ -38,11 +40,12 @@ class Selection;
 namespace ArdourCanvas {
        class Rectangle;
        class Diamond;
+       class Item;
 }
 
 class ControlPoint : public Selectable
 {
-  public:
+public:
        ControlPoint (AutomationLine& al);
        ControlPoint (const ControlPoint&, bool dummy_arg_to_force_special_copy_constructor);
        virtual ~ControlPoint ();
@@ -60,29 +63,28 @@ class ControlPoint : public Selectable
 
        void hide ();
        void show ();
-       void set_color ();
+       bool visible () const;
 
        double size () const {
                return _size;
        }
 
        void set_size (double);
-       void set_visible (bool);
-       bool visible () const;
+       void set_color ();
 
        bool     can_slide() const          { return _can_slide; }
        void     set_can_slide(bool yn)     { _can_slide = yn; }
        uint32_t view_index() const         { return _view_index; }
        void     set_view_index(uint32_t i) { _view_index = i; }
 
-       void i2w (double &, double &) const;
+       ArdourCanvas::Item& item() const;
 
        ARDOUR::AutomationList::iterator model() const { return _model; }
        AutomationLine&                  line()  const { return _line; }
 
        static PBD::Signal1<void, ControlPoint *> CatchDeletion;
-       
-  private:
+
+private:
        ArdourCanvas::Rectangle*        _item;
        AutomationLine&                  _line;
        ARDOUR::AutomationList::iterator _model;