projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
radically change Keyboard/Binding API design to disconnect Gtk::Action lookup from...
[ardour.git] / gtk2_ardour / processor_box.cc
diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index 181fc22a19c6342e5576aa47c7bda50d237e2e55..8fa8d725c51b17e603cc3bac1a5a9fbe1686a611 100644 (file)
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -711,7 +711,7 @@ ProcessorEntry::Control::slider_adjusted ()
                return;
        }
 
-       c->set_value ( c->interface_to_internal(_adjustment.get_value ()) );
+       c->set_value ( c->interface_to_internal(_adjustment.get_value ()) , Controllable::NoGroup);
        set_tooltip ();
 }
 
@@ -726,7 +726,7 @@ ProcessorEntry::Control::button_clicked ()
 
        bool const n = _button.get_active ();
 
-       c->set_value (n ? 0 : 1);
+       c->set_value (n ? 0 : 1, Controllable::NoGroup);
        _button.set_active (!n);
        set_tooltip ();
 }
@@ -1105,16 +1105,24 @@ ProcessorEntry::RoutingIcon::on_expose_event (GdkEventExpose* ev)
 static std::list<Gtk::TargetEntry> drop_targets()
 {
        std::list<Gtk::TargetEntry> tmp;
-       tmp.push_back (Gtk::TargetEntry ("processor"));
-       tmp.push_back (Gtk::TargetEntry ("PluginInfoPtr"));
-       tmp.push_back (Gtk::TargetEntry ("PluginPresetPtr"));
+       tmp.push_back (Gtk::TargetEntry ("processor")); // from processor-box to processor-box
+       tmp.push_back (Gtk::TargetEntry ("PluginInfoPtr")); // from plugin-manager
+       tmp.push_back (Gtk::TargetEntry ("PluginPresetPtr")); // from sidebar
        return tmp;
 }
 
-static std::list<Gtk::TargetEntry> drop_targets_noplugin()
+static std::list<Gtk::TargetEntry> drag_targets()
 {
        std::list<Gtk::TargetEntry> tmp;
-       tmp.push_back (Gtk::TargetEntry ("processor"));
+       tmp.push_back (Gtk::TargetEntry ("PluginPresetPtr")); // to sidebar (optional preset)
+       tmp.push_back (Gtk::TargetEntry ("processor")); // to processor-box (copy)
+       return tmp;
+}
+
+static std::list<Gtk::TargetEntry> drag_targets_noplugin()
+{
+       std::list<Gtk::TargetEntry> tmp;
+       tmp.push_back (Gtk::TargetEntry ("processor")); // to processor box (sends, faders re-order)
        return tmp;
 }
 
@@ -1994,7 +2002,7 @@ ProcessorBox::maybe_add_processor_to_ui_list (boost::weak_ptr<Processor> w)
        const XMLNode* ui_xml = _session->extra_xml (X_("UI"));
 
        if (ui_xml) {
-               wp->set_state (*ui_xml);
+               wp->set_state (*ui_xml, 0);
        }
 
         void* existing_ui = p->get_ui ();
@@ -2019,7 +2027,8 @@ ProcessorBox::help_count_visible_prefader_processors (boost::weak_ptr<Processor>
                         )
           ) {
 
-               if (boost::dynamic_pointer_cast<Amp>(processor) && boost::dynamic_pointer_cast<Amp>(processor)->type() == X_("amp")) {
+               if (boost::dynamic_pointer_cast<Amp>(processor) && 
+                   boost::dynamic_pointer_cast<Amp>(processor)->gain_control()->parameter().type() == GainAutomation) {
                        *amp_seen = true;
                } else {
                        if (!*amp_seen) {
@@ -2088,9 +2097,9 @@ ProcessorBox::add_processor_to_display (boost::weak_ptr<Processor> p)
 #endif
                 )
        {
-               processor_display.add_child (e);
+               processor_display.add_child (e, drag_targets());
        } else {
-               processor_display.add_child (e, drop_targets_noplugin());
+               processor_display.add_child (e, drag_targets_noplugin());
        }
 }
 
@@ -2109,7 +2118,8 @@ ProcessorBox::setup_entry_positions ()
 
        uint32_t num = 0;
        for (list<ProcessorEntry*>::iterator i = children.begin(); i != children.end(); ++i) {
-               if (boost::dynamic_pointer_cast<Amp>((*i)->processor()) && boost::dynamic_pointer_cast<Amp>((*i)->processor())->type() == X_("amp")) {
+               if (boost::dynamic_pointer_cast<Amp>((*i)->processor()) && 
+                   boost::dynamic_pointer_cast<Amp>((*i)->processor())->gain_control()->parameter().type() == GainAutomation) {
                        pre_fader = false;
                        (*i)->set_position (ProcessorEntry::Fader, num++);
                } else {
@@ -2681,7 +2691,7 @@ ProcessorBox::get_editor_window (boost::shared_ptr<Processor> processor, bool us
                }
        }
 
-       if (boost::dynamic_pointer_cast<Amp> (processor) && boost::dynamic_pointer_cast<Amp> (processor)->type() == X_("amp")) {
+       if (boost::dynamic_pointer_cast<Amp> (processor) && boost::dynamic_pointer_cast<Amp> (processor)->gain_control()->parameter().type() == GainAutomation) {
 
                if (_parent_strip) {
                        _parent_strip->revert_to_default_display ();
@@ -2790,68 +2800,71 @@ ProcessorBox::get_generic_editor_window (boost::shared_ptr<Processor> processor)
 void
 ProcessorBox::register_actions ()
 {
-       Glib::RefPtr<Gtk::ActionGroup> popup_act_grp = Gtk::ActionGroup::create(X_("ProcessorMenu"));
+       Glib::RefPtr<Gtk::ActionGroup> popup_act_grp = Actions.create_action_group (X_("ProcessorMenu"));
        Glib::RefPtr<Action> act;
 
        /* new stuff */
-       ActionManager::register_action (popup_act_grp, X_("newplugin"), _("New Plugin"),
+       Actions.register_action (popup_act_grp, X_("newplugin"), _("New Plugin"),
                        sigc::ptr_fun (ProcessorBox::rb_choose_plugin));
 
-       act = ActionManager::register_action (popup_act_grp, X_("newinsert"), _("New Insert"),
+       act = Actions.register_action (popup_act_grp, X_("newinsert"), _("New Insert"),
                        sigc::ptr_fun (ProcessorBox::rb_choose_insert));
        ActionManager::engine_sensitive_actions.push_back (act);
-       act = ActionManager::register_action (popup_act_grp, X_("newsend"), _("New External Send ..."),
+       act = Actions.register_action (popup_act_grp, X_("newsend"), _("New External Send ..."),
                        sigc::ptr_fun (ProcessorBox::rb_choose_send));
        ActionManager::engine_sensitive_actions.push_back (act);
 
-       ActionManager::register_action (popup_act_grp, X_("newaux"), _("New Aux Send ..."));
+       Actions.register_action (popup_act_grp, X_("newaux"), _("New Aux Send ..."));
 
-       ActionManager::register_action (popup_act_grp, X_("controls"), _("Controls"));
-       ActionManager::register_action (popup_act_grp, X_("send_options"), _("Send Options"));
+       Actions.register_action (popup_act_grp, X_("controls"), _("Controls"));
+       Actions.register_action (popup_act_grp, X_("send_options"), _("Send Options"));
 
-       ActionManager::register_action (popup_act_grp, X_("clear"), _("Clear (all)"),
+       Actions.register_action (popup_act_grp, X_("clear"), _("Clear (all)"),
                        sigc::ptr_fun (ProcessorBox::rb_clear));
-       ActionManager::register_action (popup_act_grp, X_("clear_pre"), _("Clear (pre-fader)"),
+       Actions.register_action (popup_act_grp, X_("clear_pre"), _("Clear (pre-fader)"),
                        sigc::ptr_fun (ProcessorBox::rb_clear_pre));
-       ActionManager::register_action (popup_act_grp, X_("clear_post"), _("Clear (post-fader)"),
+       Actions.register_action (popup_act_grp, X_("clear_post"), _("Clear (post-fader)"),
                        sigc::ptr_fun (ProcessorBox::rb_clear_post));
 
        /* standard editing stuff */
-       cut_action = ActionManager::register_action (popup_act_grp, X_("cut"), _("Cut"),
-                                                     sigc::ptr_fun (ProcessorBox::rb_cut));
-       copy_action = ActionManager::register_action (popup_act_grp, X_("copy"), _("Copy"),
-                       sigc::ptr_fun (ProcessorBox::rb_copy));
-       delete_action = ActionManager::register_action (popup_act_grp, X_("delete"), _("Delete"),
-                       sigc::ptr_fun (ProcessorBox::rb_delete));
-
-       paste_action = ActionManager::register_action (popup_act_grp, X_("paste"), _("Paste"),
+
+       cut_action = Actions.register_action (popup_act_grp, X_("cut"), _("Cut"),
+                                                           sigc::ptr_fun (ProcessorBox::rb_cut));
+       copy_action = Actions.register_action (popup_act_grp, X_("copy"), _("Copy"),
+                                                            sigc::ptr_fun (ProcessorBox::rb_copy));
+       delete_action = Actions.register_action (popup_act_grp, X_("delete"), _("Delete"),
+                                                              sigc::ptr_fun (ProcessorBox::rb_delete));
+       
+       ActionManager::plugin_selection_sensitive_actions.push_back (cut_action);
+       ActionManager::plugin_selection_sensitive_actions.push_back (copy_action);
+       ActionManager::plugin_selection_sensitive_actions.push_back (delete_action);
+       
+       paste_action = processor_box_actions.register_action (popup_act_grp, X_("paste"), _("Paste"),
                        sigc::ptr_fun (ProcessorBox::rb_paste));
-       rename_action = ActionManager::register_action (popup_act_grp, X_("rename"), _("Rename"),
+       rename_action = Actions.register_action (popup_act_grp, X_("rename"), _("Rename"),
                        sigc::ptr_fun (ProcessorBox::rb_rename));
-       ActionManager::register_action (popup_act_grp, X_("selectall"), _("Select All"),
+       Actions.register_action (popup_act_grp, X_("selectall"), _("Select All"),
                        sigc::ptr_fun (ProcessorBox::rb_select_all));
-       ActionManager::register_action (popup_act_grp, X_("deselectall"), _("Deselect All"),
+       Actions.register_action (popup_act_grp, X_("deselectall"), _("Deselect All"),
                        sigc::ptr_fun (ProcessorBox::rb_deselect_all));
 
        /* activation etc. */
 
-       ActionManager::register_action (popup_act_grp, X_("activate_all"), _("Activate All"),
+       Actions.register_action (popup_act_grp, X_("activate_all"), _("Activate All"),
                        sigc::ptr_fun (ProcessorBox::rb_activate_all));
-       ActionManager::register_action (popup_act_grp, X_("deactivate_all"), _("Deactivate All"),
+       Actions.register_action (popup_act_grp, X_("deactivate_all"), _("Deactivate All"),
                        sigc::ptr_fun (ProcessorBox::rb_deactivate_all));
-       ActionManager::register_action (popup_act_grp, X_("ab_plugins"), _("A/B Plugins"),
+       Actions.register_action (popup_act_grp, X_("ab_plugins"), _("A/B Plugins"),
                        sigc::ptr_fun (ProcessorBox::rb_ab_plugins));
 
        /* show editors */
-       edit_action = ActionManager::register_action (
+       edit_action = Actions.register_action (
                popup_act_grp, X_("edit"), _("Edit..."),
                sigc::ptr_fun (ProcessorBox::rb_edit));
 
-       edit_generic_action = ActionManager::register_action (
+       edit_generic_action = Actions.register_action (
                popup_act_grp, X_("edit-generic"), _("Edit with generic controls..."),
                sigc::ptr_fun (ProcessorBox::rb_edit_generic));
-
-       ActionManager::add_action_group (popup_act_grp);
 }
 
 void
@@ -3072,7 +3085,7 @@ ProcessorBox::edit_processor (boost::shared_ptr<Processor> processor)
 
        if (proxy) {
                proxy->set_custom_ui_mode (true);
-               proxy->toggle ();
+               proxy->show_the_right_window ();
        }
 }
 
@@ -3090,7 +3103,7 @@ ProcessorBox::generic_edit_processor (boost::shared_ptr<Processor> processor)
 
        if (proxy) {
                proxy->set_custom_ui_mode (false);
-               proxy->toggle ();
+               proxy->show_the_right_window ();
        }
 }
 
@@ -3295,7 +3308,7 @@ ProcessorWindowProxy::session_handle()
 }
 
 XMLNode&
-ProcessorWindowProxy::get_state () const
+ProcessorWindowProxy::get_state ()
 {
        XMLNode *node;
        node = &ProxyBase::get_state();
@@ -3303,8 +3316,8 @@ ProcessorWindowProxy::get_state () const
        return *node;
 }
 
-void
-ProcessorWindowProxy::set_state (const XMLNode& node)
+int
+ProcessorWindowProxy::set_state (const XMLNode& node, int /*version*/)
 {
        XMLNodeList children = node.children ();
        XMLNodeList::const_iterator i = children.begin ();
@@ -3323,7 +3336,7 @@ ProcessorWindowProxy::set_state (const XMLNode& node)
                }
        }
 
-       ProxyBase::set_state(node);
+       return ProxyBase::set_state (node, 0);
 }
 
 Gtk::Window*
@@ -3356,13 +3369,16 @@ ProcessorWindowProxy::get (bool create)
 }
 
 void
-ProcessorWindowProxy::toggle ()
+ProcessorWindowProxy::show_the_right_window ()
 {
        if (_window && (is_custom != want_custom)) {
                /* drop existing window - wrong type */
                drop_window ();
+               get (true);
+               setup ();
+               assert (_window);
+               is_custom = want_custom;
        }
-       is_custom = want_custom;
 
-       WM::ProxyBase::toggle ();
+       toggle ();
 }
Unnamed repository; edit this file 'description' to name the repository.