make i18n build work ; add mackie dir back to build ; token work on amp for MIDI...

[ardour.git] / libs / ardour / route.cc

diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 73323b4acad02cbda801e1b4073a080df251db2c..56311c975db1063cb0fe929bbfd11cab0ec59c83 100644 (file)
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -760,10 +760,6 @@ Route::add_processor_from_xml (const XMLNode& node, ProcessorList::iterator iter
                                        return true;
                                }
                                        
-                       } else if (prop->value() == "listen" || prop->value() == "deliver") {
-
-                               /* XXX need to generalize */
-
                        } else if (prop->value() == "intsend") {
 
                                processor.reset (new InternalSend (_session, _mute_master, node));
@@ -795,6 +791,7 @@ Route::add_processor_from_xml (const XMLNode& node, ProcessorList::iterator iter
 
                        } else {
                                error << string_compose(_("unknown Processor type \"%1\"; ignored"), prop->value()) << endmsg;
+                               return false;
                        }
                                
                        if (iter == _processors.end() && processor->visible() && !_processors.empty()) {
@@ -2649,6 +2646,8 @@ Route::meter ()
 {
        Glib::RWLock::ReaderLock rm (_processor_lock, Glib::TRY_LOCK);
 
+       assert (_meter);
+
        _meter->meter ();
 
        for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {