make --disable-plugins/-d work again, probably

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

diff --git a/gtk2_ardour/opts.cc b/gtk2_ardour/opts.cc
index efb64729fc77abcb831a3c4c3d6a14e396ce7c21..6b5f19bdd6ed0e499c0899b0498684ad01fe75a8 100644 (file)
--- a/gtk2_ardour/opts.cc
+++ b/gtk2_ardour/opts.cc
@@ -98,6 +98,7 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
                { "version", 0, 0, 'v' },
                { "help", 0, 0, 'h' },
                { "bindings", 0, 0, 'b' },
+               { "disable-plugins", 1, 0, 'd' },
                { "debug", 1, 0, 'D' },
                { "show-splash", 0, 0, 'n' },
                { "menus", 1, 0, 'm' },

diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 94530e3890e911e4f70ebd28d73f818abfe5ec72..ff58eb0f812d4f6866ab9789af4a193090bf02ef 100644 (file)
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -1021,7 +1021,7 @@ Route::add_processor (boost::shared_ptr<Processor> processor, boost::shared_ptr<
 
                }
 
-               if (activation_allowed) {
+               if (activation_allowed && !_session.get_disable_all_loaded_plugins()) {
                        processor->activate ();
                }