diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-03-01 21:52:59 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-03-01 21:52:59 +0000 |
| commit | 2075ffc474eac38d45f14dee33272919f47b14bc (patch) | |
| tree | 965cf73f2a0e24ef1bdfa159a3c99f44d35b52de /gtk2_ardour/panner2d.h | |
| parent | 252be42c04292cce29bc5023d921ec14e8742341 (diff) | |
rationalizations and so forth for panner2d drawing (math is hard)
git-svn-id: svn://localhost/ardour2/branches/3.0@9011 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/panner2d.h')
| -rw-r--r-- | gtk2_ardour/panner2d.h | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/gtk2_ardour/panner2d.h b/gtk2_ardour/panner2d.h index 609840bbfe..718677557f 100644 --- a/gtk2_ardour/panner2d.h +++ b/gtk2_ardour/panner2d.h @@ -59,9 +59,9 @@ class Panner2d : public Gtk::DrawingArea void allow_target_motion (bool); - int add_target (const PBD::AngularVector&); - int add_puck (const char* text, const PBD::AngularVector&); - void move_puck (int which, const PBD::AngularVector&); + int add_speaker (const PBD::AngularVector&); + int add_signal (const char* text, const PBD::AngularVector&); + void move_signal (int which, const PBD::AngularVector&); void reset (uint32_t n_inputs); boost::shared_ptr<ARDOUR::Panner> get_panner() const { return panner; } @@ -106,32 +106,34 @@ class Panner2d : public Gtk::DrawingArea Glib::RefPtr<Pango::Layout> layout; typedef std::vector<Target*> Targets; - Targets targets; - Targets pucks; + Targets speakers; + Targets signals; Target position; Target *drag_target; int drag_x; int drag_y; - bool allow_target; + bool allow_speaker_motion; int width; int height; - int dimen; + double radius; + double border; + double hoffset; + double voffset; double last_width; - - bool bypassflag; + bool did_move; gint compute_x (float); gint compute_y (float); - Target *find_closest_object (gdouble x, gdouble y); + Target *find_closest_object (gdouble x, gdouble y, bool& is_signal); gint handle_motion (gint, gint, GdkModifierType); void toggle_bypass (); void handle_state_change (); void handle_position_change (); - void label_pucks (); + void label_signals (); PBD::ScopedConnectionList connections; |