diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-12-08 16:07:28 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-12-08 16:07:28 +0000 |
| commit | 3be16e8afbd891c0bfe7227158384ed0d127597f (patch) | |
| tree | 73a8f761fc13cbd0613d3923a34748bb9aa761d2 /gtk2_ardour/panner_ui.h | |
| parent | a9bb336fc44ab4937978f5a0308e440ed632ea50 (diff) | |
partial patch/partial by-hand merge of 2.X commits 3169&3170 to 3.X codebase
git-svn-id: svn://localhost/ardour2/branches/3.0@4300 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/panner_ui.h')
| -rw-r--r-- | gtk2_ardour/panner_ui.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/gtk2_ardour/panner_ui.h b/gtk2_ardour/panner_ui.h index e10080a317..4501659750 100644 --- a/gtk2_ardour/panner_ui.h +++ b/gtk2_ardour/panner_ui.h @@ -54,9 +54,11 @@ namespace Gtk { class PannerUI : public Gtk::HBox { public: - PannerUI (boost::shared_ptr<ARDOUR::IO>, ARDOUR::Session&); + PannerUI (ARDOUR::Session&); ~PannerUI (); + virtual void set_io (boost::shared_ptr<ARDOUR::IO>); + void pan_changed (void *); void update_pan_sensitive (); @@ -75,6 +77,7 @@ class PannerUI : public Gtk::HBox boost::shared_ptr<ARDOUR::IO> _io; ARDOUR::Session& _session; + std::vector<sigc::connection> connections; bool ignore_toggle; bool in_pan_update; @@ -101,8 +104,8 @@ class PannerUI : public Gtk::HBox bool panning_link_button_press (GdkEventButton*); bool panning_link_button_release (GdkEventButton*); - Gtk::Menu pan_astate_menu; - Gtk::Menu pan_astyle_menu; + Gtk::Menu* pan_astate_menu; + Gtk::Menu* pan_astyle_menu; Gtk::Button pan_automation_style_button; Gtk::ToggleButton pan_automation_state_button; @@ -118,6 +121,8 @@ class PannerUI : public Gtk::HBox void update_pan_bars (bool only_if_aplay); void update_pan_linkage (); void update_pan_state (); + void build_astate_menu (); + void build_astyle_menu (); void panner_changed (); |