Use boost::shared_ptr instead of raw pointers for RouteUI track (etc) accessors ...

[ardour.git] / gtk2_ardour / redirect_box.cc

diff --git a/gtk2_ardour/redirect_box.cc b/gtk2_ardour/redirect_box.cc
index 687ae0805d839ef3354e8f16ebaa3de433b68c9b..9533cbf782ec2fd830c9403a25b70fca4e9cea0f 100644 (file)
--- a/gtk2_ardour/redirect_box.cc
+++ b/gtk2_ardour/redirect_box.cc
@@ -45,8 +45,6 @@
 #include <ardour/send.h>
 #include <ardour/insert.h>
 #include <ardour/ladspa_plugin.h>
-#include <ardour/connection.h>
-#include <ardour/session_connection.h>
 
 #include "ardour_ui.h"
 #include "ardour_dialog.h"
@@ -105,6 +103,7 @@ RedirectBox::RedirectBox (Placement pcmnt, Session& sess, boost::shared_ptr<Rout
        redirect_drag_in_progress = false;
        no_redirect_redisplay = false;
        ignore_delete = false;
+       ab_direction = true;
 
        model = ListStore::create(columns);
 
@@ -294,7 +293,7 @@ RedirectBox::redirect_button_press_event (GdkEventButton *ev)
                
        }
 
-       if (redirect && (Keyboard::is_edit_event (ev) || (ev->button == 1 && ev->type == GDK_2BUTTON_PRESS && ev->state == 0))) {
+       if (redirect && (Keyboard::is_edit_event (ev) || (ev->button == 1 && ev->type == GDK_2BUTTON_PRESS))) {
                
                if (_session.engine().connected()) {
                        /* XXX giving an error message here is hard, because we may be in the midst of a button press */
@@ -339,7 +338,7 @@ RedirectBox::redirect_button_release_event (GdkEventButton *ev)
                show_redirect_menu(ev->time);
                ret = true;
 
-       } else if (redirect && ev->button == 2 && ev->state == GDK_BUTTON2_MASK) {
+       } else if (redirect && (ev->button == 2) && (ev->state == Gdk::BUTTON2_MASK)) {
                
                redirect->set_active (!redirect->active(), this);
                ret = true;
@@ -453,8 +452,8 @@ RedirectBox::weird_plugin_dialog (Plugin& p, uint32_t streams, boost::shared_ptr
                                         p.name(),
                                         p.get_info()->n_inputs,
                                         p.get_info()->n_outputs,
-                                        io->n_inputs(),
-                                        io->n_outputs(),
+                                        io->n_inputs().n_total(),
+                                        io->n_outputs().n_total(),
                                         streams));
        }
 
@@ -481,10 +480,11 @@ void
 RedirectBox::choose_send ()
 {
        boost::shared_ptr<Send> send (new Send (_session, _placement));
+       send->set_default_type(_route->default_type());
 
        /* XXX need redirect lock on route */
 
-       send->ensure_io (0, _route->max_redirect_outs(), false, this);
+       send->ensure_io (ChanCount::ZERO, _route->max_redirect_outs(), false, this);
        
        IOSelectorWindow *ios = new IOSelectorWindow (_session, send, false, true);
        
@@ -627,7 +627,11 @@ RedirectBox::build_redirect_tooltip (EventBox& box, string start)
        for(Gtk::TreeModel::Children::iterator iter = children.begin(); iter != children.end(); ++iter) {
                Gtk::TreeModel::Row row = *iter;
                tip += '\n';
-               tip += row[columns.text];
+
+               /* don't use the column text, since it may be narrowed */
+
+               boost::shared_ptr<Redirect> r = row[columns.redirect];
+               tip += r->name();
        }
        ARDOUR_UI::instance()->tooltips().set_tip (box, tip);
 }
@@ -994,6 +998,23 @@ RedirectBox::all_redirects_active (bool state)
        _route->all_redirects_active (_placement, state);
 }
 
+void
+RedirectBox::all_plugins_active (bool state)
+{
+       if (state) {
+               // XXX not implemented
+       } else {
+               _route->disable_plugins (_placement);
+       }
+}
+
+void
+RedirectBox::ab_plugins ()
+{
+       _route->ab_plugins (ab_direction);
+       ab_direction = !ab_direction;
+}
+
 void
 RedirectBox::clear_redirects ()
 {
@@ -1070,6 +1091,7 @@ RedirectBox::edit_redirect (boost::shared_ptr<Redirect> redirect)
                        send_ui->get_window()->raise ();
                } else {
                        send_ui->show_all ();
+                       send_ui->present ();
                }
                
        } else {
@@ -1114,6 +1136,7 @@ RedirectBox::edit_redirect (boost::shared_ptr<Redirect> redirect)
                                        plugin_ui->get_window()->raise ();
                                } else {
                                        plugin_ui->show_all ();
+                                       plugin_ui->present ();
                                }
 #ifdef HAVE_AUDIOUNIT
                        } else if (type == ARDOUR::AudioUnit) {
@@ -1124,12 +1147,18 @@ RedirectBox::edit_redirect (boost::shared_ptr<Redirect> redirect)
                                        plugin_ui = reinterpret_cast<AUPluginUI*> (plugin_insert->get_gui());
                                }
                                
-                               // raise window, somehow
+                               if (plugin_ui->is_visible()) {
+                                       plugin_ui->get_window()->raise ();
+                               } else {
+                                       plugin_ui->show_all ();
+                                       plugin_ui->present ();
+                               }
 #endif                         
                        } else {
                                warning << "Unsupported plugin sent to RedirectBox::edit_redirect()" << endmsg;
                                return;
                        }
+
                } else if ((port_insert = boost::dynamic_pointer_cast<PortInsert> (insert)) != 0) {
                        
                        if (!_session.engine().connected()) {
@@ -1152,6 +1181,7 @@ RedirectBox::edit_redirect (boost::shared_ptr<Redirect> redirect)
                                io_selector->get_window()->raise ();
                        } else {
                                io_selector->show_all ();
+                               io_selector->present ();
                        }
                }
        }
@@ -1213,6 +1243,9 @@ RedirectBox::register_actions ()
        ActionManager::register_action (popup_act_grp, X_("activate_all"), _("Activate all"),  sigc::ptr_fun (RedirectBox::rb_activate_all));
        ActionManager::register_action (popup_act_grp, X_("deactivate_all"), _("Deactivate all"),  sigc::ptr_fun (RedirectBox::rb_deactivate_all));
 
+       ActionManager::register_action (popup_act_grp, X_("a_b_plugins"), _("A/B plugins"),  sigc::ptr_fun (RedirectBox::rb_ab_plugins));
+       ActionManager::register_action (popup_act_grp, X_("deactivate_plugins"), _("Deactivate plugins"),  sigc::ptr_fun (RedirectBox::rb_deactivate_plugins));
+
        /* show editors */
        act = ActionManager::register_action (popup_act_grp, X_("edit"), _("Edit"),  sigc::ptr_fun (RedirectBox::rb_edit));
        ActionManager::plugin_selection_sensitive_actions.push_back(act);
@@ -1365,6 +1398,27 @@ RedirectBox::rb_deactivate_all ()
        _current_redirect_box->all_redirects_active (false);
 }
 
+void
+RedirectBox::rb_deactivate_plugins ()
+{
+       if (_current_redirect_box == 0) {
+               return;
+       }
+       _current_redirect_box->all_plugins_active (false);
+}
+
+
+void
+RedirectBox::rb_ab_plugins ()
+{
+       if (_current_redirect_box == 0) {
+               return;
+       }
+
+       _current_redirect_box->ab_plugins ();
+}
+
+
 void
 RedirectBox::rb_edit ()
 {