reset aux send menu item as appropriate; make sure that Aux role for any delivery...

git-svn-id: svn://localhost/ardour2/branches/3.0@6135 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index bd84d4ca0a0374134bf764e46e0324387e855651..7b784022fa750a028af71466bfe21d4e5653f124 100644 (file)
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -293,6 +293,7 @@ Gtk::Menu*
 ProcessorBox::build_possible_aux_menu ()
 {
        boost::shared_ptr<RouteList> rl = _session.get_routes_with_internal_returns();
+
        if (rl->empty()) {
                return 0;
        }
@@ -301,7 +302,6 @@ ProcessorBox::build_possible_aux_menu ()
        Menu* menu = manage (new Menu);
        MenuList& items = menu->items();
 
-
        for (RouteList::iterator r = rl->begin(); r != rl->end(); ++r) {
                if (!(*r)->internal_send_for (*r)) {
                        items.push_back (MenuElem ((*r)->name(), bind (sigc::ptr_fun (ProcessorBox::rb_choose_aux), boost::weak_ptr<Route>(*r))));
@@ -341,7 +341,8 @@ ProcessorBox::show_processor_menu (gint arg)
                if (m) {
                        aux_menu_item->set_submenu (*m);
                } else {
-                       /* XXX WHAT?*/
+                       /* stupid gtkmm: we need to pass a null reference here */
+                       aux_menu_item->set_submenu (*((Gtk::Menu *)0));
                }
        }
 

diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index 4b0ec3b34308b881c5fc71d022cdc9134103748b..72aa5bef55ffd73fe9b8579131494e395ca5d134 100644 (file)
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -515,6 +515,7 @@ setup_enum_writer ()
        REGISTER_CLASS_ENUM (Delivery, Send);
        REGISTER_CLASS_ENUM (Delivery, Listen);
        REGISTER_CLASS_ENUM (Delivery, Main);
+       REGISTER_CLASS_ENUM (Delivery, Aux);
        REGISTER_BITS (_Delivery_Role);
 
        REGISTER_CLASS_ENUM (MuteMaster, PreFader);