Fix copy/paste typo -- MacOSX builds
[ardour.git] / libs / ardour / route.cc
index 4fa9eadff7331cb50f0f7b0ea70068967f783fa5..44d79587405749badf5e689a954e16d3c91a23f8 100644 (file)
@@ -905,6 +905,13 @@ int
 Route::add_processors (const ProcessorList& others, boost::shared_ptr<Processor> before, ProcessorStreams* err)
 {
        ProcessorList::iterator loc;
+       boost::shared_ptr <PluginInsert> fanout;
+
+       if (g_atomic_int_get (&_pending_process_reorder)) {
+               /* we need to flush any pending re-order changes */
+               Glib::Threads::Mutex::Lock lx (AudioEngine::instance()->process_lock ());
+               apply_processor_changes_rt ();
+       }
 
        if (before) {
                loc = find(_processors.begin(), _processors.end(), before);
@@ -963,7 +970,8 @@ Route::add_processors (const ProcessorList& others, boost::shared_ptr<Processor>
 
                if (flags != None) {
                        boost::optional<int> rv = PluginSetup (shared_from_this (), pi, flags);  /* EMIT SIGNAL */
-                       switch (rv.get_value_or (0)) {
+                       int mode = rv.get_value_or (0);
+                       switch (mode & 3) {
                                case 1:
                                        to_skip.push_back (*i); // don't add this one;
                                        break;
@@ -974,6 +982,9 @@ Route::add_processors (const ProcessorList& others, boost::shared_ptr<Processor>
                                default:
                                        break;
                        }
+                       if ((mode & 5) == 4) {
+                               fanout = pi;
+                       }
                }
        }
 
@@ -1060,6 +1071,11 @@ Route::add_processors (const ProcessorList& others, boost::shared_ptr<Processor>
        processors_changed (RouteProcessorChange ()); /* EMIT SIGNAL */
        set_processor_positions ();
 
+       if (fanout && fanout->configured ()
+                       && fanout->output_streams().n_audio() > 2
+                       && boost::dynamic_pointer_cast<PluginInsert> (the_instrument ()) == fanout) {
+               fan_out (); /* EMIT SIGNAL */
+       }
        return 0;
 }
 
@@ -1970,6 +1986,35 @@ Route::apply_processor_order (const ProcessorList& new_order)
        maybe_note_meter_position ();
 }
 
+void
+Route::move_instrument_down (bool postfader)
+{
+       Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
+       ProcessorList new_order;
+       boost::shared_ptr<Processor> instrument;
+       for (ProcessorList::const_iterator i = _processors.begin(); i != _processors.end(); ++i) {
+               boost::shared_ptr<PluginInsert> pi = boost::dynamic_pointer_cast<PluginInsert>(*i);
+               if (pi && pi->plugin ()->get_info ()->is_instrument ()) {
+                       instrument = *i;
+               } else if (instrument && *i == _amp) {
+                       if (postfader) {
+                               new_order.push_back (*i);
+                               new_order.push_back (instrument);
+                       } else {
+                               new_order.push_back (instrument);
+                               new_order.push_back (*i);
+                       }
+               } else {
+                       new_order.push_back (*i);
+               }
+       }
+       if (!instrument) {
+               return;
+       }
+       lm.release ();
+       reorder_processors (new_order, 0);
+}
+
 int
 Route::reorder_processors (const ProcessorList& new_order, ProcessorStreams* err)
 {
@@ -3344,46 +3389,56 @@ Route::output_change_handler (IOChange change, void * /*src*/)
                io_changed (); /* EMIT SIGNAL */
        }
 
-       if (_solo_control->soloed_by_others_downstream()) {
-               int sbod = 0;
-               /* checking all all downstream routes for
-                * explicit of implict solo is a rather drastic measure,
-                * ideally the input_change_handler() of the other route
-                * would propagate the change to us.
+       if ((change.type & IOChange::ConnectionsChanged)) {
+
+               /* do this ONLY if connections have changed. Configuration
+                * changes do not, by themselves alter solo upstream or
+                * downstream status.
                 */
-               boost::shared_ptr<RouteList> routes = _session.get_routes ();
-               if (_output->connected()) {
-                       for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) {
-                               if ((*i).get() == this || (*i)->is_master() || (*i)->is_monitor() || (*i)->is_auditioner()) {
-                                       continue;
-                               }
-                               bool sends_only;
-                               bool does_feed = direct_feeds_according_to_reality (*i, &sends_only);
-                               if (does_feed && !sends_only) {
-                                       if ((*i)->soloed()) {
-                                               ++sbod;
-                                               break;
+
+               if (_solo_control->soloed_by_others_downstream()) {
+                       int sbod = 0;
+                       /* checking all all downstream routes for
+                        * explicit of implict solo is a rather drastic measure,
+                        * ideally the input_change_handler() of the other route
+                        * would propagate the change to us.
+                        */
+                       boost::shared_ptr<RouteList> routes = _session.get_routes ();
+                       if (_output->connected()) {
+                               for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) {
+                                       if ((*i).get() == this || (*i)->is_master() || (*i)->is_monitor() || (*i)->is_auditioner()) {
+                                               continue;
+                                       }
+                                       bool sends_only;
+                                       bool does_feed = direct_feeds_according_to_reality (*i, &sends_only);
+                                       if (does_feed && !sends_only) {
+                                               if ((*i)->soloed()) {
+                                                       ++sbod;
+                                                       break;
+                                               }
                                        }
                                }
                        }
-               }
-               int delta = sbod - _solo_control->soloed_by_others_downstream();
-               if (delta <= 0) {
-                       // do not allow new connections to change implicit solo (no propagation)
-                       _solo_control->mod_solo_by_others_downstream (delta);
-                       // Session::route_solo_changed() does not propagate indirect solo-changes
-                       // propagate upstream to tracks
-                       for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) {
-                               if ((*i).get() == this || !can_solo()) {
-                                       continue;
-                               }
-                               bool sends_only;
-                               bool does_feed = (*i)->feeds (shared_from_this(), &sends_only);
-                               if (delta != 0 && does_feed && !sends_only) {
-                                       (*i)->solo_control()->mod_solo_by_others_downstream (delta);
+
+                       int delta = sbod - _solo_control->soloed_by_others_downstream();
+                       if (delta <= 0) {
+                               // do not allow new connections to change implicit solo (no propagation)
+                               _solo_control->mod_solo_by_others_downstream (delta);
+                               // Session::route_solo_changed() does not propagate indirect solo-changes
+                               // propagate upstream to tracks
+                               boost::shared_ptr<Route> shared_this = shared_from_this();
+                               for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) {
+                                       if ((*i).get() == this || !can_solo()) {
+                                               continue;
+                                       }
+                                       bool sends_only;
+                                       bool does_feed = (*i)->feeds (shared_this, &sends_only);
+                                       if (delta != 0 && does_feed && !sends_only) {
+                                               (*i)->solo_control()->mod_solo_by_others_downstream (delta);
+                                       }
                                }
-                       }
 
+                       }
                }
        }
 }