mp4chaps Lua script: don't clutter global environment

[ardour.git] / gtk2_ardour / port_matrix_column_labels.h

diff --git a/gtk2_ardour/port_matrix_column_labels.h b/gtk2_ardour/port_matrix_column_labels.h
index e3c360cef01139181d2540089d17a59c960bd595..b3f2ed8c807f0feb294d993ca6674ae419468458 100644 (file)
--- a/gtk2_ardour/port_matrix_column_labels.h
+++ b/gtk2_ardour/port_matrix_column_labels.h
@@ -36,14 +36,13 @@ class PortMatrixColumnLabels : public PortMatrixLabels
 public:
        PortMatrixColumnLabels (PortMatrix *, PortMatrixBody *);
 
-       void button_press (double, double, int, uint32_t);
+       void button_press (double, double, GdkEventButton *);
 
        double component_to_parent_x (double x) const;
        double parent_to_component_x (double x) const;
        double component_to_parent_y (double y) const;
        double parent_to_component_y (double y) const;
        void mouseover_changed (std::list<PortMatrixNode> const &);
-       void draw_extra (cairo_t *);
        void motion (double, double);
 
        uint32_t overhang () const {
@@ -56,21 +55,17 @@ private:
        double channel_x (ARDOUR::BundleChannel const &) const;
        double channel_y (ARDOUR::BundleChannel const &) const;
        void queue_draw_for (ARDOUR::BundleChannel const &);
-       std::pair<boost::shared_ptr<PortGroup>, ARDOUR::BundleChannel> position_to_group_and_channel (double, double, PortGroupList const *) const;
+       ARDOUR::BundleChannel position_to_channel (double, double, boost::shared_ptr<const PortGroup>) const;
 
        void render (cairo_t *);
        void compute_dimensions ();
        double basic_text_x_pos (int) const;
        std::vector<std::pair<double, double> > port_name_shape (double, double) const;
 
-       double slanted_height () const {
-               return _height - _highest_group_name - 2 * name_pad();
-       }
-
        double _longest_bundle_name;
        double _longest_channel_name;
-       double _highest_text;
-       double _highest_group_name;
+       double _text_height;
+       double _descender_height;
        uint32_t _overhang;
 };