remove some left over debugging
[ardour.git] / libs / ardour / session_state.cc
index 453d0ac772fd494daa0594e468376658aec645ab..f1bebae6e3a60f986c253b40e688591d0fddf012 100644 (file)
@@ -56,6 +56,7 @@
 #include "midi++/manager.h"
 
 #include "pbd/boost_debug.h"
+#include "pbd/basename.h"
 #include "pbd/controllable_descriptor.h"
 #include "pbd/enumwriter.h"
 #include "pbd/error.h"
@@ -95,6 +96,7 @@
 #include "ardour/pannable.h"
 #include "ardour/processor.h"
 #include "ardour/port.h"
+#include "ardour/proxy_controllable.h"
 #include "ardour/region_factory.h"
 #include "ardour/route_group.h"
 #include "ardour/send.h"
@@ -128,6 +130,7 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
+
 void
 Session::first_stage_init (string fullpath, string snapshot_name)
 {
@@ -145,16 +148,10 @@ Session::first_stage_init (string fullpath, string snapshot_name)
 
        _path = string(buf);
 
-       if (_path[_path.length()-1] != '/') {
+       if (_path[_path.length()-1] != G_DIR_SEPARATOR) {
                _path += G_DIR_SEPARATOR;
        }
 
-       if (Glib::file_test (_path, Glib::FILE_TEST_EXISTS) && ::access (_path.c_str(), W_OK)) {
-               _writable = false;
-       } else {
-               _writable = true;
-       }
-
        /* these two are just provisional settings. set_state()
           will likely override them.
        */
@@ -220,7 +217,7 @@ Session::first_stage_init (string fullpath, string snapshot_name)
        midi_control_ui = 0;
         _step_editors = 0;
         no_questions_about_missing_files = false;
-        _speakers = new Speakers;
+        _speakers.reset (new Speakers);
 
        AudioDiskstream::allocate_working_buffers();
 
@@ -257,8 +254,6 @@ Session::first_stage_init (string fullpath, string snapshot_name)
        last_rr_session_dir = session_dirs.begin();
        refresh_disk_space ();
 
-       // set_default_fade (0.2, 5.0); /* steepness, millisecs */
-
         /* default: assume simple stereo speaker configuration */
 
         _speakers->setup_default_speakers (2);
@@ -270,6 +265,11 @@ Session::first_stage_init (string fullpath, string snapshot_name)
        delta_accumulator_cnt = 0;
        _slave_state = Stopped;
 
+        _solo_cut_control.reset (new ProxyControllable (_("solo cut control (dB)"), PBD::Controllable::GainLike,
+                                                        boost::bind (&RCConfiguration::set_solo_mute_gain, Config, _1),
+                                                        boost::bind (&RCConfiguration::get_solo_mute_gain, Config)));
+        add_controllable (_solo_cut_control);
+
        _engine.GraphReordered.connect_same_thread (*this, boost::bind (&Session::graph_reordered, this));
 
        /* These are all static "per-class" signals */
@@ -295,7 +295,6 @@ Session::second_stage_init ()
                if (load_state (_current_snapshot_name)) {
                        return -1;
                }
-                cleanup_stubfiles ();
        }
 
        if (_butler->start_thread()) {
@@ -463,13 +462,6 @@ Session::ensure_subdirs ()
                return -1;
        }
 
-       dir = session_directory().sound_stub_path().to_string();
-
-       if (g_mkdir_with_parents (dir.c_str(), 0755) < 0) {
-               error << string_compose(_("Session: cannot create session stub sounds dir \"%1\" (%2)"), dir, strerror (errno)) << endmsg;
-               return -1;
-       }
-
        dir = session_directory().midi_path().to_string();
 
        if (g_mkdir_with_parents (dir.c_str(), 0755) < 0) {
@@ -477,14 +469,7 @@ Session::ensure_subdirs ()
                return -1;
        }
 
-       dir = session_directory().midi_stub_path().to_string();
-
-       if (g_mkdir_with_parents (dir.c_str(), 0755) < 0) {
-               error << string_compose(_("Session: cannot create session stub midi dir \"%1\" (%2)"), dir, strerror (errno)) << endmsg;
-               return -1;
-       }
-
-       dir = session_directory().dead_sound_path().to_string();
+       dir = session_directory().dead_path().to_string();
 
        if (g_mkdir_with_parents (dir.c_str(), 0755) < 0) {
                error << string_compose(_("Session: cannot create session dead sounds folder \"%1\" (%2)"), dir, strerror (errno)) << endmsg;
@@ -519,7 +504,6 @@ Session::ensure_subdirs ()
 int
 Session::create (const string& mix_template, BusProfile* bus_profile)
 {
-
        if (g_mkdir_with_parents (_path.c_str(), 0755) < 0) {
                error << string_compose(_("Session: cannot create session folder \"%1\" (%2)"), _path, strerror (errno)) << endmsg;
                return -1;
@@ -529,19 +513,21 @@ Session::create (const string& mix_template, BusProfile* bus_profile)
                return -1;
        }
 
+       _writable = exists_and_writable (sys::path (_path));
+
        if (!mix_template.empty()) {
                std::string in_path = mix_template;
 
                ifstream in(in_path.c_str());
 
-               if (in){
+               if (in) {
                        string out_path = _path;
                        out_path += _name;
                        out_path += statefile_suffix;
 
                        ofstream out(out_path.c_str());
 
-                       if (out){
+                       if (out) {
                                out << in.rdbuf();
                                 _is_new = false;
                                return 0;
@@ -577,13 +563,13 @@ Session::create (const string& mix_template, BusProfile* bus_profile)
                 ChanCount count(DataType::AUDIO, bus_profile->master_out_channels);
 
                if (bus_profile->master_out_channels) {
-                       Route* rt = new Route (*this, _("master"), Route::MasterOut, DataType::AUDIO);
-                        if (rt->init ()) {
-                                delete rt;
+                       boost::shared_ptr<Route> r (new Route (*this, _("master"), Route::MasterOut, DataType::AUDIO));
+                        if (r->init ()) {
                                 return -1;
                         }
-                       boost_debug_shared_ptr_mark_interesting (rt, "Route");
-                       boost::shared_ptr<Route> r (rt);
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+                       boost_debug_shared_ptr_mark_interesting (rt.get(), "Route");
+#endif
                        {
                                Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
                                r->input()->ensure_io (count, false, this);
@@ -594,13 +580,13 @@ Session::create (const string& mix_template, BusProfile* bus_profile)
                        rl.push_back (r);
 
                         if (Config->get_use_monitor_bus()) {
-                                Route* rt = new Route (*this, _("monitor"), Route::MonitorOut, DataType::AUDIO);
-                                if (rt->init ()) {
-                                        delete rt;
+                               boost::shared_ptr<Route> r (new Route (*this, _("monitor"), Route::MonitorOut, DataType::AUDIO));
+                                if (r->init ()) {
                                         return -1;
                                 }
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
                                 boost_debug_shared_ptr_mark_interesting (rt, "Route");
-                                boost::shared_ptr<Route> r (rt);
+#endif
                                {
                                        Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
                                        r->input()->ensure_io (count, false, this);
@@ -617,7 +603,7 @@ Session::create (const string& mix_template, BusProfile* bus_profile)
                }
 
                if (!rl.empty()) {
-                       add_routes (rl, false);
+                       add_routes (rl, false, false);
                }
 
                 /* this allows the user to override settings with an environment variable.
@@ -909,14 +895,7 @@ Session::load_state (string snapshot_name)
 
        set_dirty();
 
-       /* writable() really reflects the whole folder, but if for any
-          reason the session state file can't be written to, still
-          make us unwritable.
-       */
-
-       if (::access (xmlpath.to_string().c_str(), W_OK) != 0) {
-               _writable = false;
-       }
+       _writable = exists_and_writable (xmlpath);
 
        if (!state_tree->read (xmlpath.to_string())) {
                error << string_compose(_("Could not understand ardour file %1"), xmlpath.to_string()) << endmsg;
@@ -1179,9 +1158,7 @@ Session::state(bool full_state)
        }
 
         node->add_child_nocopy (_speakers->get_state());
-
        node->add_child_nocopy (_tempo_map->get_state());
-
        node->add_child_nocopy (get_control_protocol_state());
 
        if (_extra_xml) {
@@ -1208,7 +1185,7 @@ Session::set_state (const XMLNode& node, int version)
 
        _state_of_the_state = StateOfTheState (_state_of_the_state|CannotSave);
 
-       if (node.name() != X_("Session")){
+       if (node.name() != X_("Session")) {
                fatal << _("programming error: Session: incorrect XML node sent to set_state()") << endmsg;
                return -1;
        }
@@ -1255,24 +1232,6 @@ Session::set_state (const XMLNode& node, int version)
 
        IO::disable_connecting ();
 
-       /* Object loading order:
-
-       Path
-       Extra
-       Options/Config
-       MIDI Control // relies on data from Options/Config
-       Metadata
-       Locations
-       Sources
-       AudioRegions
-       Connections
-       Routes
-       RouteGroups
-       MixGroups
-       Click
-       ControlProtocols
-       */
-
        if ((child = find_named_node (node, "Extra")) != 0) {
                _extra_xml = new XMLNode (*child);
        }
@@ -1330,6 +1289,13 @@ Session::set_state (const XMLNode& node, int version)
                goto out;
        }
 
+       if ((child = find_named_node (node, "TempoMap")) == 0) {
+               error << _("Session: XML state has no Tempo Map section") << endmsg;
+               goto out;
+       } else if (_tempo_map->set_state (*child, version)) {
+               goto out;
+       }
+
        if ((child = find_named_node (node, "Regions")) == 0) {
                error << _("Session: XML state has no Regions section") << endmsg;
                goto out;
@@ -1368,13 +1334,6 @@ Session::set_state (const XMLNode& node, int version)
                }
        }
        
-       if ((child = find_named_node (node, "TempoMap")) == 0) {
-               error << _("Session: XML state has no Tempo Map section") << endmsg;
-               goto out;
-       } else if (_tempo_map->set_state (*child, version)) {
-               goto out;
-       }
-
        if (version < 3000) {
                if ((child = find_named_node (node, X_("DiskStreams"))) == 0) {
                        error << _("Session: XML state has no diskstreams section") << endmsg;
@@ -1470,7 +1429,7 @@ Session::load_routes (const XMLNode& node, int version)
                new_routes.push_back (route);
        }
 
-       add_routes (new_routes, false);
+       add_routes (new_routes, false, false);
 
        return 0;
 }
@@ -1497,36 +1456,35 @@ Session::XMLRouteFactory (const XMLNode& node, int version)
 
        if (ds_child) {
 
-                Track* track;
+               boost::shared_ptr<Track> track;
                 
                 if (type == DataType::AUDIO) {
-                        track = new AudioTrack (*this, X_("toBeResetFroXML"));
-                        
+                        track.reset (new AudioTrack (*this, X_("toBeResetFroXML")));
                 } else {
-                        track = new MidiTrack (*this, X_("toBeResetFroXML"));
+                        track.reset (new MidiTrack (*this, X_("toBeResetFroXML")));
                 }
                 
                 if (track->init()) {
-                        delete track;
                         return ret;
                 }
                 
                 if (track->set_state (node, version)) {
-                        delete track;
                         return ret;
                 }
                 
-                boost_debug_shared_ptr_mark_interesting (track, "Track");
-                ret.reset (track);
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+                boost_debug_shared_ptr_mark_interesting (track.get(), "Track");
+#endif
+                ret = track;
                 
        } else {
-               Route* rt = new Route (*this, X_("toBeResetFroXML"));
+               boost::shared_ptr<Route> r (new Route (*this, X_("toBeResetFroXML")));
 
-                if (rt->init () == 0 && rt->set_state (node, version) == 0) {
-                        boost_debug_shared_ptr_mark_interesting (rt, "Route");
-                        ret.reset (rt);
-                } else {
-                        delete rt;
+                if (r->init () == 0 && r->set_state (node, version) == 0) {
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+                        boost_debug_shared_ptr_mark_interesting (r.get(), "Route");
+#endif
+                        ret = r;
                 }
        }
 
@@ -1568,38 +1526,37 @@ Session::XMLRouteFactory_2X (const XMLNode& node, int version)
                        return boost::shared_ptr<Route> ();
                }
 
-                Track* track;
-                
+               boost::shared_ptr<Track> track;
+
                 if (type == DataType::AUDIO) {
-                        track = new AudioTrack (*this, X_("toBeResetFroXML"));
-                        
+                        track.reset (new AudioTrack (*this, X_("toBeResetFroXML")));
                 } else {
-                        track = new MidiTrack (*this, X_("toBeResetFroXML"));
+                        track.reset (new MidiTrack (*this, X_("toBeResetFroXML")));
                 }
                 
                 if (track->init()) {
-                        delete track;
                         return ret;
                 }
                 
                 if (track->set_state (node, version)) {
-                        delete track;
                         return ret;
                 }
 
                track->set_diskstream (*i);
                 
-                boost_debug_shared_ptr_mark_interesting (track, "Track");
-                ret.reset (track);
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS                
+                boost_debug_shared_ptr_mark_interesting (track.get(), "Track");
+#endif
+                ret = track;
                 
        } else {
-               Route* rt = new Route (*this, X_("toBeResetFroXML"));
+               boost::shared_ptr<Route> r (new Route (*this, X_("toBeResetFroXML")));
 
-                if (rt->init () == 0 && rt->set_state (node, version) == 0) {
+                if (r->init () == 0 && r->set_state (node, version) == 0) {
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
                         boost_debug_shared_ptr_mark_interesting (rt, "Route");
-                        ret.reset (rt);
-                } else {
-                        delete rt;
+#endif
+                        ret = r;
                 }
        }
 
@@ -1993,7 +1950,7 @@ Session::save_template (string template_name)
        }
 
        if (!tree.write (template_file_path.to_string())) {
-               error << _("mix template not saved") << endmsg;
+               error << _("template not saved") << endmsg;
                return -1;
        }
 
@@ -2341,9 +2298,21 @@ Session::remove_route_group (RouteGroup& rg)
 
                route_group_removed (); /* EMIT SIGNAL */
        }
+}
+
+/** Set a new order for our route groups, without adding or removing any.
+ *  @param groups Route group list in the new order.
+ */
+void
+Session::reorder_route_groups (list<RouteGroup*> groups)
+{
+       _route_groups = groups;
 
+       route_groups_reordered (); /* EMIT SIGNAL */
+       set_dirty ();
 }
 
+
 RouteGroup *
 Session::route_group_by_name (string name)
 {
@@ -2433,18 +2402,38 @@ Session::commit_reversible_command (Command *cmd)
 }
 
 static bool
-accept_all_non_peak_files (const string& path, void */*arg*/)
+accept_all_audio_files (const string& path, void */*arg*/)
+{ 
+        if (!Glib::file_test (path, Glib::FILE_TEST_IS_REGULAR)) {
+                return false;
+        }
+
+        if (!AudioFileSource::safe_audio_file_extension (path)) {
+                return false;
+        }
+
+        return true;
+}
+
+static bool
+accept_all_midi_files (const string& path, void */*arg*/)
 {
         if (!Glib::file_test (path, Glib::FILE_TEST_IS_REGULAR)) {
                 return false;
         }
 
-       return (path.length() > 5 && path.find (peakfile_suffix) != (path.length() - 5));
+       return ((path.length() > 4 && path.find (".mid") != (path.length() - 4)) ||
+                (path.length() > 4 && path.find (".smf") != (path.length() - 4)) ||
+                (path.length() > 5 && path.find (".midi") != (path.length() - 5)));
 }
 
 static bool
 accept_all_state_files (const string& path, void */*arg*/)
 {
+        if (!Glib::file_test (path, Glib::FILE_TEST_IS_REGULAR)) {
+                return false;
+        }
+
        return (path.length() > 7 && path.find (".ardour") == (path.length() - 7));
 }
 
@@ -2557,6 +2546,32 @@ Session::ask_about_playlist_deletion (boost::shared_ptr<Playlist> p)
        return r.get_value_or (1);
 }
 
+void
+Session::cleanup_regions ()
+{
+       const RegionFactory::RegionMap& regions (RegionFactory::regions());
+
+       for (RegionFactory::RegionMap::const_iterator i = regions.begin(); i != regions.end(); ++i) {
+
+               boost::shared_ptr<AudioRegion> audio_region = boost::dynamic_pointer_cast<AudioRegion>( i->second);
+               
+               if (!audio_region) {
+                       continue;
+               }
+               
+               uint32_t used = playlists->region_use_count (audio_region);
+
+               if (used == 0 && !audio_region->automatic()) {
+                       RegionFactory::map_remove(i->second);
+               }
+       }
+
+       /* dump the history list */
+       _history.clear ();
+
+       save_state ("");
+}
+
 int
 Session::cleanup_sources (CleanupReport& rep)
 {
@@ -2564,10 +2579,12 @@ Session::cleanup_sources (CleanupReport& rep)
 
        vector<boost::shared_ptr<Source> > dead_sources;
        PathScanner scanner;
-       string sound_path;
+       string audio_path;
+       string midi_path;
        vector<space_and_path>::iterator i;
        vector<space_and_path>::iterator nexti;
-       vector<string*>* soundfiles;
+       vector<string*>* candidates;
+       vector<string*>* candidates2;
        vector<string> unused;
        set<string> all_sources;
        bool used;
@@ -2576,14 +2593,19 @@ Session::cleanup_sources (CleanupReport& rep)
 
        _state_of_the_state = (StateOfTheState) (_state_of_the_state | InCleanup);
 
-       /* step 1: consider deleting all unused playlists */
+       /* consider deleting all unused playlists */
        
        if (playlists->maybe_delete_unused (boost::bind (Session::ask_about_playlist_deletion, _1))) {
                ret = 0;
                goto out;
        }
 
-       /* step 2: find all un-used sources */
+        /* sync the "all regions" property of each playlist with its current state
+         */
+
+        playlists->sync_all_regions_with_regions ();
+
+       /* find all un-used sources */
 
        rep.paths.clear ();
        rep.space = 0;
@@ -2607,7 +2629,7 @@ Session::cleanup_sources (CleanupReport& rep)
                i = tmp;
        }
 
-       /* build a list of all the possible sound directories for the session */
+       /* build a list of all the possible audio directories for the session */
 
        for (i = session_dirs.begin(); i != session_dirs.end(); ) {
 
@@ -2615,25 +2637,49 @@ Session::cleanup_sources (CleanupReport& rep)
                ++nexti;
 
                SessionDirectory sdir ((*i).path);
-               sound_path += sdir.sound_path().to_string();
+               audio_path += sdir.sound_path().to_string();
 
                if (nexti != session_dirs.end()) {
-                       sound_path += ':';
+                       audio_path += ':';
                }
 
                i = nexti;
        }
 
-       /* now do the same thing for the files that ended up in the sounds dir(s)
-          but are not referenced as sources in any snapshot.
-       */
 
-       soundfiles = scanner (sound_path, accept_all_non_peak_files, (void *) 0, false, true);
+       /* build a list of all the possible midi directories for the session */
 
-       if (soundfiles == 0) {
-               return 0;
+       for (i = session_dirs.begin(); i != session_dirs.end(); ) {
+
+               nexti = i;
+               ++nexti;
+
+               SessionDirectory sdir ((*i).path);
+               midi_path += sdir.midi_path().to_string();
+
+               if (nexti != session_dirs.end()) {
+                       midi_path += ':';
+               }
+
+               i = nexti;
        }
 
+       candidates = scanner (audio_path, accept_all_audio_files, (void *) 0, true, true);
+       candidates2 = scanner (midi_path, accept_all_midi_files, (void *) 0, true, true);
+
+        /* merge them */
+
+        if (candidates) {
+                if (candidates2) {
+                        for (vector<string*>::iterator i = candidates2->begin(); i != candidates2->end(); ++i) {
+                                candidates->push_back (*i);
+                        }
+                        delete candidates2;
+                }
+        } else {
+                candidates = candidates2; // might still be null
+        }
+
        /* find all sources, but don't use this snapshot because the
           state file on disk still references sources we may have already
           dropped.
@@ -2644,61 +2690,78 @@ Session::cleanup_sources (CleanupReport& rep)
        /*  add our current source list
         */
 
-       for (SourceMap::iterator i = sources.begin(); i != sources.end(); ++i) {
+       for (SourceMap::iterator i = sources.begin(); i != sources.end(); ) {
                boost::shared_ptr<FileSource> fs;
+                SourceMap::iterator tmp = i;
+                ++tmp;
 
                if ((fs = boost::dynamic_pointer_cast<FileSource> (i->second)) != 0) {
-                       all_sources.insert (fs->path());
+                        if (playlists->source_use_count (fs) != 0) {
+                                all_sources.insert (fs->path());
+                        } else {
+                                
+                                /* we might not remove this source from disk, because it may be used
+                                   by other snapshots, but its not being used in this version
+                                   so lets get rid of it now, along with any representative regions
+                                   in the region list.
+                                */
+                                
+                                RegionFactory::remove_regions_using_source (i->second);
+                                sources.erase (i);
+                        }
                }
+
+                i = tmp;
        }
 
        char tmppath1[PATH_MAX+1];
        char tmppath2[PATH_MAX+1];
 
-       for (vector<string*>::iterator x = soundfiles->begin(); x != soundfiles->end(); ++x) {
-
-               used = false;
-               spath = **x;
-
-               for (set<string>::iterator i = all_sources.begin(); i != all_sources.end(); ++i) {
+        if (candidates) {
+                for (vector<string*>::iterator x = candidates->begin(); x != candidates->end(); ++x) {
+                        
+                        used = false;
+                        spath = **x;
+                        
+                        for (set<string>::iterator i = all_sources.begin(); i != all_sources.end(); ++i) {
+                                
+                                if (realpath(spath.c_str(), tmppath1) == 0) {
+                                        error << string_compose (_("Cannot expand path %1 (%2)"),
+                                                                 spath, strerror (errno)) << endmsg;
+                                        continue;
+                                }
+                                
+                                if (realpath((*i).c_str(),  tmppath2) == 0) {
+                                        error << string_compose (_("Cannot expand path %1 (%2)"),
+                                                                 (*i), strerror (errno)) << endmsg;
+                                        continue;
+                                }
 
-                       if (realpath(spath.c_str(), tmppath1) == 0) {
-                                error << string_compose (_("Cannot expand path %1 (%2)"),
-                                                         spath, strerror (errno)) << endmsg;
-                                continue;
+                                if (strcmp(tmppath1, tmppath2) == 0) {
+                                        used = true;
+                                        break;
+                                }
                         }
-
-                        if (realpath((*i).c_str(),  tmppath2) == 0) {
-                                error << string_compose (_("Cannot expand path %1 (%2)"),
-                                                         (*i), strerror (errno)) << endmsg;
-                                continue;
+                        
+                        if (!used) {
+                                unused.push_back (spath);
                         }
 
-                       if (strcmp(tmppath1, tmppath2) == 0) {
-                               used = true;
-                               break;
-                       }
-               }
+                        delete *x;
+                }
 
-               if (!used) {
-                       unused.push_back (spath);
-               }
-       }
+                delete candidates;
+        }
 
-       /* now try to move all unused files into the "dead_sounds" directory(ies) */
+       /* now try to move all unused files into the "dead" directory(ies) */
 
        for (vector<string>::iterator x = unused.begin(); x != unused.end(); ++x) {
                struct stat statbuf;
 
-               rep.paths.push_back (*x);
-               if (stat ((*x).c_str(), &statbuf) == 0) {
-                       rep.space += statbuf.st_size;
-               }
-
                string newpath;
 
                /* don't move the file across filesystems, just
-                  stick it in the `dead_sound_dir_name' directory
+                  stick it in the `dead_dir_name' directory
                   on whichever filesystem it was already on.
                */
 
@@ -2713,16 +2776,16 @@ Session::cleanup_sources (CleanupReport& rep)
 
                        /* new school, go up 4 levels */
 
-                       newpath = Glib::path_get_dirname (*x);      // "audiofiles"
+                       newpath = Glib::path_get_dirname (*x);      // "audiofiles" or "midifiles"
                        newpath = Glib::path_get_dirname (newpath); // "session-name"
                        newpath = Glib::path_get_dirname (newpath); // "interchange"
                        newpath = Glib::path_get_dirname (newpath); // "session-dir"
                }
 
-               newpath = Glib::build_filename (newpath, dead_sound_dir_name);
+               newpath = Glib::build_filename (newpath, dead_dir_name);
 
                if (g_mkdir_with_parents (newpath.c_str(), 0755) < 0) {
-                       error << string_compose(_("Session: cannot create session peakfile folder \"%1\" (%2)"), newpath, strerror (errno)) << endmsg;
+                       error << string_compose(_("Session: cannot create dead file folder \"%1\" (%2)"), newpath, strerror (errno)) << endmsg;
                        return -1;
                }
 
@@ -2739,7 +2802,7 @@ Session::cleanup_sources (CleanupReport& rep)
                        snprintf (buf, sizeof (buf), "%s.%d", newpath.c_str(), version);
                        newpath_v = buf;
 
-                       while (access (newpath_v.c_str(), F_OK) == 0 && version < 999) {
+                       while (Glib::file_test (newpath_v.c_str(), Glib::FILE_TEST_EXISTS) && version < 999) {
                                snprintf (buf, sizeof (buf), "%s.%d", newpath.c_str(), ++version);
                                newpath_v = buf;
                        }
@@ -2758,8 +2821,10 @@ Session::cleanup_sources (CleanupReport& rep)
 
                }
 
+               stat ((*x).c_str(), &statbuf);
+
                if (::rename ((*x).c_str(), newpath.c_str()) != 0) {
-                       error << string_compose (_("cannot rename audio file source from %1 to %2 (%3)"),
+                       error << string_compose (_("cannot rename unused file source from %1 to %2 (%3)"),
                                          (*x), newpath, strerror (errno))
                              << endmsg;
                        goto out;
@@ -2768,22 +2833,27 @@ Session::cleanup_sources (CleanupReport& rep)
                /* see if there an easy to find peakfile for this file, and remove it.
                 */
 
-               string peakpath = (*x).substr (0, (*x).find_last_of ('.'));
-               peakpath += peakfile_suffix;
-
-               if (access (peakpath.c_str(), W_OK) == 0) {
+                string base = basename_nosuffix (*x);
+                base += "%A"; /* this is what we add for the channel suffix of all native files, 
+                                 or for the first channel of embedded files. it will miss
+                                 some peakfiles for other channels
+                              */
+               string peakpath = peak_path (base);
+                
+               if (Glib::file_test (peakpath.c_str(), Glib::FILE_TEST_EXISTS)) {
                        if (::unlink (peakpath.c_str()) != 0) {
                                error << string_compose (_("cannot remove peakfile %1 for %2 (%3)"),
-                                                 peakpath, _path, strerror (errno))
+                                                         peakpath, _path, strerror (errno))
                                      << endmsg;
                                /* try to back out */
                                rename (newpath.c_str(), _path.c_str());
                                goto out;
                        }
                }
-       }
 
-       ret = 0;
+               rep.paths.push_back (*x);
+                rep.space += statbuf.st_size;
+        }
 
        /* dump the history list */
 
@@ -2794,6 +2864,7 @@ Session::cleanup_sources (CleanupReport& rep)
        */
 
        save_state ("");
+       ret = 0;
 
   out:
        _state_of_the_state = (StateOfTheState) (_state_of_the_state & ~InCleanup);
@@ -2807,61 +2878,21 @@ Session::cleanup_trash_sources (CleanupReport& rep)
        // FIXME: needs adaptation for MIDI
 
        vector<space_and_path>::iterator i;
-       string dead_sound_dir;
+       string dead_dir;
 
        rep.paths.clear ();
        rep.space = 0;
 
        for (i = session_dirs.begin(); i != session_dirs.end(); ++i) {
 
-               dead_sound_dir = (*i).path;
-               dead_sound_dir += dead_sound_dir_name;
+               dead_dir = Glib::build_filename ((*i).path, dead_dir_name);
 
-                clear_directory (dead_sound_dir, &rep.space, &rep.paths);
+                clear_directory (dead_dir, &rep.space, &rep.paths);
        }
 
        return 0;
 }
 
-void
-Session::cleanup_stubfiles ()
-{
-       vector<space_and_path>::iterator i;
-
-       for (i = session_dirs.begin(); i != session_dirs.end(); ++i) {
-
-                string dir;
-                string lname = legalize_for_path (_name);
-
-                vector<string> v;
-
-                /* XXX this is a hack caused by semantic conflicts
-                   between space_and_path and the SessionDirectory concept.
-                */
-
-                v.push_back ((*i).path);
-                v.push_back ("interchange");
-                v.push_back (lname);
-                v.push_back ("audiofiles");
-                v.push_back (stub_dir_name);
-
-                dir = Glib::build_filename (v);
-                
-                clear_directory (dir);
-
-                v.clear ();
-                v.push_back ((*i).path);
-                v.push_back ("interchange");
-                v.push_back (lname);
-                v.push_back ("midifiles");
-                v.push_back (stub_dir_name);
-
-                dir = Glib::build_filename (v);
-
-                clear_directory (dir);
-       }
-}
-
 void
 Session::set_dirty ()
 {
@@ -2981,7 +3012,7 @@ Session::controllable_by_descriptor (const ControllableDescriptor& desc)
                break;
 
        case ControllableDescriptor::Solo:
-               c = r->solo_control();
+                c = r->solo_control();
                break;
 
        case ControllableDescriptor::Mute:
@@ -3270,14 +3301,7 @@ Session::config_changed (std::string p, bool ours)
 
                if (Config->get_monitoring_model() == HardwareMonitoring && transport_rolling()) {
                        /* auto-input only makes a difference if we're rolling */
-
-                       boost::shared_ptr<RouteList> rl = routes.reader ();
-                       for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
-                               boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
-                               if (tr && tr->record_enabled ()) {
-                                       tr->monitor_input (!config.get_auto_input());
-                               }
-                       }
+                        set_track_monitor_input_status (!config.get_auto_input());
                }
 
        } else if (p == "punch-in") {
@@ -3437,7 +3461,7 @@ Session::config_changed (std::string p, bool ours)
                }
        } else if (p == "solo-mute-override") {
                // catch_up_on_solo_mute_override ();
-       } else if (p == "listen-position") {
+       } else if (p == "listen-position" || p == "pfl-position") {
                listen_position_changed ();
        } else if (p == "solo-control-is-listen-control") {
                solo_control_mode_changed ();
@@ -3509,3 +3533,18 @@ Session::setup_midi_machine_control ()
        mmc->SPPContinue.connect_same_thread (*this, boost::bind (&Session::spp_continue, this, _1, _2));
        mmc->SPPStop.connect_same_thread (*this, boost::bind (&Session::spp_stop, this, _1, _2));
 }
+
+boost::shared_ptr<Controllable>
+Session::solo_cut_control() const
+{
+        /* the solo cut control is a bit of an anomaly, at least as of Febrary 2011. There are no other
+           controls in Ardour that currently get presented to the user in the GUI that require
+           access as a Controllable and are also NOT owned by some SessionObject (e.g. Route, or MonitorProcessor).
+
+           its actually an RCConfiguration parameter, so we use a ProxyControllable to wrap
+           it up as a Controllable. Changes to the Controllable will just map back to the RCConfiguration
+           parameter.
+        */
+        
+        return _solo_cut_control;
+}