diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-11 21:30:36 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-11 21:30:36 +0000 |
| commit | a98fa4bc61e26cd94aeb6720325633c4e6618155 (patch) | |
| tree | 21e55518ce42e5ffe3e974b32e10192525627b82 /gtk2_ardour/editor.h | |
| parent | 4d780bdcd0009943ec292dfd2177e60804d91245 (diff) | |
switch to 5 new fade curves, taken from mixbus2 branch. make xfade context menus functional even though the images are not accurate
git-svn-id: svn://localhost/ardour2/branches/3.0@12253 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor.h')
| -rw-r--r-- | gtk2_ardour/editor.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 3c1ebdbd49..2e203e9c75 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -1337,8 +1337,11 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD Gtk::Menu fade_context_menu; void popup_fade_context_menu (int, int, ArdourCanvas::Item*, ItemType); - Gtk::Menu xfade_context_menu; - void popup_xfade_context_menu (int, int, ArdourCanvas::Item*, ItemType); + Gtk::Menu xfade_in_context_menu; + Gtk::Menu xfade_out_context_menu; + void popup_xfade_in_context_menu (int, int, ArdourCanvas::Item*, ItemType); + void popup_xfade_out_context_menu (int, int, ArdourCanvas::Item*, ItemType); + void fill_xfade_menu (Gtk::Menu_Helpers::MenuList& items, bool start); void set_fade_in_shape (ARDOUR::FadeShape); void set_fade_out_shape (ARDOUR::FadeShape); @@ -2062,7 +2065,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void setup_fade_images (); std::map<ARDOUR::FadeShape, Gtk::Image*> _fade_in_images; std::map<ARDOUR::FadeShape, Gtk::Image*> _fade_out_images; - std::map<ARDOUR::FadeShape, Gtk::Image*> _xfade_images; + std::map<ARDOUR::FadeShape, Gtk::Image*> _xfade_in_images; + std::map<ARDOUR::FadeShape, Gtk::Image*> _xfade_out_images; Gtk::MenuItem& action_menu_item (std::string const &); void action_pre_activated (Glib::RefPtr<Gtk::Action> const &); |