Fix some unused parameter warnings.
[ardour.git] / libs / ardour / session.cc
index 9800b9a8c33ea433b2df367c4815d22a76c17fae..ba4e6db37d21c0d11acf65411aaec398880d7f1e 100644 (file)
 #include "pbd/stacktrace.h"
 #include "pbd/file_utils.h"
 
+#include "ardour/amp.h"
 #include "ardour/analyser.h"
 #include "ardour/audio_buffer.h"
 #include "ardour/audio_diskstream.h"
+#include "ardour/audio_port.h"
 #include "ardour/audio_track.h"
 #include "ardour/audioengine.h"
 #include "ardour/audiofilesource.h"
@@ -147,6 +149,8 @@ Session::Session (AudioEngine &eng,
 {
        bool new_session;
 
+       interpolation.add_channel_to (0, 0);
+
        if (!eng.connected()) {
                throw failed_constructor();
        }
@@ -231,6 +235,8 @@ Session::Session (AudioEngine &eng,
 {
        bool new_session;
 
+       interpolation.add_channel_to (0, 0);
+
        if (!eng.connected()) {
                throw failed_constructor();
        }
@@ -265,16 +271,6 @@ Session::Session (AudioEngine &eng,
                RouteList rl;
                int control_id = 1;
 
-               if (control_out_channels) {
-                       ChanCount count(DataType::AUDIO, control_out_channels);
-                       shared_ptr<Route> r (new Route (*this, _("monitor"), Route::ControlOut, DataType::AUDIO));
-                       r->input()->ensure_io (count, false, this);
-                       r->output()->ensure_io (count, false, this);
-                       r->set_remote_control_id (control_id++);
-
-                       rl.push_back (r);
-               }
-
                if (master_out_channels) {
                        ChanCount count(DataType::AUDIO, master_out_channels);
                        shared_ptr<Route> r (new Route (*this, _("master"), Route::MasterOut, DataType::AUDIO));
@@ -288,12 +284,27 @@ Session::Session (AudioEngine &eng,
                        output_ac = AutoConnectOption (output_ac & ~AutoConnectMaster);
                }
 
+               if (control_out_channels) {
+                       ChanCount count(DataType::AUDIO, control_out_channels);
+                       shared_ptr<Route> r (new Route (*this, _("monitor"), Route::ControlOut, DataType::AUDIO));
+                       r->input()->ensure_io (count, false, this);
+                       r->output()->ensure_io (count, false, this);
+                       r->set_remote_control_id (control_id++);
+
+                       rl.push_back (r);
+               }
+
                if (!rl.empty()) {
                        add_routes (rl, false);
                }
 
        }
 
+       if (no_auto_connect()) {
+               input_ac = AutoConnectOption (0);
+               output_ac = AutoConnectOption (0);
+       }
+
        Config->set_input_auto_connect (input_ac);
        Config->set_output_auto_connect (output_ac);
 
@@ -464,32 +475,12 @@ Session::destroy ()
        }
        sources.clear ();
 
-#ifdef TRACK_DESTRUCTION
-       cerr << "delete mix groups\n";
-#endif /* TRACK_DESTRUCTION */
-       for (list<RouteGroup *>::iterator i = mix_groups.begin(); i != mix_groups.end(); ) {
-               list<RouteGroup*>::iterator tmp;
-
-               tmp = i;
-               ++tmp;
-
-               delete *i;
-
-               i = tmp;
-       }
 
 #ifdef TRACK_DESTRUCTION
-       cerr << "delete edit groups\n";
+       cerr << "delete route groups\n";
 #endif /* TRACK_DESTRUCTION */
-       for (list<RouteGroup *>::iterator i = edit_groups.begin(); i != edit_groups.end(); ) {
-               list<RouteGroup*>::iterator tmp;
-
-               tmp = i;
-               ++tmp;
-
+       for (list<RouteGroup *>::iterator i = _route_groups.begin(); i != _route_groups.end(); ++i) {
                delete *i;
-
-               i = tmp;
        }
 
        delete [] butler_mixdown_buffer;
@@ -607,6 +598,8 @@ Session::when_engine_running ()
           it doesn't really scale that well to higher channel counts 
        */
 
+       /* mono output bundles */
+
        for (uint32_t np = 0; np < n_physical_outputs; ++np) {
                char buf[32];
                snprintf (buf, sizeof (buf), _("out %" PRIu32), np+1);
@@ -618,6 +611,8 @@ Session::when_engine_running ()
                add_bundle (c);
        }
 
+       /* stereo output bundles */
+
        for (uint32_t np = 0; np < n_physical_outputs; np += 2) {
                if (np + 1 < n_physical_outputs) {
                        char buf[32];
@@ -632,6 +627,8 @@ Session::when_engine_running ()
                }
        }
 
+       /* mono input bundles */
+
        for (uint32_t np = 0; np < n_physical_inputs; ++np) {
                char buf[32];
                snprintf (buf, sizeof (buf), _("in %" PRIu32), np+1);
@@ -643,6 +640,8 @@ Session::when_engine_running ()
                add_bundle (c);
        }
 
+       /* stereo input bundles */
+
        for (uint32_t np = 0; np < n_physical_inputs; np += 2) {
                if (np + 1 < n_physical_inputs) {
                        char buf[32];
@@ -657,17 +656,20 @@ Session::when_engine_running ()
                        add_bundle (c);
                }
        }
-
-       /* create master/control ports */
        
-       if (_master_out) {
+       BootMessage (_("Setup signal flow and plugins"));
 
-               /* if requested auto-connect the outputs to the first N physical ports.
-               */
+       hookup_io ();
 
-               if (Config->get_auto_connect_master()) {
-                       uint32_t limit = _master_out->n_outputs().n_total();
+       if (!no_auto_connect()) {
+
+               if (_master_out && Config->get_auto_connect_standard_busses()) {
+                       
+                       /* if requested auto-connect the outputs to the first N physical ports.
+                        */
 
+                       uint32_t limit = _master_out->n_outputs().n_total();
+                       
                        for (uint32_t n = 0; n < limit; ++n) {
                                Port* p = _master_out->output()->nth (n);
                                string connect_to = _engine.get_nth_physical_output (DataType (p->type()), n);
@@ -681,40 +683,82 @@ Session::when_engine_running ()
                                }
                        }
                }
-       }
 
-       BootMessage (_("Setup signal flow and plugins"));
+               if (_control_out) {
 
-       hookup_io ();
+                       /* AUDIO ONLY as of june 29th 2009, because listen semantics for anything else
+                          are undefined, at best.
+                        */
 
-       /* catch up on send+insert cnts */
+                       /* control out listens to master bus (but ignores it 
+                          under some conditions)
+                       */
 
-       BootMessage (_("Catch up with send/insert state"));
+                       uint32_t limit = _control_out->n_inputs().n_audio();
+                       
+                       if (_master_out) {
+                               for (uint32_t n = 0; n < limit; ++n) {
+                                       AudioPort* p = _control_out->input()->ports().nth_audio_port (n);
+                                       AudioPort* o = _master_out->output()->ports().nth_audio_port (n);
+                                       
+                                       if (o) {
+                                               string connect_to = o->name();
+                                               if (_control_out->input()->connect (p, connect_to, this)) {
+                                                       error << string_compose (_("cannot connect control input %1 to %2"), n, connect_to) 
+                                                             << endmsg;
+                                                       break;
+                                               }
+                                       }
+                               }
+                       }
 
-       insert_cnt = 0;
+                       /* if control out is not connected, 
+                          connect control out to physical outs, but use ones after the master if possible
+                       */
 
-       for (list<PortInsert*>::iterator i = _port_inserts.begin(); i != _port_inserts.end(); ++i) {
-               uint32_t id;
+                       if (!_control_out->output()->connected_to (boost::shared_ptr<IO>())) {
 
-               if (sscanf ((*i)->name().c_str(), "%*s %u", &id) == 1) {
-                       if (id > insert_cnt) {
-                               insert_cnt = id;
-                       }
-               }
-       }
+                               if (!Config->get_monitor_bus_preferred_bundle().empty()) {
 
-       send_cnt = 0;
+                                       boost::shared_ptr<Bundle> b = bundle_by_name (Config->get_monitor_bus_preferred_bundle());
 
-       for (list<Send*>::iterator i = _sends.begin(); i != _sends.end(); ++i) {
-               uint32_t id;
+                                       if (b) {
+                                               _control_out->output()->connect_ports_to_bundle (b, this);
+                                       } else {
+                                               warning << string_compose (_("The preferred I/O for the monitor bus (%1) cannot be found"),
+                                                                          Config->get_monitor_bus_preferred_bundle()) 
+                                                       << endmsg;
+                                       }
 
-               if (sscanf ((*i)->name().c_str(), "%*s %u", &id) == 1) {
-                       if (id > send_cnt) {
-                               send_cnt = id;
+                               } else {
+
+                                       /* XXX this logic is wrong for mixed port types */
+                                       
+                                       uint32_t shift = _master_out->n_outputs().n_audio();
+                                       uint32_t mod = _engine.n_physical_outputs (DataType::AUDIO);
+                                       limit = _control_out->n_outputs().n_audio();
+
+                                       cerr << "Connecting " << limit << " control out ports, shift is " << shift << " mod is " << mod << endl;
+                                       
+                                       for (uint32_t n = 0; n < limit; ++n) {
+                                               
+                                               Port* p = _control_out->output()->nth (n);
+                                               string connect_to = _engine.get_nth_physical_output (DataType (p->type()), (n+shift) % mod);
+                                               
+                                               if (!connect_to.empty()) {
+                                                       if (_control_out->output()->connect (p, connect_to, this)) {
+                                                               error << string_compose (_("cannot connect control output %1 to %2"), n, connect_to) 
+                                                                     << endmsg;
+                                                               break;
+                                                       }
+                                               }
+                                       }
+                               }
                        }
                }
        }
 
+       /* catch up on send+insert cnts */
 
        _state_of_the_state = StateOfTheState (_state_of_the_state & ~(CannotSave|Dirty));
 
@@ -751,24 +795,6 @@ Session::hookup_io ()
                }
        }
 
-       /* Connect track to listen/solo etc. busses XXX generalize this beyond control_out */
-
-       if (_control_out) {
-
-               // _control_out->ensure_io (_control_out->input_minimum(), _control_out->output_minimum(), false, this);
-
-               boost::shared_ptr<RouteList> r = routes.reader ();
-               
-               for (RouteList::iterator x = r->begin(); x != r->end(); ++x) {
-
-                       boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track> (*x);
-
-                       if (t) {
-                               t->listen_via (_control_out->input(), X_("listen"));
-                       }
-               }
-       }
-
        /* load bundles, which we may have postponed earlier on */
        if (_bundle_xml_node) {
                load_bundles (*_bundle_xml_node);
@@ -783,22 +809,43 @@ Session::hookup_io ()
 
        Delivery::reset_panners ();
 
+       /* Connect tracks to listen/solo etc. busses XXX generalize this beyond control_out */
+
+       if (_control_out) {
+
+               boost::shared_ptr<RouteList> r = routes.reader ();
+               
+               for (RouteList::iterator x = r->begin(); x != r->end(); ++x) {
+
+                       if ((*x)->is_control() || (*x)->is_master()) {
+                               continue;
+                       }
+
+                       (*x)->listen_via (_control_out, 
+                                         (Config->get_listen_position() == AfterFaderListen ? PostFader : PreFader),
+                                         false, false);
+               }
+       }
+
        /* Anyone who cares about input state, wake up and do something */
 
        IOConnectionsComplete (); /* EMIT SIGNAL */
 
        _state_of_the_state = StateOfTheState (_state_of_the_state & ~InitialConnecting);
 
-
        /* now handle the whole enchilada as if it was one
           graph reorder event.
        */
 
        graph_reordered ();
 
-       /* update mixer solo state */
+       /* update the full solo state, which can't be
+          correctly determined on a per-route basis, but
+          needs the global overview that only the session
+          has.
+       */
 
-       catch_up_on_solo();
+       update_route_solo_state ();
 }
 
 void
@@ -1017,7 +1064,7 @@ Session::set_auto_loop_location (Location* location)
 }
 
 void
-Session::locations_added (Location* ignored)
+Session::locations_added (Location *)
 {
        set_dirty ();
 }
@@ -1308,7 +1355,7 @@ Session::set_block_size (nframes_t nframes)
 }
 
 void
-Session::set_default_fade (float steepness, float fade_msecs)
+Session::set_default_fade (float /*steepness*/, float /*fade_msecs*/)
 {
 #if 0
        nframes_t fade_frames;
@@ -1455,7 +1502,7 @@ Session::resort_routes_using (shared_ptr<RouteList> r)
                                continue;
                        }
 
-                       if ((*j)->feeds ((*i)->input())) {
+                       if ((*j)->feeds (*i)) {
                                (*i)->fed_by.insert (*j);
                        }
                }
@@ -1480,7 +1527,7 @@ Session::resort_routes_using (shared_ptr<RouteList> r)
 }
 
 list<boost::shared_ptr<MidiTrack> >
-Session::new_midi_track (TrackMode mode, uint32_t how_many)
+Session::new_midi_track (TrackMode mode, RouteGroup* route_group, uint32_t how_many)
 {
        char track_name[32];
        uint32_t track_id = 0;
@@ -1546,7 +1593,7 @@ Session::new_midi_track (TrackMode mode, uint32_t how_many)
                        }
 
 
-                       if (track->output()->ensure_io (ChanCount(DataType::AUDIO, 1), false, this)) {
+                       if (track->output()->ensure_io (ChanCount(DataType::MIDI, 1), false, this)) {
                                error << "cannot configure 1 in/1 out configuration for new midi track" << endmsg;
                                goto failed;
                        }
@@ -1589,6 +1636,7 @@ Session::new_midi_track (TrackMode mode, uint32_t how_many)
                        */
 
                        track->midi_diskstream()->non_realtime_input_change();
+                       track->set_route_group (route_group, 0);
 
                        track->DiskstreamChanged.connect (mem_fun (this, &Session::resort_routes));
                        //track->set_remote_control_id (control_id);
@@ -1645,7 +1693,7 @@ Session::new_midi_track (TrackMode mode, uint32_t how_many)
 }
 
 list<boost::shared_ptr<AudioTrack> >
-Session::new_audio_track (int input_channels, int output_channels, TrackMode mode, uint32_t how_many)
+Session::new_audio_track (int input_channels, int output_channels, TrackMode mode, RouteGroup* route_group,  uint32_t how_many)
 {
        char track_name[32];
        uint32_t track_id = 0;
@@ -1757,6 +1805,8 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
 
                        channels_used += track->n_inputs ().n_audio();
 
+                       track->set_route_group (route_group, 0);
+
                        track->audio_diskstream()->non_realtime_input_change();
 
                        track->DiskstreamChanged.connect (mem_fun (this, &Session::resort_routes));
@@ -1835,7 +1885,7 @@ Session::set_remote_control_ids ()
 
 
 RouteList
-Session::new_audio_route (int input_channels, int output_channels, uint32_t how_many)
+Session::new_audio_route (int input_channels, int output_channels, RouteGroup* route_group, uint32_t how_many)
 {
        char bus_name[32];
        uint32_t bus_id = 1;
@@ -1889,7 +1939,7 @@ Session::new_audio_route (int input_channels, int output_channels, uint32_t how_
                try {
                        shared_ptr<Route> bus (new Route (*this, bus_name, Route::Flag(0), DataType::AUDIO));
 
-                       if (bus->output()->ensure_io (ChanCount(DataType::AUDIO, input_channels), false, this)) {
+                       if (bus->input()->ensure_io (ChanCount(DataType::AUDIO, input_channels), false, this)) {
                                error << string_compose (_("cannot configure %1 in/%2 out configuration for new audio track"),
                                                         input_channels, output_channels)
                                      << endmsg;
@@ -1904,22 +1954,17 @@ Session::new_audio_route (int input_channels, int output_channels, uint32_t how_
                                goto failure;
                        }
 
-
-
-                       /*
-                       for (uint32_t x = 0; n_physical_audio_inputs && x < bus->n_inputs(); ++x) {
-                                       
+                       for (uint32_t x = 0; n_physical_audio_inputs && x < bus->input()->n_ports().n_audio(); ++x) {
                                port = "";
                                
                                if (Config->get_input_auto_connect() & AutoConnectPhysical) {
                                        port = physinputs[((n+x)%n_physical_audio_inputs)];
                                } 
                                
-                               if (port.length() && bus->connect_input (bus->input (x), port, this)) {
+                               if (port.length() && bus->input()->connect (bus->input()->nth (x), port, this)) {
                                        break;
                                }
                        }
-                       */
 
                        for (uint32_t x = 0; n_physical_audio_outputs && x < bus->n_outputs().n_audio(); ++x) {
                                port = "";
@@ -1939,6 +1984,7 @@ Session::new_audio_route (int input_channels, int output_channels, uint32_t how_
 
                        channels_used += bus->n_inputs ().n_audio();
 
+                       bus->set_route_group (route_group, 0);
                        bus->set_remote_control_id (control_id);
                        ++control_id;
 
@@ -1976,6 +2022,7 @@ Session::new_route_from_template (uint32_t how_many, const std::string& template
        RouteList ret;
        uint32_t control_id;
        XMLTree tree;
+       uint32_t number = 1;
 
        if (!tree.read (template_path.c_str())) {
                return ret;
@@ -1991,30 +2038,25 @@ Session::new_route_from_template (uint32_t how_many, const std::string& template
          
                std::string node_name = IO::name_from_state (*node_copy.children().front());
 
-               if (route_by_name (node_name) != 0) {
-
-                       /* generate a new name by adding a number to the end of the template name */
-
-                       uint32_t number = 1;
-
-                       do {
-                               snprintf (name, sizeof (name), "%s %" PRIu32, node_name.c_str(), number);
-             
-                               number++;
-             
-                               if (route_by_name (name) == 0) {
-                                       break;
-                               }
-             
-                       } while (number < UINT_MAX);
-
-                       if (number == UINT_MAX) {
-                               fatal << _("Session: UINT_MAX routes? impossible!") << endmsg;
-                               /*NOTREACHED*/
+               /* generate a new name by adding a number to the end of the template name */
+               
+               do {
+                       snprintf (name, sizeof (name), "%s %" PRIu32, node_name.c_str(), number);
+                       
+                       number++;
+                       
+                       if (route_by_name (name) == 0) {
+                               break;
                        }
-
-                       IO::set_name_in_state (*node_copy.children().front(), name);
+                       
+               } while (number < UINT_MAX);
+               
+               if (number == UINT_MAX) {
+                       fatal << _("Session: UINT_MAX routes? impossible!") << endmsg;
+                       /*NOTREACHED*/
                }
+               
+               IO::set_name_in_state (*node_copy.children().front(), name);
 
                Track::zero_diskstream_id_in_xml (node_copy);
 
@@ -2069,17 +2111,29 @@ Session::add_routes (RouteList& new_routes, bool save)
                RCUWriter<RouteList> writer (routes);
                shared_ptr<RouteList> r = writer.get_copy ();
                r->insert (r->end(), new_routes.begin(), new_routes.end());
-               resort_routes_using (r);
+
+
+               /* if there is no control out and we're not in the middle of loading,
+                  resort the graph here. if there is a control out, we will resort
+                  toward the end of this method. if we are in the middle of loading, 
+                  we will resort when done.
+               */
+
+               if (!_control_out && IO::connecting_legal) {
+                       resort_routes_using (r);
+               }
        }
 
        for (RouteList::iterator x = new_routes.begin(); x != new_routes.end(); ++x) {
 
                boost::weak_ptr<Route> wpr (*x);
 
+               (*x)->listen_changed.connect (sigc::bind (mem_fun (*this, &Session::route_listen_changed), wpr));
                (*x)->solo_changed.connect (sigc::bind (mem_fun (*this, &Session::route_solo_changed), wpr));
                (*x)->mute_changed.connect (mem_fun (*this, &Session::route_mute_changed));
                (*x)->output()->changed.connect (mem_fun (*this, &Session::set_worst_io_latencies_x));
                (*x)->processors_changed.connect (bind (mem_fun (*this, &Session::update_latency_compensation), false, false));
+               (*x)->route_group_changed.connect (hide (mem_fun (*this, &Session::route_group_changed)));
 
                if ((*x)->is_master()) {
                        _master_out = (*x);
@@ -2093,8 +2147,15 @@ Session::add_routes (RouteList& new_routes, bool save)
        if (_control_out && IO::connecting_legal) {
 
                for (RouteList::iterator x = new_routes.begin(); x != new_routes.end(); ++x) {
-                       (*x)->listen_via (_control_out->input(), "control");
+                       if ((*x)->is_control() || (*x)->is_master()) {
+                               continue;
+                       }
+                       (*x)->listen_via (_control_out, 
+                                         (Config->get_listen_position() == AfterFaderListen ? PostFader : PreFader),
+                                         false, false);
                }
+
+               resort_routes ();
        }
 
        set_dirty();
@@ -2106,6 +2167,96 @@ Session::add_routes (RouteList& new_routes, bool save)
        RouteAdded (new_routes); /* EMIT SIGNAL */
 }
 
+void
+Session::globally_set_send_gains_to_zero (boost::shared_ptr<Route> dest)
+{
+       boost::shared_ptr<RouteList> r = routes.reader ();
+       boost::shared_ptr<Send> s;
+
+       /* only tracks */
+
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+               if (boost::dynamic_pointer_cast<Track>(*i)) {
+                       if ((s = (*i)->internal_send_for (dest)) != 0) {
+                               s->amp()->gain_control()->set_value (0.0);
+                       }
+               }
+       }
+}
+
+void
+Session::globally_set_send_gains_to_unity (boost::shared_ptr<Route> dest)
+{
+       boost::shared_ptr<RouteList> r = routes.reader ();
+       boost::shared_ptr<Send> s;
+
+       /* only tracks */
+
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+               if (boost::dynamic_pointer_cast<Track>(*i)) {
+                       if ((s = (*i)->internal_send_for (dest)) != 0) {
+                               s->amp()->gain_control()->set_value (1.0);
+                       }
+               }
+       }
+}
+
+void
+Session::globally_set_send_gains_from_track(boost::shared_ptr<Route> dest)
+{
+       boost::shared_ptr<RouteList> r = routes.reader ();
+       boost::shared_ptr<Send> s;
+
+       /* only tracks */
+
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+               if (boost::dynamic_pointer_cast<Track>(*i)) {
+                       if ((s = (*i)->internal_send_for (dest)) != 0) {
+                               s->amp()->gain_control()->set_value ((*i)->gain_control()->get_value());
+                       }
+               }
+       }
+}
+
+void
+Session::globally_add_internal_sends (boost::shared_ptr<Route> dest, Placement p)
+{
+       boost::shared_ptr<RouteList> r = routes.reader ();
+       boost::shared_ptr<RouteList> t (new RouteList);
+
+       /* only send tracks */
+
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+               if (boost::dynamic_pointer_cast<Track>(*i)) {
+                       t->push_back (*i);
+               }
+       }
+
+       add_internal_sends (dest, p, t);
+}
+
+
+void
+Session::add_internal_sends (boost::shared_ptr<Route> dest, Placement p, boost::shared_ptr<RouteList> senders)
+{
+       if (dest->is_control() || dest->is_master()) {
+               return;
+       }
+
+       if (!dest->internal_return()) {
+               dest->add_internal_return();
+       }
+
+       for (RouteList::iterator i = senders->begin(); i != senders->end(); ++i) {
+
+               if ((*i)->is_control() || (*i)->is_master() || (*i) == dest) {
+                       continue;
+               }
+
+               (*i)->listen_via (dest, p, true, true);
+       }
+}
+
 void
 Session::add_diskstream (boost::shared_ptr<Diskstream> dstream)
 {
@@ -2150,13 +2301,14 @@ Session::remove_route (shared_ptr<Route> route)
                }
 
                if (route == _control_out) {
+
                        /* cancel control outs for all routes */
 
                        for (RouteList::iterator r = rs->begin(); r != rs->end(); ++r) {
-                               (*r)->drop_listen (_control_out->input());
+                               (*r)->drop_listen (_control_out);
                        }
 
-                       _control_out = shared_ptr<Route> ();
+                       _control_out.reset ();
                }
 
                update_route_solo_state ();
@@ -2210,13 +2362,29 @@ Session::remove_route (shared_ptr<Route> route)
 }
 
 void
-Session::route_mute_changed (void* src)
+Session::route_mute_changed (void* /*src*/)
 {
        set_dirty ();
 }
 
 void
-Session::route_solo_changed (void* src, boost::weak_ptr<Route> wpr)
+Session::route_listen_changed (void* /*src*/, boost::weak_ptr<Route> wpr)
+{
+       boost::shared_ptr<Route> route = wpr.lock();
+       if (!route) {
+               error << string_compose (_("programming error: %1"), X_("invalid route weak ptr passed to route_solo_changed")) << endmsg;
+               return;
+       }
+
+       if (route->listening()) {
+               _listen_cnt++;
+       } else if (_listen_cnt > 0) {
+               _listen_cnt--;
+       }
+}
+
+void
+Session::route_solo_changed (void* /*src*/, boost::weak_ptr<Route> wpr)
 {
        if (solo_update_disabled) {
                // We know already
@@ -2240,110 +2408,61 @@ Session::route_solo_changed (void* src, boost::weak_ptr<Route> wpr)
                delta = -1;
        }
 
+       /* now mod the solo level of all other routes except master & control outs
+          so that they will be silent if appropriate.
+       */
+       
+       solo_update_disabled = true;
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-               if ((*i)->feeds (route->input())) {
+
+               if ((*i)->feeds (route) && !(*i)->is_hidden() && !(*i)->is_master() && !(*i)->is_control()) {
                        /* do it */
-                       
-                       solo_update_disabled = true;
-                       (*i)->main_outs()->mod_solo_level (delta);
-                       solo_update_disabled = false;
+                       (*i)->mod_solo_level (delta);
                }
        }
 
-       /* now figure out if anything is soloed */
+       /* make sure master is never muted by solo */
 
-       bool something_soloed = false;
-
-       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-               if ((*i)->soloed()) {
-                       something_soloed = true;
-                       break;
-               }
+       if (route != _master_out && _master_out->solo_level() == 0 && !_master_out->soloed()) {
+               _master_out->mod_solo_level (1);
        }
 
-       if (something_soloed != _non_soloed_outs_muted) {
-               _non_soloed_outs_muted = something_soloed;
-               SoloActive (_non_soloed_outs_muted); /* EMIT SIGNAL */
+       /* ditto for control outs make sure master is never muted by solo */
+
+       if (route != _control_out && _control_out && _control_out->solo_level() == 0) {
+               _control_out->mod_solo_level (1);
        }
 
+       solo_update_disabled = false;
+       update_route_solo_state (r);
        SoloChanged (); /* EMIT SIGNAL */
-
        set_dirty();
 }
 
 void
-Session::update_route_solo_state ()
+Session::update_route_solo_state (boost::shared_ptr<RouteList> r)
 {
-       bool mute = false;
-       bool is_track = false;
-       bool signal = false;
+       /* now figure out if anything that matters is soloed */
 
-       /* this is where we actually implement solo by changing
-          the solo mute setting of each track.
-       */
+       bool something_soloed = false;
 
-       shared_ptr<RouteList> r = routes.reader ();
+       if (!r) {
+               r = routes.reader();
+       }
 
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-               if ((*i)->soloed()) {
-                       mute = true;
-                       if (boost::dynamic_pointer_cast<Track>(*i)) {
-                               is_track = true;
-                       }
+               if (!(*i)->is_master() && !(*i)->is_control() && !(*i)->is_hidden() && (*i)->soloed()) {
+                       something_soloed = true;
                        break;
                }
        }
 
-       if (mute != currently_soloing) {
-               signal = true;
-               currently_soloing = mute;
-       }
-
-       if (!is_track && !mute) {
-
-               /* nothing is soloed */
-
-               if (signal) {
-                       SoloActive (false);
-               }
-
-               return;
-       }
-       
-       if (signal) {
-               SoloActive (currently_soloing);
+       if (something_soloed != _non_soloed_outs_muted) {
+               _non_soloed_outs_muted = something_soloed;
+               SoloActive (_non_soloed_outs_muted); /* EMIT SIGNAL */
        }
 }
 
-
-void
-Session::catch_up_on_solo ()
-{
-       /* this is called after set_state() to catch the full solo
-          state, which can't be correctly determined on a per-route
-          basis, but needs the global overview that only the session
-          has.
-       */
-       update_route_solo_state();
-}      
-
-void
-Session::catch_up_on_solo_mute_override ()
-{
-       if (Config->get_solo_model() != InverseMute) {
-               return;
-       }
-
-       /* this is called whenever the param solo-mute-override is
-          changed.
-       */
-       shared_ptr<RouteList> r = routes.reader ();
-
-       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-               // (*i)->catch_up_on_solo_mute_override ();
-       }
-}      
-
 shared_ptr<Route>
 Session::route_by_name (string name)
 {
@@ -3478,6 +3597,20 @@ Session::set_all_solo (bool yn)
        set_dirty();
 }
 
+void
+Session::set_all_listen (bool yn)
+{
+       shared_ptr<RouteList> r = routes.reader ();
+
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+               if (!(*i)->is_hidden()) {
+                       (*i)->set_listen (yn, this);
+               }
+       }
+
+       set_dirty();
+}
+
 void
 Session::set_all_mute (bool yn)
 {
@@ -3568,26 +3701,7 @@ Session::record_enable_change_all (bool yn)
 void
 Session::add_processor (Processor* processor)
 {
-       Send* send;
-       Return* retrn;
-       PortInsert* port_insert;
-       PluginInsert* plugin_insert;
-
-       if ((port_insert = dynamic_cast<PortInsert *> (processor)) != 0) {
-               _port_inserts.insert (_port_inserts.begin(), port_insert);
-       } else if ((plugin_insert = dynamic_cast<PluginInsert *> (processor)) != 0) {
-               _plugin_inserts.insert (_plugin_inserts.begin(), plugin_insert);
-       } else if ((send = dynamic_cast<Send *> (processor)) != 0) {
-               _sends.insert (_sends.begin(), send);
-       } else if ((retrn = dynamic_cast<Return *> (processor)) != 0) {
-               _returns.insert (_returns.begin(), retrn);
-       } else {
-               fatal << _("programming error: unknown type of Insert created!") << endmsg;
-               /*NOTREACHED*/
-       }
-
        processor->GoingAway.connect (sigc::bind (mem_fun (*this, &Session::remove_processor), processor));
-
        set_dirty();
 }
 
@@ -3597,31 +3711,13 @@ Session::remove_processor (Processor* processor)
        Send* send;
        Return* retrn;
        PortInsert* port_insert;
-       PluginInsert* plugin_insert;
 
        if ((port_insert = dynamic_cast<PortInsert *> (processor)) != 0) {
-               list<PortInsert*>::iterator x = find (_port_inserts.begin(), _port_inserts.end(), port_insert);
-               if (x != _port_inserts.end()) {
-                       insert_bitset[port_insert->bit_slot()] = false;
-                       _port_inserts.erase (x);
-               }
-       } else if ((plugin_insert = dynamic_cast<PluginInsert *> (processor)) != 0) {
-               _plugin_inserts.remove (plugin_insert);
+               insert_bitset[port_insert->bit_slot()] = false;
        } else if ((send = dynamic_cast<Send *> (processor)) != 0) {
-               list<Send*>::iterator x = find (_sends.begin(), _sends.end(), send);
-               if (x != _sends.end()) {
-                       send_bitset[send->bit_slot()] = false;
-                       _sends.erase (x);
-               }
+               send_bitset[send->bit_slot()] = false;
        } else if ((retrn = dynamic_cast<Return *> (processor)) != 0) {
-               list<Return*>::iterator x = find (_returns.begin(), _returns.end(), retrn);
-               if (x != _returns.end()) {
-                       return_bitset[send->bit_slot()] = false;
-                       _returns.erase (x);
-               }
-       } else {
-               fatal << _("programming error: unknown type of Insert deleted!") << endmsg;
-               /*NOTREACHED*/
+               return_bitset[send->bit_slot()] = false;
        }
 
        set_dirty();
@@ -3714,7 +3810,7 @@ Session::bundle_by_name (string name) const
 }
 
 void
-Session::tempo_map_changed (Change ignored)
+Session::tempo_map_changed (Change)
 {
        clear_clicks ();
 
@@ -3999,7 +4095,7 @@ Session::freeze (InterThreadInfo& itt)
 
 boost::shared_ptr<Region>
 Session::write_one_track (AudioTrack& track, nframes_t start, nframes_t end,   
-                         bool overwrite, vector<boost::shared_ptr<Source> >& srcs, 
+                         bool /*overwrite*/, vector<boost::shared_ptr<Source> >& srcs, 
                          InterThreadInfo& itt, bool enable_processing)
 {
        boost::shared_ptr<Region> result;
@@ -4237,7 +4333,7 @@ Session::compute_initial_length ()
 }
 
 void
-Session::sync_order_keys (const char* base)
+Session::sync_order_keys (std::string const & base)
 {
        if (!Config->get_sync_all_route_ordering()) {
                /* leave order keys as they are */
@@ -4279,3 +4375,43 @@ Session::update_have_rec_enabled_diskstream ()
                RecordStateChanged (); /* EMIT SIGNAL */
        }
 }
+
+void
+Session::listen_position_changed ()
+{
+       Placement p;
+
+       switch (Config->get_listen_position()) {
+       case AfterFaderListen:
+               p = PostFader;
+               break;
+
+       case PreFaderListen:
+               p = PreFader;
+               break;
+       }
+
+       boost::shared_ptr<RouteList> r = routes.reader ();
+
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+               (*i)->put_control_outs_at (p);
+       }
+}
+
+void
+Session::solo_control_mode_changed ()
+{
+       /* cancel all solo or all listen when solo control mode changes */
+
+       if (Config->get_solo_control_is_listen_control()) {
+               set_all_solo (false);
+       } else {
+               set_all_listen (false);
+       }
+}
+
+void
+Session::route_group_changed ()
+{
+       RouteGroupChanged (); /* EMIT SIGNAL */
+}