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 d8c18f10b33d1d1ef1b5bbbe62c21961b8b4f9c0..88b074f6f9d7e76082cf1f4e9b103ecd61404778 100644 (file)
--- a/gtk2_ardour/control_point.h
+++ b/gtk2_ardour/control_point.h
@@ -1,31 +1,33 @@
 /*
-    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__
 
 #include <sys/types.h>
+#include <gdk/gdkevents.h>
 
 #include "ardour/automation_list.h"
 
-#include "canvas.h"
-#include "simplerect.h"
+#include "selectable.h"
 
 class AutomationLine;
 class ControlPoint;
@@ -35,16 +37,15 @@ class AutomationTimeAxisView;
 class Selectable;
 class Selection;
 
-namespace Gnome {
-       namespace Canvas {
-               class SimpleRect;
-               class Diamond;
-       }
+namespace ArdourCanvas {
+       class Rectangle;
+       class Diamond;
+       class Item;
 }
 
-class ControlPoint 
+class ControlPoint : public Selectable
 {
-  public:
+public:
        ControlPoint (AutomationLine& al);
        ControlPoint (const ControlPoint&, bool dummy_arg_to_force_special_copy_constructor);
        virtual ~ControlPoint ();
@@ -54,47 +55,48 @@ class ControlPoint
                Start,
                End
        };
-       
+
        void move_to (double x, double y, ShapeType);
        void reset (double x, double y, ARDOUR::AutomationList::iterator, uint32_t, ShapeType);
        double get_x() const { return _x; }
        double get_y() const { return _y; }
 
-       void hide (); 
+       void hide ();
        void show ();
-       void show_color (bool entered, bool hide_too);
+       bool visible () const;
+
+       double size () const {
+               return _size;
+       }
 
        void set_size (double);
-       void set_visible (bool);
+       void set_color ();
 
        bool     can_slide() const          { return _can_slide; }
        void     set_can_slide(bool yn)     { _can_slide = yn; }
-       bool     selected() const           { return _selected; }
-       void     set_selected(bool yn)      { _selected = yn; }
        uint32_t view_index() const         { return _view_index; }
        void     set_view_index(uint32_t i) { _view_index = i; }
-       
+
+       ArdourCanvas::Item& item() const;
+
        ARDOUR::AutomationList::iterator model() const { return _model; }
        AutomationLine&                  line()  const { return _line; }
-       ArdourCanvas::Item*              item()  const { return _item; }
-
-  protected:
-       ArdourCanvas::SimpleRect* _item;
 
-       AutomationLine& _line;
+       static PBD::Signal1<void, ControlPoint *> CatchDeletion;
 
+private:
+       ArdourCanvas::Rectangle*        _item;
+       AutomationLine&                  _line;
        ARDOUR::AutomationList::iterator _model;
-       uint32_t _view_index;
-       bool     _can_slide;
-       bool     _selected;
+       uint32_t                         _view_index;
+       bool                             _can_slide;
+       double                           _x;
+       double                           _y;
+       double                           _size;
+       ShapeType                        _shape;
 
        virtual bool event_handler (GdkEvent*);
 
-  private:
-       double    _x;
-       double    _y;
-       double    _size;
-       ShapeType _shape;
 };