projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove extraneous 'r' from rec-enable buttons
[ardour.git]
/
gtk2_ardour
/
port_matrix_component.h
diff --git
a/gtk2_ardour/port_matrix_component.h
b/gtk2_ardour/port_matrix_component.h
index 6a867f16e95efefb832185c87767be1a4b2df57b..a574d20341a2456c045a32e920a4232041b7cb02 100644
(file)
--- a/
gtk2_ardour/port_matrix_component.h
+++ b/
gtk2_ardour/port_matrix_component.h
@@
-31,6
+31,7
@@
class PortGroup;
class PortGroupList;
namespace ARDOUR {
class PortGroupList;
namespace ARDOUR {
+ class Bundle;
class BundleChannel;
}
class BundleChannel;
}
@@
-49,7
+50,8
@@
public:
virtual double parent_to_component_y (double y) const = 0;
virtual void mouseover_changed (std::list<PortMatrixNode> const &) = 0;
virtual void draw_extra (cairo_t *) = 0;
virtual double parent_to_component_y (double y) const = 0;
virtual void mouseover_changed (std::list<PortMatrixNode> const &) = 0;
virtual void draw_extra (cairo_t *) = 0;
- virtual void button_press (double, double, int, uint32_t) {}
+ virtual void button_press (double, double, int, uint32_t, guint) {}
+ virtual void button_release (double, double, int, uint32_t, guint) {}
virtual void motion (double, double) {}
void set_show_ports (bool);
virtual void motion (double, double) {}
void set_show_ports (bool);
@@
-136,7
+138,7
@@
protected:
}
/** @return colour to paint grid squares when they can't be associated */
}
/** @return colour to paint grid squares when they can't be associated */
- static Gdk::Color
unknown
_colour () {
+ static Gdk::Color
non_connectable
_colour () {
return Gdk::Color ("#cccccc");
}
return Gdk::Color ("#cccccc");
}
@@
-171,8
+173,8
@@
protected:
void set_source_rgb (cairo_t *, Gdk::Color const &);
void set_source_rgba (cairo_t *, Gdk::Color const &, double);
uint32_t group_size (boost::shared_ptr<const PortGroup>) const;
void set_source_rgb (cairo_t *, Gdk::Color const &);
void set_source_rgba (cairo_t *, Gdk::Color const &, double);
uint32_t group_size (boost::shared_ptr<const PortGroup>) const;
- uint32_t channel_to_position (ARDOUR::BundleChannel,
PortGroupList const *
) const;
- virtual
std::pair<boost::shared_ptr<PortGroup>, ARDOUR::BundleChannel> position_to_group_and_channel (double, double, PortGroupList const *
) const;
+ uint32_t channel_to_position (ARDOUR::BundleChannel,
boost::shared_ptr<const PortGroup>
) const;
+ virtual
ARDOUR::BundleChannel position_to_channel (double, double, boost::shared_ptr<const PortGroup>
) const;
/** Render the complete component to a cairo context. */
virtual void render (cairo_t *) = 0;
/** Render the complete component to a cairo context. */
virtual void render (cairo_t *) = 0;