X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fprocessor_box.h;h=410e5b91d7440e813d1470cb39b41bae3fac506e;hb=34f9bd502b1342ce48dc2fbfd4844b5cb902c66e;hp=d7517d9e83da924eaa07e05bc2e961ca4bc95c45;hpb=a4ad0a90d124f1e1b6d84fdf221d948ea3733f79;p=ardour.git diff --git a/gtk2_ardour/processor_box.h b/gtk2_ardour/processor_box.h index d7517d9e83..410e5b91d7 100644 --- a/gtk2_ardour/processor_box.h +++ b/gtk2_ardour/processor_box.h @@ -30,12 +30,9 @@ #include #include -#include "gtkmm2ext/auto_spin.h" #include "gtkmm2ext/bindings.h" -#include "gtkmm2ext/click_box.h" #include "gtkmm2ext/dndtreeview.h" #include "gtkmm2ext/dndvbox.h" -#include "gtkmm2ext/pixfader.h" #include "gtkmm2ext/persistent_tooltip.h" #include "pbd/stateful.h" @@ -52,17 +49,21 @@ #include "pbd/fastlog.h" +#include "widgets/ardour_button.h" +#include "widgets/ardour_fader.h" +#include "widgets/slider_controller.h" + #include "plugin_interest.h" +#include "plugin_display.h" #include "io_selector.h" #include "send_ui.h" #include "enums.h" -#include "ardour_button.h" #include "window_manager.h" class MotionController; class PluginSelector; class PluginUIWindow; -class RouteProcessorSelection; +class ProcessorSelection; class MixerStrip; namespace ARDOUR { @@ -80,7 +81,7 @@ class ProcessorBox; class ProcessorWindowProxy : public WM::ProxyBase { - public: +public: ProcessorWindowProxy (std::string const &, ProcessorBox *, boost::weak_ptr); ~ProcessorWindowProxy(); @@ -91,13 +92,13 @@ class ProcessorWindowProxy : public WM::ProxyBase } ARDOUR::SessionHandlePtr* session_handle(); - void show_the_right_window (); + void show_the_right_window (bool show_not_toggle = false); void set_custom_ui_mode(bool use_custom) { want_custom = use_custom; } int set_state (const XMLNode&, int); XMLNode& get_state (); - private: +private: ProcessorBox* _processor_box; boost::weak_ptr _processor; bool is_custom; @@ -105,6 +106,7 @@ class ProcessorWindowProxy : public WM::ProxyBase void processor_going_away (); PBD::ScopedConnection going_away_connection; + PBD::ScopedConnectionList gui_connections; }; @@ -158,6 +160,7 @@ public: /** Hide any widgets that should be hidden */ virtual void hide_things (); + void toggle_inline_display_visibility (); void show_all_controls (); void hide_all_controls (); void add_control_state (XMLNode *) const; @@ -167,7 +170,7 @@ public: Gtk::Menu* build_send_options_menu (); protected: - ArdourButton _button; + ArdourWidgets::ArdourButton _button; Gtk::VBox _vbox; Position _position; uint32_t _position_num; @@ -217,58 +220,48 @@ private: void button_clicked (); void button_clicked_event (GdkEventButton *); void control_changed (); + void control_automation_state_changed (); std::string state_id () const; void set_tooltip (); + void start_touch (); + void end_touch (); + boost::weak_ptr _control; /* things for a slider */ Gtk::Adjustment _adjustment; - Gtkmm2ext::HSliderController _slider; + ArdourWidgets::HSliderController _slider; Gtkmm2ext::PersistentTooltip _slider_persistant_tooltip; /* things for a button */ - ArdourButton _button; + ArdourWidgets::ArdourButton _button; bool _ignore_ui_adjustment; - PBD::ScopedConnection _connection; + PBD::ScopedConnectionList _connections; bool _visible; std::string _name; - sigc::connection timer_connection; }; std::list _controls; - void toggle_inline_display_visibility (); void toggle_control_visibility (Control *); void toggle_panner_link (); void toggle_allow_feedback (); - class PluginDisplay : public Gtk::DrawingArea { + class PluginInlineDisplay : public PluginDisplay { public: - PluginDisplay(ProcessorEntry&, boost::shared_ptr, uint32_t max_height = 80); - virtual ~PluginDisplay(); + PluginInlineDisplay(ProcessorEntry&, boost::shared_ptr, uint32_t max_height = 80); + ~PluginInlineDisplay() {} protected: - bool on_expose_event (GdkEventExpose *); void on_size_request (Gtk::Requisition* req); bool on_button_press_event (GdkEventButton *ev); - bool on_button_release_event (GdkEventButton *ev); - - void plugin_going_away () { - _qdraw_connection.disconnect (); - } - void update_height_alloc (uint32_t inline_height); - virtual uint32_t render_inline (cairo_t *, uint32_t width); + + void display_sample (cairo_t* cr, double w, double h); ProcessorEntry& _entry; - boost::shared_ptr _plug; - PBD::ScopedConnection _qdraw_connection; - PBD::ScopedConnection _death_connection; - cairo_surface_t* _surf; - uint32_t _max_height; - uint32_t _cur_height; bool _scroll; }; - class LuaPluginDisplay : public PluginDisplay { + class LuaPluginDisplay : public PluginInlineDisplay { public: LuaPluginDisplay(ProcessorEntry&, boost::shared_ptr, uint32_t max_height = 80); ~LuaPluginDisplay(); @@ -401,7 +394,7 @@ private: class ProcessorBox : public Gtk::HBox, public PluginInterestedObject, public ARDOUR::SessionHandlePtr { - public: +public: enum ProcessorOperation { ProcessorsCut, ProcessorsCopy, @@ -414,7 +407,7 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject, public ARD }; ProcessorBox (ARDOUR::Session*, boost::function get_plugin_selector, - RouteProcessorSelection&, MixerStrip* parent, bool owner_is_mixer = false); + ProcessorSelection&, MixerStrip* parent, bool owner_is_mixer = false); ~ProcessorBox (); void set_route (boost::shared_ptr); @@ -435,16 +428,16 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject, public ARD bool edit_aux_send(boost::shared_ptr); - /* Everything except a WindowProxy object should use this to get the window */ + /* Everything except a WindowProxy object should use this to get the window */ Gtk::Window* get_processor_ui (boost::shared_ptr) const; - /* a WindowProxy object can use this */ - Gtk::Window* get_editor_window (boost::shared_ptr, bool); - Gtk::Window* get_generic_editor_window (boost::shared_ptr); + /* a WindowProxy object can use this */ + Gtk::Window* get_editor_window (boost::shared_ptr, bool); + Gtk::Window* get_generic_editor_window (boost::shared_ptr); - void manage_pins (boost::shared_ptr); - void edit_processor (boost::shared_ptr); - void generic_edit_processor (boost::shared_ptr); + void manage_pins (boost::shared_ptr); + void edit_processor (boost::shared_ptr); + void generic_edit_processor (boost::shared_ptr); void update_gui_object_state (ProcessorEntry *); @@ -457,7 +450,8 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject, public ARD typedef std::vector > ProcSelection; - static ProcSelection current_processor_selection () { + static ProcSelection current_processor_selection () + { ProcSelection ps; if (_current_processor_box) { _current_processor_box->get_selected_processors (ps); @@ -469,7 +463,7 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject, public ARD static bool show_all_processors; #endif - private: +private: /* prevent copy construction */ ProcessorBox (ProcessorBox const &); @@ -488,16 +482,15 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject, public ARD * put at the end of the plugin list. */ int _placement; - uint32_t _visible_prefader_processors; - RouteProcessorSelection& _rr_selection; + ProcessorSelection& _p_selection; static Gtkmm2ext::ActionMap myactions; static void load_bindings (); void route_going_away (); - bool is_editor_mixer_strip() const; + bool is_editor_mixer_strip() const; Gtkmm2ext::DnDVBox processor_display; Gtk::ScrolledWindow processor_scroller; @@ -511,7 +504,7 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject, public ARD void object_drop (Gtkmm2ext::DnDVBox *, ProcessorEntry *, Glib::RefPtr const &); Width _width; - bool _redisplay_pending; + bool _redisplay_pending; Gtk::Menu *processor_menu; gint processor_menu_map_handler (GdkEventAny *ev); @@ -535,7 +528,6 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject, public ARD bool processor_button_release_event (GdkEventButton *, ProcessorEntry *); void redisplay_processors (); void add_processor_to_display (boost::weak_ptr); - void help_count_visible_prefader_processors (boost::weak_ptr, uint32_t*, bool*); void reordered (); void report_failed_reorder (); void route_processors_changed (ARDOUR::RouteProcessorChange); @@ -560,6 +552,8 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject, public ARD void for_selected_processors (void (ProcessorBox::*pmf)(boost::shared_ptr)); void get_selected_processors (ProcSelection&) const; + void set_disk_io_position (ARDOUR::DiskIOPoint); + bool can_cut() const; bool stub_processor_selected() const; @@ -570,6 +564,7 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject, public ARD static Glib::RefPtr delete_action; static Glib::RefPtr backspace_action; static Glib::RefPtr manage_pins_action; + static Glib::RefPtr disk_io_action; static Glib::RefPtr edit_action; static Glib::RefPtr edit_generic_action; void paste_processor_state (const XMLNodeList&, boost::shared_ptr); @@ -603,16 +598,17 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject, public ARD static void rb_deactivate_all (); static void rb_ab_plugins (); static void rb_manage_pins (); + static void rb_set_disk_io_position (ARDOUR::DiskIOPoint); static void rb_edit (); static void rb_edit_generic (); void route_property_changed (const PBD::PropertyChange&); std::string generate_processor_title (boost::shared_ptr pi); - //typedef std::list ProcessorWindowProxies; - //ProcessorWindowProxies _processor_window_info; + //typedef std::list ProcessorWindowProxies; + //ProcessorWindowProxies _processor_window_info; - ProcessorWindowProxy* find_window_proxy (boost::shared_ptr) const; + ProcessorWindowProxy* find_window_proxy (boost::shared_ptr) const; void set_processor_ui (boost::shared_ptr, Gtk::Window *); void maybe_add_processor_to_ui_list (boost::weak_ptr);