diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-04-17 22:51:22 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-04-17 22:51:22 +0000 |
| commit | aed349f45b98158e2fca25051c56252afbf1b407 (patch) | |
| tree | 8f769faea7fd625d32e98ed68e524536fa2184a7 /gtk2_ardour/panner_ui.h | |
| parent | 0ec83834288ed4a8b6568a2cf566e335c8890ba2 (diff) | |
Rename panner member to twod_panner to avoid having _panner and panner member variables in the same class. Be sure to reconnect everything dropped at the top of set_panner() (fixes #3066)
git-svn-id: svn://localhost/ardour2/branches/3.0@6925 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/panner_ui.h')
| -rw-r--r-- | gtk2_ardour/panner_ui.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gtk2_ardour/panner_ui.h b/gtk2_ardour/panner_ui.h index a24b8f02c3..1c4b0cd192 100644 --- a/gtk2_ardour/panner_ui.h +++ b/gtk2_ardour/panner_ui.h @@ -91,7 +91,7 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr static const int pan_bar_height; - Panner2d* panner; ///< 2D panner, or 0 + Panner2d* twod_panner; ///< 2D panner, or 0 Panner2dWindow* big_window; Gtk::VBox pan_bar_packer; @@ -143,6 +143,8 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr bool pan_button_event (GdkEventButton*, uint32_t which); + void connect_to_pan_control (uint32_t); + Gtk::Menu* pan_menu; Gtk::CheckMenuItem* bypass_menu_item; void build_pan_menu (uint32_t which); |