projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
emit an xrun if the process_lock is taken
[ardour.git]
/
gtk2_ardour
/
control_point.h
diff --git
a/gtk2_ardour/control_point.h
b/gtk2_ardour/control_point.h
index 6ef6f8fb3e9bc297b950ea67641e60c89e43e637..045f1241edc2b415b94764f5eb108d925641f0f1 100644
(file)
--- a/
gtk2_ardour/control_point.h
+++ b/
gtk2_ardour/control_point.h
@@
-21,11
+21,11
@@
#define __ardour_control_point_h__
#include <sys/types.h>
#define __ardour_control_point_h__
#include <sys/types.h>
+#include <gdk/gdkevents.h>
#include "ardour/automation_list.h"
#include "ardour/automation_list.h"
-#include "canvas.h"
-#include "simplerect.h"
+#include "selectable.h"
class AutomationLine;
class ControlPoint;
class AutomationLine;
class ControlPoint;
@@
-35,14
+35,13
@@
class AutomationTimeAxisView;
class Selectable;
class Selection;
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:
ControlPoint (AutomationLine& al);
{
public:
ControlPoint (AutomationLine& al);
@@
-62,40
+61,40
@@
class ControlPoint
void hide ();
void show ();
void hide ();
void show ();
- void set_color ();
+ bool visible () const;
+
+ double size () const {
+ return _size;
+ }
void set_size (double);
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; }
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; }
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; }
ARDOUR::AutomationList::iterator model() const { return _model; }
AutomationLine& line() const { return _line; }
+ static PBD::Signal1<void, ControlPoint *> CatchDeletion;
+
private:
private:
- ArdourCanvas::SimpleRect* _item;
-
- AutomationLine& _line;
-
+ ArdourCanvas::Rectangle* _item;
+ AutomationLine& _line;
ARDOUR::AutomationList::iterator _model;
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*);
virtual bool event_handler (GdkEvent*);
- double _x;
- double _y;
- double _size;
- ShapeType _shape;
};
};