Mixbus specific Pin Mapping tweaks

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

diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 346fa0831de474080dd4f3f0d10762135e825dd4..95eb36c07f4ec6fb617d12f20b214a8fac01f438 100644 (file)
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -25,13 +25,11 @@
 #include <stdint.h>
 
 #include <algorithm>
 #include <stdint.h>
 
 #include <algorithm>

-#include <fstream>

 #include <string>
 #include <cerrno>
 #include <cstdio> /* snprintf(3) ... grrr */
 #include <cmath>
 #include <unistd.h>
 #include <string>
 #include <cerrno>
 #include <cstdio> /* snprintf(3) ... grrr */
 #include <cmath>
 #include <unistd.h>

-#include <sys/stat.h>

 #include <climits>
 #include <signal.h>
 #include <sys/time.h>
 #include <climits>
 #include <signal.h>
 #include <sys/time.h>


@@ -50,7 +48,7 @@
 #endif
 
 #include <glib.h>
 #endif
 
 #include <glib.h>

-#include <pbd/gstdio_compat.h>
+#include "pbd/gstdio_compat.h"

 
 #include <glibmm.h>
 #include <glibmm/threads.h>
 
 #include <glibmm.h>
 #include <glibmm/threads.h>


@@ -75,6 +73,7 @@
 #include "pbd/stacktrace.h"
 #include "pbd/convert.h"
 #include "pbd/localtime_r.h"
 #include "pbd/stacktrace.h"
 #include "pbd/convert.h"
 #include "pbd/localtime_r.h"

+#include "pbd/unwind.h"

 
 #include "ardour/amp.h"
 #include "ardour/async_midi_port.h"
 
 #include "ardour/amp.h"
 #include "ardour/async_midi_port.h"


@@ -123,6 +122,8 @@
 
 #include "control_protocol/control_protocol.h"
 
 
 #include "control_protocol/control_protocol.h"
 

+#include "LuaBridge/LuaBridge.h"
+

 #include "i18n.h"
 #include <locale.h>
 
 #include "i18n.h"
 #include <locale.h>
 


@@ -152,7 +153,7 @@ Session::pre_engine_init (string fullpath)
 
                string full_session_name = Glib::build_filename( fullpath, _name );
                full_session_name += statefile_suffix;
 
                string full_session_name = Glib::build_filename( fullpath, _name );
                full_session_name += statefile_suffix;

-               
+

                _is_new = !Glib::file_test (full_session_name, Glib::FileTest (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR));
        } else {
                _is_new = !Glib::file_test (_path, Glib::FileTest (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR));
                _is_new = !Glib::file_test (full_session_name, Glib::FileTest (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR));
        } else {
                _is_new = !Glib::file_test (_path, Glib::FileTest (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR));


@@ -180,7 +181,7 @@ Session::pre_engine_init (string fullpath)
        last_rr_session_dir = session_dirs.begin();
 
        set_history_depth (Config->get_history_depth());
        last_rr_session_dir = session_dirs.begin();
 
        set_history_depth (Config->get_history_depth());

-       
+

         /* default: assume simple stereo speaker configuration */
 
         _speakers->setup_default_speakers (2);
         /* default: assume simple stereo speaker configuration */
 
         _speakers->setup_default_speakers (2);


@@ -215,26 +216,26 @@ Session::post_engine_init ()
        BootMessage (_("Using configuration"));
 
        _midi_ports = new MidiPortManager;
        BootMessage (_("Using configuration"));
 
        _midi_ports = new MidiPortManager;

-       
+

        MIDISceneChanger* msc;
 
        _scene_changer = msc = new MIDISceneChanger (*this);
        MIDISceneChanger* msc;
 
        _scene_changer = msc = new MIDISceneChanger (*this);

-       msc->set_input_port (scene_input_port());
-       msc->set_output_port (scene_out());
+       msc->set_input_port (boost::dynamic_pointer_cast<MidiPort>(scene_input_port()));
+       msc->set_output_port (boost::dynamic_pointer_cast<MidiPort>(scene_output_port()));

 
        boost::function<framecnt_t(void)> timer_func (boost::bind (&Session::audible_frame, this));
 
        boost::function<framecnt_t(void)> timer_func (boost::bind (&Session::audible_frame, this));

-       boost::dynamic_pointer_cast<AsyncMIDIPort>(scene_in())->set_timer (timer_func);
+       boost::dynamic_pointer_cast<AsyncMIDIPort>(scene_input_port())->set_timer (timer_func);

 
        setup_midi_machine_control ();
 
        setup_midi_machine_control ();

-       
+

        if (_butler->start_thread()) {
                return -1;
        }
        if (_butler->start_thread()) {
                return -1;
        }

-       
+

        if (start_midi_thread ()) {
                return -1;
        }
        if (start_midi_thread ()) {
                return -1;
        }

-       
+

        setup_click_sounds (0);
        setup_midi_control ();
 
        setup_click_sounds (0);
        setup_midi_control ();
 


@@ -247,7 +248,7 @@ Session::post_engine_init ()
                delete _tempo_map;
                _tempo_map = new TempoMap (_current_frame_rate);
                _tempo_map->PropertyChanged.connect_same_thread (*this, boost::bind (&Session::tempo_map_changed, this, _1));
                delete _tempo_map;
                _tempo_map = new TempoMap (_current_frame_rate);
                _tempo_map->PropertyChanged.connect_same_thread (*this, boost::bind (&Session::tempo_map_changed, this, _1));

-               
+

                /* MidiClock requires a tempo map */
 
                midi_clock = new MidiClockTicker ();
                /* MidiClock requires a tempo map */
 
                midi_clock = new MidiClockTicker ();


@@ -257,14 +258,14 @@ Session::post_engine_init ()
 
                SndFileSource::setup_standard_crossfades (*this, frame_rate());
                _engine.GraphReordered.connect_same_thread (*this, boost::bind (&Session::graph_reordered, this));
 
                SndFileSource::setup_standard_crossfades (*this, frame_rate());
                _engine.GraphReordered.connect_same_thread (*this, boost::bind (&Session::graph_reordered, this));

-               
+

                AudioDiskstream::allocate_working_buffers();
                refresh_disk_space ();
                AudioDiskstream::allocate_working_buffers();
                refresh_disk_space ();

-               
+

                /* we're finally ready to call set_state() ... all objects have
                 * been created, the engine is running.
                 */
                /* we're finally ready to call set_state() ... all objects have
                 * been created, the engine is running.
                 */

-               
+

                if (state_tree) {
                        if (set_state (*state_tree->root(), Stateful::loading_state_version)) {
                                return -1;
                if (state_tree) {
                        if (set_state (*state_tree->root(), Stateful::loading_state_version)) {
                                return -1;


@@ -279,56 +280,56 @@ Session::post_engine_init ()
 
                boost::function<void (std::string)> ff (boost::bind (&Session::config_changed, this, _1, false));
                boost::function<void (std::string)> ft (boost::bind (&Session::config_changed, this, _1, true));
 
                boost::function<void (std::string)> ff (boost::bind (&Session::config_changed, this, _1, false));
                boost::function<void (std::string)> ft (boost::bind (&Session::config_changed, this, _1, true));

-               
+

                Config->map_parameters (ff);
                config.map_parameters (ft);
                 _butler->map_parameters ();
 
                /* Reset all panners */
                Config->map_parameters (ff);
                config.map_parameters (ft);
                 _butler->map_parameters ();
 
                /* Reset all panners */

-               
+

                Delivery::reset_panners ();
                Delivery::reset_panners ();

-               
+

                /* this will cause the CPM to instantiate any protocols that are in use
                 * (or mandatory), which will pass it this Session, and then call
                 * set_state() on each instantiated protocol to match stored state.
                 */
                /* this will cause the CPM to instantiate any protocols that are in use
                 * (or mandatory), which will pass it this Session, and then call
                 * set_state() on each instantiated protocol to match stored state.
                 */

-               
+

                ControlProtocolManager::instance().set_session (this);
                ControlProtocolManager::instance().set_session (this);

-               
+

                /* This must be done after the ControlProtocolManager set_session above,
                   as it will set states for ports which the ControlProtocolManager creates.
                */
                /* This must be done after the ControlProtocolManager set_session above,
                   as it will set states for ports which the ControlProtocolManager creates.
                */

-               
+

                // XXX set state of MIDI::Port's
                // MidiPortManager::instance()->set_port_states (Config->midi_port_states ());
                // XXX set state of MIDI::Port's
                // MidiPortManager::instance()->set_port_states (Config->midi_port_states ());

-               
+

                /* And this must be done after the MIDI::Manager::set_port_states as
                 * it will try to make connections whose details are loaded by set_port_states.
                 */
                /* And this must be done after the MIDI::Manager::set_port_states as
                 * it will try to make connections whose details are loaded by set_port_states.
                 */

-               
+

                hookup_io ();
                hookup_io ();

-               
+

                /* Let control protocols know that we are now all connected, so they
                 * could start talking to surfaces if they want to.
                 */
                /* Let control protocols know that we are now all connected, so they
                 * could start talking to surfaces if they want to.
                 */

-               
+

                ControlProtocolManager::instance().midi_connectivity_established ();
                ControlProtocolManager::instance().midi_connectivity_established ();

-               
+

                if (_is_new && !no_auto_connect()) {
                        Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock());
                        auto_connect_master_bus ();
                }
                if (_is_new && !no_auto_connect()) {
                        Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock());
                        auto_connect_master_bus ();
                }

-               
+

                _state_of_the_state = StateOfTheState (_state_of_the_state & ~(CannotSave|Dirty));
                _state_of_the_state = StateOfTheState (_state_of_the_state & ~(CannotSave|Dirty));

-               
+

                /* update latencies */
                /* update latencies */

-               
+

                initialize_latencies ();
                initialize_latencies ();

-               
+

                _locations->added.connect_same_thread (*this, boost::bind (&Session::location_added, this, _1));
                _locations->removed.connect_same_thread (*this, boost::bind (&Session::location_removed, this, _1));
                _locations->changed.connect_same_thread (*this, boost::bind (&Session::locations_changed, this));
                _locations->added.connect_same_thread (*this, boost::bind (&Session::location_added, this, _1));
                _locations->removed.connect_same_thread (*this, boost::bind (&Session::location_removed, this, _1));
                _locations->changed.connect_same_thread (*this, boost::bind (&Session::locations_changed, this));

-               
+

        } catch (AudioEngine::PortRegistrationFailure& err) {
                /* handle this one in a different way than all others, so that its clear what happened */
                error << err.what() << endmsg;
        } catch (AudioEngine::PortRegistrationFailure& err) {
                /* handle this one in a different way than all others, so that its clear what happened */
                error << err.what() << endmsg;


@@ -345,7 +346,7 @@ Session::post_engine_init ()
        send_immediate_mmc (MIDI::MachineControlCommand (MIDI::MachineControl::cmdMmcReset));
        send_immediate_mmc (MIDI::MachineControlCommand (Timecode::Time ()));
 
        send_immediate_mmc (MIDI::MachineControlCommand (MIDI::MachineControl::cmdMmcReset));
        send_immediate_mmc (MIDI::MachineControlCommand (Timecode::Time ()));
 

-       MIDI::Name::MidiPatchManager::instance().set_session (this);
+       MIDI::Name::MidiPatchManager::instance().add_search_path (session_directory().midi_patch_path() );

 
        ltc_tx_initialize();
        /* initial program change will be delivered later; see ::config_changed() */
 
        ltc_tx_initialize();
        /* initial program change will be delivered later; see ::config_changed() */


@@ -365,9 +366,9 @@ Session::post_engine_init ()
        }
 
        /* Now, finally, we can fill the playback buffers */
        }
 
        /* Now, finally, we can fill the playback buffers */

-    
+

        BootMessage (_("Filling playback buffers"));
        BootMessage (_("Filling playback buffers"));

-    
+

        boost::shared_ptr<RouteList> rl = routes.reader();
        for (RouteList::iterator r = rl->begin(); r != rl->end(); ++r) {
                boost::shared_ptr<Track> trk = boost::dynamic_pointer_cast<Track> (*r);
        boost::shared_ptr<RouteList> rl = routes.reader();
        for (RouteList::iterator r = rl->begin(); r != rl->end(); ++r) {
                boost::shared_ptr<Track> trk = boost::dynamic_pointer_cast<Track> (*r);


@@ -383,11 +384,11 @@ void
 Session::session_loaded ()
 {
        SessionLoaded();
 Session::session_loaded ()
 {
        SessionLoaded();

-       
+

        _state_of_the_state = Clean;
        _state_of_the_state = Clean;

-       
+

        DirtyChanged (); /* EMIT SIGNAL */
        DirtyChanged (); /* EMIT SIGNAL */

-       
+

        if (_is_new) {
                save_state ("");
        } else if (state_was_pending) {
        if (_is_new) {
                save_state ("");
        } else if (state_was_pending) {


@@ -395,9 +396,9 @@ Session::session_loaded ()
                remove_pending_capture_state ();
                state_was_pending = false;
        }
                remove_pending_capture_state ();
                state_was_pending = false;
        }

-       
+

        /* Now, finally, we can fill the playback buffers */
        /* Now, finally, we can fill the playback buffers */

-       
+

        BootMessage (_("Filling playback buffers"));
        force_locate (_transport_frame, false);
 }
        BootMessage (_("Filling playback buffers"));
        force_locate (_transport_frame, false);
 }


@@ -556,7 +557,7 @@ Session::create (const string& session_template, BusProfile* bus_profile)
 
                                while (!feof (in)) {
                                        size_t charsRead = fread (buf, sizeof(char), 1024, in);
 
                                while (!feof (in)) {
                                        size_t charsRead = fread (buf, sizeof(char), 1024, in);

-       
+

                                        if (ferror (in)) {
                                                error << string_compose (_("Error reading session template file %1 (%2)"), in_path, strerror (errno)) << endmsg;
                                                fclose (in);
                                        if (ferror (in)) {
                                                error << string_compose (_("Error reading session template file %1 (%2)"), in_path, strerror (errno)) << endmsg;
                                                fclose (in);


@@ -586,7 +587,7 @@ Session::create (const string& session_template, BusProfile* bus_profile)
                                        std::string template_plugins = Glib::build_filename (session_template, X_("plugins"));
                                        copy_recurse (template_plugins, plugins_dir ());
                                }
                                        std::string template_plugins = Glib::build_filename (session_template, X_("plugins"));
                                        copy_recurse (template_plugins, plugins_dir ());
                                }

-                                
+

                                return 0;
 
                        } else {
                                return 0;
 
                        } else {


@@ -605,16 +606,16 @@ Session::create (const string& session_template, BusProfile* bus_profile)
        }
 
        if (Profile->get_trx()) {
        }
 
        if (Profile->get_trx()) {

-       
+

                /* set initial start + end point : ARDOUR::Session::session_end_shift long.
                   Remember that this is a brand new session. Sessions
                   loaded from saved state will get this range from the saved state.
                */
                /* set initial start + end point : ARDOUR::Session::session_end_shift long.
                   Remember that this is a brand new session. Sessions
                   loaded from saved state will get this range from the saved state.
                */

-               
+

                set_session_range_location (0, 0);
                set_session_range_location (0, 0);

-               
+

                /* Initial loop location, from absolute zero, length 10 seconds  */
                /* Initial loop location, from absolute zero, length 10 seconds  */

-               
+

                Location* loc = new Location (*this, 0, 10.0 * _engine.sample_rate(), _("Loop"),  Location::IsAutoLoop);
                _locations->add (loc, true);
                set_auto_loop_location (loc);
                Location* loc = new Location (*this, 0, 10.0 * _engine.sample_rate(), _("Loop"),  Location::IsAutoLoop);
                _locations->add (loc, true);
                set_auto_loop_location (loc);


@@ -657,15 +658,15 @@ Session::create (const string& session_template, BusProfile* bus_profile)
 
                // Waves Tracks: Skip this. Always use autoconnection for Tracks
                if (!ARDOUR::Profile->get_trx()) {
 
                // Waves Tracks: Skip this. Always use autoconnection for Tracks
                if (!ARDOUR::Profile->get_trx()) {

-                       
+

                        /* this allows the user to override settings with an environment variable.
                         */
                        /* this allows the user to override settings with an environment variable.
                         */

-                       
+

                        if (no_auto_connect()) {
                                bus_profile->input_ac = AutoConnectOption (0);
                                bus_profile->output_ac = AutoConnectOption (0);
                        }
                        if (no_auto_connect()) {
                                bus_profile->input_ac = AutoConnectOption (0);
                                bus_profile->output_ac = AutoConnectOption (0);
                        }

-                       
+

                        Config->set_input_auto_connect (bus_profile->input_ac);
                        Config->set_output_auto_connect (bus_profile->output_ac);
                }
                        Config->set_input_auto_connect (bus_profile->input_ac);
                        Config->set_output_auto_connect (bus_profile->output_ac);
                }


@@ -781,6 +782,10 @@ Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot
                return 1;
        }
 
                return 1;
        }
 

+#ifndef NDEBUG
+       const int64_t save_start_time = g_get_monotonic_time();
+#endif
+

        /* tell sources we're saving first, in case they write out to a new file
         * which should be saved with the state rather than the old one */
        for (SourceMap::const_iterator i = sources.begin(); i != sources.end(); ++i) {
        /* tell sources we're saving first, in case they write out to a new file
         * which should be saved with the state rather than the old one */
        for (SourceMap::const_iterator i = sources.begin(); i != sources.end(); ++i) {


@@ -793,7 +798,14 @@ Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot
 
        SessionSaveUnderway (); /* EMIT SIGNAL */
 
 
        SessionSaveUnderway (); /* EMIT SIGNAL */
 

+       bool mark_as_clean = true;
+
+       if (!snapshot_name.empty() && !switch_to_snapshot) {
+               mark_as_clean = false;
+       }
+

        if (template_only) {
        if (template_only) {

+               mark_as_clean = false;

                tree.set_root (&get_template());
        } else {
                tree.set_root (&get_state());
                tree.set_root (&get_template());
        } else {
                tree.set_root (&get_state());


@@ -802,8 +814,10 @@ Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot
        if (snapshot_name.empty()) {
                snapshot_name = _current_snapshot_name;
        } else if (switch_to_snapshot) {
        if (snapshot_name.empty()) {
                snapshot_name = _current_snapshot_name;
        } else if (switch_to_snapshot) {

-                _current_snapshot_name = snapshot_name;
-        }
+               set_snapshot_name (snapshot_name);
+       }
+
+       assert (!snapshot_name.empty());

 
        if (!pending) {
 
 
        if (!pending) {
 


@@ -828,7 +842,7 @@ Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot
        tmp_path = Glib::build_filename (tmp_path, legalize_for_path (snapshot_name) + temp_suffix);
 
        cerr << "actually writing state to " << tmp_path << endl;
        tmp_path = Glib::build_filename (tmp_path, legalize_for_path (snapshot_name) + temp_suffix);
 
        cerr << "actually writing state to " << tmp_path << endl;

-       
+

        if (!tree.write (tmp_path)) {
                error << string_compose (_("state could not be saved to %1"), tmp_path) << endmsg;
                if (g_remove (tmp_path.c_str()) != 0) {
        if (!tree.write (tmp_path)) {
                error << string_compose (_("state could not be saved to %1"), tmp_path) << endmsg;
                if (g_remove (tmp_path.c_str()) != 0) {


@@ -840,7 +854,7 @@ Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot
        } else {
 
                cerr << "renaming state to " << xml_path << endl;
        } else {
 
                cerr << "renaming state to " << xml_path << endl;

-               
+

                if (::g_rename (tmp_path.c_str(), xml_path.c_str()) != 0) {
                        error << string_compose (_("could not rename temporary session file %1 to %2 (%3)"),
                                        tmp_path, xml_path, g_strerror(errno)) << endmsg;
                if (::g_rename (tmp_path.c_str(), xml_path.c_str()) != 0) {
                        error << string_compose (_("could not rename temporary session file %1 to %2 (%3)"),
                                        tmp_path, xml_path, g_strerror(errno)) << endmsg;


@@ -856,17 +870,23 @@ Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot
 
                save_history (snapshot_name);
 
 
                save_history (snapshot_name);
 

-               bool was_dirty = dirty();
+               if (mark_as_clean) {
+                       bool was_dirty = dirty();

 
 

-               _state_of_the_state = StateOfTheState (_state_of_the_state & ~Dirty);
+                       _state_of_the_state = StateOfTheState (_state_of_the_state & ~Dirty);

 
 

-               if (was_dirty) {
-                       DirtyChanged (); /* EMIT SIGNAL */
+                       if (was_dirty) {
+                               DirtyChanged (); /* EMIT SIGNAL */
+                       }

                }
 
                StateSaved (snapshot_name); /* EMIT SIGNAL */
        }
 
                }
 
                StateSaved (snapshot_name); /* EMIT SIGNAL */
        }
 

+#ifndef NDEBUG
+       const int64_t elapsed_time_us = g_get_monotonic_time() - save_start_time;
+       cerr << "saved state in " << fixed << setprecision (1) << elapsed_time_us / 1000. << " ms\n";
+#endif

        return 0;
 }
 
        return 0;
 }
 


@@ -964,15 +984,17 @@ Session::load_state (string snapshot_name)
                // only create a backup for a given statefile version once
 
                if (!Glib::file_test (backup_path, Glib::FILE_TEST_EXISTS)) {
                // only create a backup for a given statefile version once
 
                if (!Glib::file_test (backup_path, Glib::FILE_TEST_EXISTS)) {

-                       
+

                        VersionMismatch (xmlpath, backup_path);
                        VersionMismatch (xmlpath, backup_path);

-                       
+

                        if (!copy_file (xmlpath, backup_path)) {;
                                return -1;
                        }
                }
        }
 
                        if (!copy_file (xmlpath, backup_path)) {;
                                return -1;
                        }
                }
        }
 

+       save_snapshot_name (snapshot_name);
+

        return 0;
 }
 
        return 0;
 }
 


@@ -1024,7 +1046,7 @@ Session::state (bool full_state)
        if (full_state) {
 
                node->add_property ("name", _name);
        if (full_state) {
 
                node->add_property ("name", _name);

-               snprintf (buf, sizeof (buf), "%" PRId64, _nominal_frame_rate);
+               snprintf (buf, sizeof (buf), "%" PRId64, _base_frame_rate);

                node->add_property ("sample-rate", buf);
 
                if (session_dirs.size() > 1) {
                node->add_property ("sample-rate", buf);
 
                if (session_dirs.size() > 1) {


@@ -1062,6 +1084,9 @@ Session::state (bool full_state)
        snprintf (buf, sizeof (buf), "%" PRIu64, ID::counter());
        node->add_property ("id-counter", buf);
 
        snprintf (buf, sizeof (buf), "%" PRIu64, ID::counter());
        node->add_property ("id-counter", buf);
 

+       snprintf (buf, sizeof (buf), "%u", name_id_counter ());
+       node->add_property ("name-counter", buf);
+

        /* save the event ID counter */
 
        snprintf (buf, sizeof (buf), "%d", Evoral::event_id_counter());
        /* save the event ID counter */
 
        snprintf (buf, sizeof (buf), "%d", Evoral::event_id_counter());


@@ -1142,13 +1167,13 @@ Session::state (bool full_state)
                        }
                }
        }
                        }
                }
        }

-       
-       
+
+

 
        if (full_state) {
 
        if (full_state) {

-               
+

                if (_locations) {
                if (_locations) {

-                       node->add_child_nocopy (_locations->get_state());       
+                       node->add_child_nocopy (_locations->get_state());

                }
        } else {
                Locations loc (*this);
                }
        } else {
                Locations loc (*this);


@@ -1158,7 +1183,7 @@ Session::state (bool full_state)
                range->set (max_framepos, 0);
                loc.add (range);
                XMLNode& locations_state = loc.get_state();
                range->set (max_framepos, 0);
                loc.add (range);
                XMLNode& locations_state = loc.get_state();

-               
+

                if (ARDOUR::Profile->get_trx() && _locations) {
                        // For tracks we need stored the Auto Loop Range and all MIDI markers.
                        for (Locations::LocationList::const_iterator i = _locations->list ().begin (); i != _locations->list ().end (); ++i) {
                if (ARDOUR::Profile->get_trx() && _locations) {
                        // For tracks we need stored the Auto Loop Range and all MIDI markers.
                        for (Locations::LocationList::const_iterator i = _locations->list ().begin (); i != _locations->list ().end (); ++i) {


@@ -1188,9 +1213,9 @@ Session::state (bool full_state)
                RoutePublicOrderSorter cmp;
                RouteList public_order (*r);
                public_order.sort (cmp);
                RoutePublicOrderSorter cmp;
                RouteList public_order (*r);
                public_order.sort (cmp);

-               
+

                /* the sort should have put control outs first */
                /* the sort should have put control outs first */

-               
+

                if (_monitor_out) {
                        assert (_monitor_out == public_order.front());
                }
                if (_monitor_out) {
                        assert (_monitor_out == public_order.front());
                }


@@ -1237,6 +1262,26 @@ Session::state (bool full_state)
                node->add_child_copy (*_extra_xml);
        }
 
                node->add_child_copy (*_extra_xml);
        }
 

+       {
+               Glib::Threads::Mutex::Lock lm (lua_lock);
+               std::string saved;
+               {
+                       luabridge::LuaRef savedstate ((*_lua_save)());
+                       saved = savedstate.cast<std::string>();
+               }
+               lua.collect_garbage ();
+               lm.release ();
+
+               gchar* b64 = g_base64_encode ((const guchar*)saved.c_str (), saved.size ());
+               std::string b64s (b64);
+               g_free (b64);
+
+               XMLNode* script_node = new XMLNode (X_("Script"));
+               script_node->add_property (X_("lua"), LUA_VERSION);
+               script_node->add_content (b64s);
+               node->add_child_nocopy (*script_node);
+       }
+

        return *node;
 }
 
        return *node;
 }
 


@@ -1268,10 +1313,12 @@ Session::set_state (const XMLNode& node, int version)
 
        if ((prop = node.property (X_("sample-rate"))) != 0) {
 
 
        if ((prop = node.property (X_("sample-rate"))) != 0) {
 

-               _nominal_frame_rate = atoi (prop->value());
+               _base_frame_rate = atoi (prop->value());
+               _nominal_frame_rate = _base_frame_rate;

 
 

-               if (_nominal_frame_rate != _current_frame_rate) {
-                        boost::optional<int> r = AskAboutSampleRateMismatch (_nominal_frame_rate, _current_frame_rate);
+               assert (AudioEngine::instance()->running ());
+               if (_base_frame_rate != AudioEngine::instance()->sample_rate ()) {
+                       boost::optional<int> r = AskAboutSampleRateMismatch (_base_frame_rate, _current_frame_rate);

                        if (r.get_value_or (0)) {
                                goto out;
                        }
                        if (r.get_value_or (0)) {
                                goto out;
                        }


@@ -1294,10 +1341,13 @@ Session::set_state (const XMLNode& node, int version)
                ID::init_counter (now);
        }
 
                ID::init_counter (now);
        }
 

-        if ((prop = node.property (X_("event-counter"))) != 0) {
-                Evoral::init_event_id_counter (atoi (prop->value()));
-        }
+       if ((prop = node.property (X_("name-counter"))) != 0) {
+               init_name_id_counter (atoi (prop->value()));
+       }

 
 

+       if ((prop = node.property (X_("event-counter"))) != 0) {
+               Evoral::init_event_id_counter (atoi (prop->value()));
+       }

 
        if ((child = find_named_node (node, "MIDIPorts")) != 0) {
                _midi_ports->set_midi_port_states (child->children());
 
        if ((child = find_named_node (node, "MIDIPorts")) != 0) {
                _midi_ports->set_midi_port_states (child->children());


@@ -1447,9 +1497,25 @@ Session::set_state (const XMLNode& node, int version)
                ControlProtocolManager::instance().set_state (*child, version);
        }
 
                ControlProtocolManager::instance().set_state (*child, version);
        }
 

+       if ((child = find_named_node (node, "Script"))) {
+               for (XMLNodeList::const_iterator n = child->children ().begin (); n != child->children ().end (); ++n) {
+                       if (!(*n)->is_content ()) { continue; }
+                       gsize size;
+                       guchar* buf = g_base64_decode ((*n)->content ().c_str (), &size);
+                       try {
+                               Glib::Threads::Mutex::Lock lm (lua_lock);
+                               (*_lua_load)(std::string ((const char*)buf, size));
+                       } catch (luabridge::LuaException const& e) {
+                               cerr << "LuaException:" << e.what () << endl;
+                       }
+                       g_free (buf);
+               }
+       }
+

        update_route_record_state ();
 
        /* here beginneth the second phase ... */
        update_route_record_state ();
 
        /* here beginneth the second phase ... */

+       set_snapshot_name (_current_snapshot_name);

 
        StateReady (); /* EMIT SIGNAL */
 
 
        StateReady (); /* EMIT SIGNAL */
 


@@ -1719,7 +1785,7 @@ Session::load_nested_sources (const XMLNode& node)
        for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
                if ((*niter)->name() == "Source") {
 
        for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
                if ((*niter)->name() == "Source") {
 

-                       /* it may already exist, so don't recreate it unnecessarily 
+                       /* it may already exist, so don't recreate it unnecessarily

                         */
 
                        XMLProperty* prop = (*niter)->property (X_("id"));
                         */
 
                        XMLProperty* prop = (*niter)->property (X_("id"));


@@ -2093,7 +2159,7 @@ Session::XMLSourceFactory (const XMLNode& node)
 }
 
 int
 }
 
 int

-Session::save_template (string template_name)
+Session::save_template (string template_name, bool replace_existing)

 {
        if ((_state_of_the_state & CannotSave) || template_name.empty ()) {
                return -1;
 {
        if ((_state_of_the_state & CannotSave) || template_name.empty ()) {
                return -1;


@@ -2119,12 +2185,12 @@ Session::save_template (string template_name)
        }
 
        if (!ARDOUR::Profile->get_trx()) {
        }
 
        if (!ARDOUR::Profile->get_trx()) {

-               if (Glib::file_test (template_dir_path, Glib::FILE_TEST_EXISTS)) {
+               if (!replace_existing && Glib::file_test (template_dir_path, Glib::FILE_TEST_EXISTS)) {

                        warning << string_compose(_("Template \"%1\" already exists - new version not created"),
                                                                          template_dir_path) << endmsg;
                        warning << string_compose(_("Template \"%1\" already exists - new version not created"),
                                                                          template_dir_path) << endmsg;

-                       return -1;
+                       return -2;

                }
                }

-               
+

                if (g_mkdir_with_parents (template_dir_path.c_str(), 0755) != 0) {
                        error << string_compose(_("Could not create directory for Session template\"%1\" (%2)"),
                                                                        template_dir_path, g_strerror (errno)) << endmsg;
                if (g_mkdir_with_parents (template_dir_path.c_str(), 0755) != 0) {
                        error << string_compose(_("Could not create directory for Session template\"%1\" (%2)"),
                                                                        template_dir_path, g_strerror (errno)) << endmsg;


@@ -2134,7 +2200,7 @@ Session::save_template (string template_name)
 
        /* file to write */
        std::string template_file_path;
 
        /* file to write */
        std::string template_file_path;

-       
+

        if (ARDOUR::Profile->get_trx()) {
                template_file_path = template_name;
        } else {
        if (ARDOUR::Profile->get_trx()) {
                template_file_path = template_name;
        } else {


@@ -2146,28 +2212,19 @@ Session::save_template (string template_name)
        }
 
        SessionSaveUnderway (); /* EMIT SIGNAL */
        }
 
        SessionSaveUnderway (); /* EMIT SIGNAL */

-       
+

        XMLTree tree;
 
        XMLTree tree;
 

-       tree.set_root (&get_template());
+       {
+               PBD::Unwinder<std::string> uw (_template_state_dir, template_dir_path);
+               tree.set_root (&get_template());
+       }
+

        if (!tree.write (template_file_path)) {
                error << _("template not saved") << endmsg;
                return -1;
        }
 
        if (!tree.write (template_file_path)) {
                error << _("template not saved") << endmsg;
                return -1;
        }
 

-       if (!ARDOUR::Profile->get_trx()) {
-               /* copy plugin state directory */
-
-               std::string template_plugin_state_path (Glib::build_filename (template_dir_path, X_("plugins")));
-
-               if (g_mkdir_with_parents (template_plugin_state_path.c_str(), 0755) != 0) {
-                       error << string_compose(_("Could not create directory for Session template plugin state\"%1\" (%2)"),
-                                                                       template_plugin_state_path, g_strerror (errno)) << endmsg;
-                       return -1;
-               }
-               copy_files (plugins_dir(), template_plugin_state_path);
-       }
-

        store_recent_templates (template_file_path);
 
        return 0;
        store_recent_templates (template_file_path);
 
        return 0;


@@ -2177,7 +2234,7 @@ void
 Session::refresh_disk_space ()
 {
 #if __APPLE__ || (HAVE_SYS_VFS_H && HAVE_SYS_STATVFS_H)
 Session::refresh_disk_space ()
 {
 #if __APPLE__ || (HAVE_SYS_VFS_H && HAVE_SYS_STATVFS_H)

-       
+

        Glib::Threads::Mutex::Lock lm (space_lock);
 
        /* get freespace on every FS that is part of the session path */
        Glib::Threads::Mutex::Lock lm (space_lock);
 
        /* get freespace on every FS that is part of the session path */


@@ -2565,6 +2622,15 @@ Session::add_command (Command* const cmd)
                            cmd->name ()));
        _current_trans->add_command (cmd);
 }
                            cmd->name ()));
        _current_trans->add_command (cmd);
 }

+
+PBD::StatefulDiffCommand*
+Session::add_stateful_diff_command (boost::shared_ptr<PBD::StatefulDestructible> sfd)
+{
+       PBD::StatefulDiffCommand* cmd = new PBD::StatefulDiffCommand (sfd);
+       add_command (cmd);
+       return cmd;
+}
+

 void
 Session::begin_reversible_command (const string& name)
 {
 void
 Session::begin_reversible_command (const string& name)
 {


@@ -2817,25 +2883,34 @@ Session::cleanup_regions ()
        bool removed = false;
        const RegionFactory::RegionMap& regions (RegionFactory::regions());
 
        bool removed = false;
        const RegionFactory::RegionMap& regions (RegionFactory::regions());
 

-       for (RegionFactory::RegionMap::const_iterator i = regions.begin(); i != regions.end(); ++i) {
+       for (RegionFactory::RegionMap::const_iterator i = regions.begin(); i != regions.end();) {

 
                uint32_t used = playlists->region_use_count (i->second);
 
                if (used == 0 && !i->second->automatic ()) {
 
                uint32_t used = playlists->region_use_count (i->second);
 
                if (used == 0 && !i->second->automatic ()) {

+                       boost::weak_ptr<Region> w = i->second;
+                       ++i;

                        removed = true;
                        removed = true;

-                       RegionFactory::map_remove (i->second);
+                       RegionFactory::map_remove (w);
+               } else {
+                       ++i;

                }
        }
 
        if (removed) {
                // re-check to remove parent references of compound regions
                }
        }
 
        if (removed) {
                // re-check to remove parent references of compound regions

-               for (RegionFactory::RegionMap::const_iterator i = regions.begin(); i != regions.end(); ++i) {
+               for (RegionFactory::RegionMap::const_iterator i = regions.begin(); i != regions.end();) {

                        if (!(i->second->whole_file() && i->second->max_source_level() > 0)) {
                        if (!(i->second->whole_file() && i->second->max_source_level() > 0)) {

+                               ++i;

                                continue;
                        }
                        assert(boost::dynamic_pointer_cast<PlaylistSource>(i->second->source (0)) != 0);
                        if (0 == playlists->region_use_count (i->second)) {
                                continue;
                        }
                        assert(boost::dynamic_pointer_cast<PlaylistSource>(i->second->source (0)) != 0);
                        if (0 == playlists->region_use_count (i->second)) {

-                               RegionFactory::map_remove (i->second);
+                               boost::weak_ptr<Region> w = i->second;
+                               ++i;
+                               RegionFactory::map_remove (w);
+                       } else {
+                               ++i;

                        }
                }
        }
                        }
                }
        }


@@ -2927,6 +3002,17 @@ Session::cleanup_sources (CleanupReport& rep)
 
        _state_of_the_state = (StateOfTheState) (_state_of_the_state | InCleanup);
 
 
        _state_of_the_state = (StateOfTheState) (_state_of_the_state | InCleanup);
 

+       /* this is mostly for windows which doesn't allow file
+        * renaming if the file is in use. But we don't special
+        * case it because we need to know if this causes
+        * problems, and the easiest way to notice that is to
+        * keep it in place for all platforms.
+        */
+
+       request_stop (false);
+       _butler->summon ();
+       _butler->wait_until_finished ();
+

        /* consider deleting all unused playlists */
 
        if (playlists->maybe_delete_unused (boost::bind (Session::ask_about_playlist_deletion, _1))) {
        /* consider deleting all unused playlists */
 
        if (playlists->maybe_delete_unused (boost::bind (Session::ask_about_playlist_deletion, _1))) {


@@ -3000,22 +3086,31 @@ Session::cleanup_sources (CleanupReport& rep)
 
                if ((fs = boost::dynamic_pointer_cast<FileSource> (i->second)) != 0) {
 
 
                if ((fs = boost::dynamic_pointer_cast<FileSource> (i->second)) != 0) {
 

+                       /* this is mostly for windows which doesn't allow file
+                        * renaming if the file is in use. But we don't special
+                        * case it because we need to know if this causes
+                        * problems, and the easiest way to notice that is to
+                        * keep it in place for all platforms.
+                        */
+
+                       fs->close ();
+

                        if (!fs->is_stub()) {
 
                                if (playlists->source_use_count (fs) != 0) {
                                        all_sources.insert (fs->path());
                                } else {
                        if (!fs->is_stub()) {
 
                                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.
                                        */
                                        /* 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);
                                        RegionFactory::remove_regions_using_source (i->second);

-                                       
+

                                        // also remove source from all_sources
                                        // also remove source from all_sources

-                                       
+

                                        for (set<string>::iterator j = all_sources.begin(); j != all_sources.end(); ++j) {
                                                spath = Glib::path_get_basename (*j);
                                                if (spath == i->second->name()) {
                                        for (set<string>::iterator j = all_sources.begin(); j != all_sources.end(); ++j) {
                                                spath = Glib::path_get_basename (*j);
                                                if (spath == i->second->name()) {


@@ -3056,7 +3151,7 @@ Session::cleanup_sources (CleanupReport& rep)
        /* now try to move all unused files into the "dead" directory(ies) */
 
        for (vector<string>::iterator x = unused.begin(); x != unused.end(); ++x) {
        /* 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;
+               GStatBuf statbuf;

 
                string newpath;
 
 
                string newpath;
 


@@ -3121,7 +3216,7 @@ Session::cleanup_sources (CleanupReport& rep)
 
                }
 
 
                }
 

-               stat ((*x).c_str(), &statbuf);
+               g_stat ((*x).c_str(), &statbuf);

 
                if (::rename ((*x).c_str(), newpath.c_str()) != 0) {
                        error << string_compose (_("cannot rename unused file source from %1 to %2 (%3)"),
 
                if (::rename ((*x).c_str(), newpath.c_str()) != 0) {
                        error << string_compose (_("cannot rename unused file source from %1 to %2 (%3)"),


@@ -3152,8 +3247,8 @@ Session::cleanup_sources (CleanupReport& rep)
                }
 
                rep.paths.push_back (*x);
                }
 
                rep.paths.push_back (*x);

-                rep.space += statbuf.st_size;
-        }
+               rep.space += statbuf.st_size;
+       }

 
        /* dump the history list */
 
 
        /* dump the history list */
 


@@ -3306,6 +3401,10 @@ Session::controllable_by_descriptor (const ControllableDescriptor& desc)
        case ControllableDescriptor::RemoteControlID:
                r = route_by_remote_id (desc.rid());
                break;
        case ControllableDescriptor::RemoteControlID:
                r = route_by_remote_id (desc.rid());
                break;

+
+       case ControllableDescriptor::SelectionCount:
+               r = route_by_selected_count (desc.selection_id());
+               break;

        }
 
        if (!r) {
        }
 
        if (!r) {


@@ -3340,22 +3439,16 @@ Session::controllable_by_descriptor (const ControllableDescriptor& desc)
        }
 
        case ControllableDescriptor::PanDirection:
        }
 
        case ControllableDescriptor::PanDirection:

-        {
-                c = r->pannable()->pan_azimuth_control;
+               c = r->pan_azimuth_control();

                break;
                break;

-        }

 
        case ControllableDescriptor::PanWidth:
 
        case ControllableDescriptor::PanWidth:

-        {
-                c = r->pannable()->pan_width_control;
+               c = r->pan_width_control();

                break;
                break;

-        }

 
        case ControllableDescriptor::PanElevation:
 
        case ControllableDescriptor::PanElevation:

-        {
-                c = r->pannable()->pan_elevation_control;
+               c = r->pan_elevation_control();

                break;
                break;

-        }

 
        case ControllableDescriptor::Balance:
                /* XXX simple pan control */
 
        case ControllableDescriptor::Balance:
                /* XXX simple pan control */


@@ -3385,26 +3478,12 @@ Session::controllable_by_descriptor (const ControllableDescriptor& desc)
                break;
        }
 
                break;
        }
 

-       case ControllableDescriptor::SendGain:
-       {
+       case ControllableDescriptor::SendGain: {

                uint32_t send = desc.target (0);
                uint32_t send = desc.target (0);

-
-               /* revert to zero-based counting */
-

                if (send > 0) {
                        --send;
                }
                if (send > 0) {
                        --send;
                }

-
-               boost::shared_ptr<Processor> p = r->nth_send (send);
-
-               if (p) {
-                       boost::shared_ptr<Send> s = boost::dynamic_pointer_cast<Send>(p);
-                       boost::shared_ptr<Amp> a = s->amp();
-                       
-                       if (a) {
-                               c = s->amp()->gain_control();
-                       }
-               }
+               c = r->send_level_controllable (send);

                break;
        }
 
                break;
        }
 


@@ -3443,7 +3522,7 @@ Session::save_history (string snapshot_name)
                return 0;
        }
 
                return 0;
        }
 

-       if (!Config->get_save_history() || Config->get_saved_history_depth() < 0 || 
+       if (!Config->get_save_history() || Config->get_saved_history_depth() < 0 ||

            (_history.undo_depth() == 0 && _history.redo_depth() == 0)) {
                return 0;
        }
            (_history.undo_depth() == 0 && _history.redo_depth() == 0)) {
                return 0;
        }


@@ -3705,9 +3784,9 @@ Session::config_changed (std::string p, bool ours)
                }
 
        } else if (p == "click-gain") {
                }
 
        } else if (p == "click-gain") {

-               
+

                if (_click_gain) {
                if (_click_gain) {

-                       _click_gain->set_gain (Config->get_click_gain(), this);
+                       _click_gain->gain_control()->set_value (Config->get_click_gain(), Controllable::NoGroup);

                }
 
        } else if (p == "send-mtc") {
                }
 
        } else if (p == "send-mtc") {


@@ -3834,7 +3913,20 @@ void
 Session::setup_midi_machine_control ()
 {
        _mmc = new MIDI::MachineControl;
 Session::setup_midi_machine_control ()
 {
        _mmc = new MIDI::MachineControl;

-       _mmc->set_ports (_midi_ports->mmc_input_port(), _midi_ports->mmc_output_port());
+
+       boost::shared_ptr<AsyncMIDIPort> async_in = boost::dynamic_pointer_cast<AsyncMIDIPort> (_midi_ports->mmc_input_port());
+       boost::shared_ptr<AsyncMIDIPort> async_out = boost::dynamic_pointer_cast<AsyncMIDIPort> (_midi_ports->mmc_output_port());
+
+       if (!async_out || !async_out) {
+               return;
+       }
+
+       /* XXXX argh, passing raw pointers back into libmidi++ */
+
+       MIDI::Port* mmc_in = async_in.get();
+       MIDI::Port* mmc_out = async_out.get();
+
+       _mmc->set_ports (mmc_in, mmc_out);

 
        _mmc->Play.connect_same_thread (*this, boost::bind (&Session::mmc_deferred_play, this, _1));
        _mmc->DeferredPlay.connect_same_thread (*this, boost::bind (&Session::mmc_deferred_play, this, _1));
 
        _mmc->Play.connect_same_thread (*this, boost::bind (&Session::mmc_deferred_play, this, _1));
        _mmc->DeferredPlay.connect_same_thread (*this, boost::bind (&Session::mmc_deferred_play, this, _1));


@@ -3872,6 +3964,27 @@ Session::solo_cut_control() const
         return _solo_cut_control;
 }
 
         return _solo_cut_control;
 }
 

+void
+Session::save_snapshot_name (const std::string & n)
+{
+       /* assure Stateful::_instant_xml is loaded
+        * add_instant_xml() only adds to existing data and defaults
+        * to use an empty Tree otherwise
+        */
+       instant_xml ("LastUsedSnapshot");
+
+       XMLNode* last_used_snapshot = new XMLNode ("LastUsedSnapshot");
+       last_used_snapshot->add_property ("name", string(n));
+       add_instant_xml (*last_used_snapshot, false);
+}
+
+void
+Session::set_snapshot_name (const std::string & n)
+{
+       _current_snapshot_name = n;
+       save_snapshot_name (n);
+}
+

 int
 Session::rename (const std::string& new_name)
 {
 int
 Session::rename (const std::string& new_name)
 {


@@ -3900,7 +4013,7 @@ Session::rename (const std::string& new_name)
         * interchange subdirectory
         * session file
         * session history
         * interchange subdirectory
         * session file
         * session history

-        
+

         * Backup files are left unchanged and not renamed.
         */
 
         * Backup files are left unchanged and not renamed.
         */
 


@@ -3917,30 +4030,30 @@ Session::rename (const std::string& new_name)
                        fs->close ();
                }
        }
                        fs->close ();
                }
        }

-       
+

        /* pass one: not 100% safe check that the new directory names don't
         * already exist ...
         */
 
        for (vector<space_and_path>::const_iterator i = session_dirs.begin(); i != session_dirs.end(); ++i) {
        /* pass one: not 100% safe check that the new directory names don't
         * already exist ...
         */
 
        for (vector<space_and_path>::const_iterator i = session_dirs.begin(); i != session_dirs.end(); ++i) {

-               
+

                oldstr = (*i).path;
                oldstr = (*i).path;

-               
+

                /* this is a stupid hack because Glib::path_get_dirname() is
                 * lexical-only, and so passing it /a/b/c/ gives a different
                 * result than passing it /a/b/c ...
                 */
                /* this is a stupid hack because Glib::path_get_dirname() is
                 * lexical-only, and so passing it /a/b/c/ gives a different
                 * result than passing it /a/b/c ...
                 */

-               
+

                if (oldstr[oldstr.length()-1] == G_DIR_SEPARATOR) {
                        oldstr = oldstr.substr (0, oldstr.length() - 1);
                }
                if (oldstr[oldstr.length()-1] == G_DIR_SEPARATOR) {
                        oldstr = oldstr.substr (0, oldstr.length() - 1);
                }

-               
+

                string base = Glib::path_get_dirname (oldstr);
                string base = Glib::path_get_dirname (oldstr);

-               
+

                newstr = Glib::build_filename (base, legal_name);
                newstr = Glib::build_filename (base, legal_name);

-               
+

                cerr << "Looking for " << newstr << endl;
                cerr << "Looking for " << newstr << endl;

-               
+

                if (Glib::file_test (newstr, Glib::FILE_TEST_EXISTS)) {
                        cerr << " exists\n";
                        return -1;
                if (Glib::file_test (newstr, Glib::FILE_TEST_EXISTS)) {
                        cerr << " exists\n";
                        return -1;


@@ -3950,18 +4063,18 @@ Session::rename (const std::string& new_name)
        /* Session dirs */
 
        first = true;
        /* Session dirs */
 
        first = true;

-       
+

        for (vector<space_and_path>::iterator i = session_dirs.begin(); i != session_dirs.end(); ++i) {
 
                vector<string> v;
 
                oldstr = (*i).path;
        for (vector<space_and_path>::iterator i = session_dirs.begin(); i != session_dirs.end(); ++i) {
 
                vector<string> v;
 
                oldstr = (*i).path;

-               
+

                /* this is a stupid hack because Glib::path_get_dirname() is
                 * lexical-only, and so passing it /a/b/c/ gives a different
                 * result than passing it /a/b/c ...
                 */
                /* this is a stupid hack because Glib::path_get_dirname() is
                 * lexical-only, and so passing it /a/b/c/ gives a different
                 * result than passing it /a/b/c ...
                 */

-               
+

                if (oldstr[oldstr.length()-1] == G_DIR_SEPARATOR) {
                        oldstr = oldstr.substr (0, oldstr.length() - 1);
                }
                if (oldstr[oldstr.length()-1] == G_DIR_SEPARATOR) {
                        oldstr = oldstr.substr (0, oldstr.length() - 1);
                }


@@ -3970,8 +4083,8 @@ Session::rename (const std::string& new_name)
                newstr = Glib::build_filename (base, legal_name);
 
                cerr << "for " << oldstr << " new dir = " << newstr << endl;
                newstr = Glib::build_filename (base, legal_name);
 
                cerr << "for " << oldstr << " new dir = " << newstr << endl;

-               
-               cerr << "Rename " << oldstr << " => " << newstr << endl;                
+
+               cerr << "Rename " << oldstr << " => " << newstr << endl;

                if (::g_rename (oldstr.c_str(), newstr.c_str()) != 0) {
                        cerr << string_compose (_("renaming %s as %2 failed (%3)"), oldstr, newstr, g_strerror (errno)) << endl;
                        error << string_compose (_("renaming %s as %2 failed (%3)"), oldstr, newstr, g_strerror (errno)) << endmsg;
                if (::g_rename (oldstr.c_str(), newstr.c_str()) != 0) {
                        cerr << string_compose (_("renaming %s as %2 failed (%3)"), oldstr, newstr, g_strerror (errno)) << endl;
                        error << string_compose (_("renaming %s as %2 failed (%3)"), oldstr, newstr, g_strerror (errno)) << endmsg;


@@ -3979,12 +4092,12 @@ Session::rename (const std::string& new_name)
                }
 
                /* Reset path in "session dirs" */
                }
 
                /* Reset path in "session dirs" */

-               
+

                (*i).path = newstr;
                (*i).blocks = 0;
                (*i).path = newstr;
                (*i).blocks = 0;

-               
+

                /* reset primary SessionDirectory object */
                /* reset primary SessionDirectory object */

-               
+

                if (first) {
                        (*_session_dir) = newstr;
                        new_path = newstr;
                if (first) {
                        (*_session_dir) = newstr;
                        new_path = newstr;


@@ -3997,10 +4110,10 @@ Session::rename (const std::string& new_name)
                string new_interchange_dir;
 
                /* use newstr here because we renamed the path
                string new_interchange_dir;
 
                /* use newstr here because we renamed the path

-                * (folder/directory) that used to be oldstr to newstr above 
-                */     
-               
-               v.push_back (newstr); 
+                * (folder/directory) that used to be oldstr to newstr above
+                */
+
+               v.push_back (newstr);

                v.push_back (interchange_dir_name);
                v.push_back (Glib::path_get_basename (oldstr));
 
                v.push_back (interchange_dir_name);
                v.push_back (Glib::path_get_basename (oldstr));
 


@@ -4010,11 +4123,11 @@ Session::rename (const std::string& new_name)
                v.push_back (newstr);
                v.push_back (interchange_dir_name);
                v.push_back (legal_name);
                v.push_back (newstr);
                v.push_back (interchange_dir_name);
                v.push_back (legal_name);

-               
+

                new_interchange_dir = Glib::build_filename (v);
                new_interchange_dir = Glib::build_filename (v);

-               
+

                cerr << "Rename " << old_interchange_dir << " => " << new_interchange_dir << endl;
                cerr << "Rename " << old_interchange_dir << " => " << new_interchange_dir << endl;

-               
+

                if (::g_rename (old_interchange_dir.c_str(), new_interchange_dir.c_str()) != 0) {
                        cerr << string_compose (_("renaming %s as %2 failed (%3)"),
                                                 old_interchange_dir, new_interchange_dir,
                if (::g_rename (old_interchange_dir.c_str(), new_interchange_dir.c_str()) != 0) {
                        cerr << string_compose (_("renaming %s as %2 failed (%3)"),
                                                 old_interchange_dir, new_interchange_dir,


@@ -4029,11 +4142,11 @@ Session::rename (const std::string& new_name)
        }
 
        /* state file */
        }
 
        /* state file */

-       
+

        oldstr = Glib::build_filename (new_path, _current_snapshot_name + statefile_suffix);
        newstr= Glib::build_filename (new_path, legal_name + statefile_suffix);
        oldstr = Glib::build_filename (new_path, _current_snapshot_name + statefile_suffix);
        newstr= Glib::build_filename (new_path, legal_name + statefile_suffix);

-       
-       cerr << "Rename " << oldstr << " => " << newstr << endl;                
+
+       cerr << "Rename " << oldstr << " => " << newstr << endl;

 
        if (::g_rename (oldstr.c_str(), newstr.c_str()) != 0) {
                cerr << string_compose (_("renaming %1 as %2 failed (%3)"), oldstr, newstr, g_strerror (errno)) << endl;
 
        if (::g_rename (oldstr.c_str(), newstr.c_str()) != 0) {
                cerr << string_compose (_("renaming %1 as %2 failed (%3)"), oldstr, newstr, g_strerror (errno)) << endl;


@@ -4042,14 +4155,14 @@ Session::rename (const std::string& new_name)
        }
 
        /* history file */
        }
 
        /* history file */

-       
+

        oldstr = Glib::build_filename (new_path, _current_snapshot_name) + history_suffix;
 
        if (Glib::file_test (oldstr, Glib::FILE_TEST_EXISTS))  {
                newstr = Glib::build_filename (new_path, legal_name) + history_suffix;
        oldstr = Glib::build_filename (new_path, _current_snapshot_name) + history_suffix;
 
        if (Glib::file_test (oldstr, Glib::FILE_TEST_EXISTS))  {
                newstr = Glib::build_filename (new_path, legal_name) + history_suffix;

-               
-               cerr << "Rename " << oldstr << " => " << newstr << endl;                
-               
+
+               cerr << "Rename " << oldstr << " => " << newstr << endl;
+

                if (::g_rename (oldstr.c_str(), newstr.c_str()) != 0) {
                        cerr << string_compose (_("renaming %1 as %2 failed (%3)"), oldstr, newstr, g_strerror (errno)) << endl;
                        error << string_compose (_("renaming %1 as %2 failed (%3)"), oldstr, newstr, g_strerror (errno)) << endmsg;
                if (::g_rename (oldstr.c_str(), newstr.c_str()) != 0) {
                        cerr << string_compose (_("renaming %1 as %2 failed (%3)"), oldstr, newstr, g_strerror (errno)) << endl;
                        error << string_compose (_("renaming %1 as %2 failed (%3)"), oldstr, newstr, g_strerror (errno)) << endmsg;


@@ -4060,9 +4173,9 @@ Session::rename (const std::string& new_name)
        /* remove old name from recent sessions */
        remove_recent_sessions (_path);
        _path = new_path;
        /* remove old name from recent sessions */
        remove_recent_sessions (_path);
        _path = new_path;

-       
+

        /* update file source paths */
        /* update file source paths */

-       
+

        for (SourceMap::iterator i = sources.begin(); i != sources.end(); ++i) {
                boost::shared_ptr<FileSource> fs = boost::dynamic_pointer_cast<FileSource> (i->second);
                if (fs) {
        for (SourceMap::iterator i = sources.begin(); i != sources.end(); ++i) {
                boost::shared_ptr<FileSource> fs = boost::dynamic_pointer_cast<FileSource> (i->second);
                if (fs) {


@@ -4073,9 +4186,9 @@ Session::rename (const std::string& new_name)
                }
        }
 
                }
        }
 

-       _current_snapshot_name = new_name;
+       set_snapshot_name (new_name);

        _name = new_name;
        _name = new_name;

-       
+

        set_dirty ();
 
        /* save state again to get everything just right */
        set_dirty ();
 
        /* save state again to get everything just right */


@@ -4117,7 +4230,7 @@ Session::get_info_from_path (const string& xmlpath, float& sample_rate, SampleFo
        /* sample rate */
 
        const XMLProperty* prop;
        /* sample rate */
 
        const XMLProperty* prop;

-       if ((prop = tree.root()->property (X_("sample-rate"))) != 0) {          
+       if ((prop = tree.root()->property (X_("sample-rate"))) != 0) {

                sample_rate = atoi (prop->value());
                found_sr = true;
        }
                sample_rate = atoi (prop->value());
                found_sr = true;
        }


@@ -4154,6 +4267,29 @@ Session::get_info_from_path (const string& xmlpath, float& sample_rate, SampleFo
        return !(found_sr && found_data_format); // zero if they are both found
 }
 
        return !(found_sr && found_data_format); // zero if they are both found
 }
 

+std::string
+Session::get_snapshot_from_instant (const std::string& session_dir)
+{
+       std::string instant_xml_path = Glib::build_filename (session_dir, "instant.xml");
+
+       if (!Glib::file_test (instant_xml_path, Glib::FILE_TEST_EXISTS)) {
+               return "";
+       }
+
+       XMLTree tree;
+       if (!tree.read (instant_xml_path)) {
+               return "";
+       }
+
+       const XMLProperty* prop;
+       XMLNode *last_used_snapshot = tree.root()->child("LastUsedSnapshot");
+       if (last_used_snapshot && (prop = last_used_snapshot->property ("name")) != 0) {
+               return prop->value();
+       }
+
+       return "";
+}
+

 typedef std::vector<boost::shared_ptr<FileSource> > SeveralFileSources;
 typedef std::map<std::string,SeveralFileSources> SourcePathMap;
 
 typedef std::vector<boost::shared_ptr<FileSource> > SeveralFileSources;
 typedef std::map<std::string,SeveralFileSources> SourcePathMap;
 


@@ -4170,20 +4306,20 @@ Session::bring_all_sources_into_session (boost::function<void(uint32_t,uint32_t,
        {
 
                Glib::Threads::Mutex::Lock lm (source_lock);
        {
 
                Glib::Threads::Mutex::Lock lm (source_lock);

-               
+

                cerr << " total sources = " << sources.size();
                cerr << " total sources = " << sources.size();

-               
+

                for (SourceMap::const_iterator i = sources.begin(); i != sources.end(); ++i) {
                        boost::shared_ptr<FileSource> fs = boost::dynamic_pointer_cast<FileSource> (i->second);
                for (SourceMap::const_iterator i = sources.begin(); i != sources.end(); ++i) {
                        boost::shared_ptr<FileSource> fs = boost::dynamic_pointer_cast<FileSource> (i->second);

-                       
+

                        if (!fs) {
                                continue;
                        }
                        if (!fs) {
                                continue;
                        }

-                       
+

                        if (fs->within_session()) {
                                continue;
                        }
                        if (fs->within_session()) {
                                continue;
                        }

-                       
+

                        if (source_path_map.find (fs->path()) != source_path_map.end()) {
                                source_path_map[fs->path()].push_back (fs);
                        } else {
                        if (source_path_map.find (fs->path()) != source_path_map.end()) {
                                source_path_map[fs->path()].push_back (fs);
                        } else {


@@ -4191,45 +4327,45 @@ Session::bring_all_sources_into_session (boost::function<void(uint32_t,uint32_t,
                                v.push_back (fs);
                                source_path_map.insert (make_pair (fs->path(), v));
                        }
                                v.push_back (fs);
                                source_path_map.insert (make_pair (fs->path(), v));
                        }

-                       
+

                        total++;
                }
                        total++;
                }

-               
+

                cerr << " fsources = " << total << endl;
                cerr << " fsources = " << total << endl;

-               
+

                for (SourcePathMap::iterator i = source_path_map.begin(); i != source_path_map.end(); ++i) {
                for (SourcePathMap::iterator i = source_path_map.begin(); i != source_path_map.end(); ++i) {

-                       
+

                        /* tell caller where we are */
                        /* tell caller where we are */

-                       
+

                        string old_path = i->first;
                        string old_path = i->first;

-                       
+

                        callback (n, total, old_path);
                        callback (n, total, old_path);

-                       
+

                        cerr << old_path << endl;
                        cerr << old_path << endl;

-                       
+

                        new_path.clear ();
                        new_path.clear ();

-                       
+

                        switch (i->second.front()->type()) {
                        case DataType::AUDIO:
                                new_path = new_audio_source_path_for_embedded (old_path);
                                break;
                        switch (i->second.front()->type()) {
                        case DataType::AUDIO:
                                new_path = new_audio_source_path_for_embedded (old_path);
                                break;

-                               
+

                        case DataType::MIDI:
                                /* XXX not implemented yet */
                                break;
                        }
                        case DataType::MIDI:
                                /* XXX not implemented yet */
                                break;
                        }

-                       
+

                        if (new_path.empty()) {
                                continue;
                        }
                        if (new_path.empty()) {
                                continue;
                        }

-                       
+

                        cerr << "Move " << old_path << " => " << new_path << endl;
                        cerr << "Move " << old_path << " => " << new_path << endl;

-                       
+

                        if (!copy_file (old_path, new_path)) {
                                cerr << "failed !\n";
                                ret = -1;
                        }
                        if (!copy_file (old_path, new_path)) {
                                cerr << "failed !\n";
                                ret = -1;
                        }

-                       
+

                        /* make sure we stop looking in the external
                           dir/folder. Remember, this is an all-or-nothing
                           operations, it doesn't merge just some files.
                        /* make sure we stop looking in the external
                           dir/folder. Remember, this is an all-or-nothing
                           operations, it doesn't merge just some files.


@@ -4272,7 +4408,7 @@ make_new_media_path (string old_path, string new_session_folder, string new_sess
        v.push_back (new_session_path);   /* just one directory/folder */
        v.push_back (typedir);
        v.push_back (Glib::path_get_basename (old_path));
        v.push_back (new_session_path);   /* just one directory/folder */
        v.push_back (typedir);
        v.push_back (Glib::path_get_basename (old_path));

-       
+

        return Glib::build_filename (v);
 }
 
        return Glib::build_filename (v);
 }
 


@@ -4299,15 +4435,15 @@ Session::save_as (SaveAs& saveas)
        /* get total size */
 
        for (vector<space_and_path>::const_iterator sd = session_dirs.begin(); sd != session_dirs.end(); ++sd) {
        /* get total size */
 
        for (vector<space_and_path>::const_iterator sd = session_dirs.begin(); sd != session_dirs.end(); ++sd) {

-               
+

                /* need to clear this because
                 * find_files_matching_filter() is cumulative
                 */
                /* need to clear this because
                 * find_files_matching_filter() is cumulative
                 */

-               
+

                files.clear ();
                files.clear ();

-               
+

                find_files_matching_filter (files, (*sd).path, accept_all_files, 0, false, true, true);
                find_files_matching_filter (files, (*sd).path, accept_all_files, 0, false, true, true);

-               
+

                all += files.size();
 
                for (vector<string>::iterator i = files.begin(); i != files.end(); ++i) {
                all += files.size();
 
                for (vector<string>::iterator i = files.begin(); i != files.end(); ++i) {


@@ -4318,7 +4454,7 @@ Session::save_as (SaveAs& saveas)
        }
 
        /* save old values so we can switch back if we are not switching to the new session */
        }
 
        /* save old values so we can switch back if we are not switching to the new session */

-       
+

        string old_path = _path;
        string old_name = _name;
        string old_snapshot = _current_snapshot_name;
        string old_path = _path;
        string old_name = _name;
        string old_snapshot = _current_snapshot_name;


@@ -4328,15 +4464,15 @@ Session::save_as (SaveAs& saveas)
 
        old_search_path[DataType::AUDIO] = source_search_path (DataType::AUDIO);
        old_search_path[DataType::MIDI] = source_search_path (DataType::MIDI);
 
        old_search_path[DataType::AUDIO] = source_search_path (DataType::AUDIO);
        old_search_path[DataType::MIDI] = source_search_path (DataType::MIDI);

-       old_config_search_path[DataType::AUDIO]  = config.get_audio_search_path ();     
-       old_config_search_path[DataType::MIDI]  = config.get_midi_search_path ();       
+       old_config_search_path[DataType::AUDIO]  = config.get_audio_search_path ();
+       old_config_search_path[DataType::MIDI]  = config.get_midi_search_path ();

 
        /* switch session directory */
 
        /* switch session directory */

-       
+

        (*_session_dir) = to_dir;
 
        /* create new tree */
        (*_session_dir) = to_dir;
 
        /* create new tree */

-       
+

        if (!_session_dir->create()) {
                saveas.failure_message = string_compose (_("Cannot create new session folder %1"), to_dir);
                return -1;
        if (!_session_dir->create()) {
                saveas.failure_message = string_compose (_("Cannot create new session folder %1"), to_dir);
                return -1;


@@ -4346,21 +4482,21 @@ Session::save_as (SaveAs& saveas)
                /* copy all relevant files. Find each location in session_dirs,
                 * and copy files from there to target.
                 */
                /* copy all relevant files. Find each location in session_dirs,
                 * and copy files from there to target.
                 */

-               
+

                for (vector<space_and_path>::const_iterator sd = session_dirs.begin(); sd != session_dirs.end(); ++sd) {
                for (vector<space_and_path>::const_iterator sd = session_dirs.begin(); sd != session_dirs.end(); ++sd) {

-                       
+

                        /* need to clear this because
                         * find_files_matching_filter() is cumulative
                         */
                        /* need to clear this because
                         * find_files_matching_filter() is cumulative
                         */

-                       
+

                        files.clear ();
                        files.clear ();

-                       
+

                        const size_t prefix_len = (*sd).path.size();
                        const size_t prefix_len = (*sd).path.size();

-                       
+

                        /* Work just on the files within this session dir */
                        /* Work just on the files within this session dir */

-                       
+

                        find_files_matching_filter (files, (*sd).path, accept_all_files, 0, false, true, true);
                        find_files_matching_filter (files, (*sd).path, accept_all_files, 0, false, true, true);

-                       
+

                        /* add dir separator to protect against collisions with
                         * track names (e.g. track named "audiofiles" or
                         * "analysis".
                        /* add dir separator to protect against collisions with
                         * track names (e.g. track named "audiofiles" or
                         * "analysis".


@@ -4375,7 +4511,7 @@ Session::save_as (SaveAs& saveas)
                           folder. That really was a bad idea, but I'm not fixing it as part of
                           implementing ::save_as().
                        */
                           folder. That really was a bad idea, but I'm not fixing it as part of
                           implementing ::save_as().
                        */

-                       
+

                        for (vector<string>::iterator i = files.begin(); i != files.end(); ++i) {
 
                                std::string from = *i;
                        for (vector<string>::iterator i = files.begin(); i != files.end(); ++i) {
 
                                std::string from = *i;


@@ -4387,25 +4523,25 @@ Session::save_as (SaveAs& saveas)
                                        continue;
                                }
 #endif
                                        continue;
                                }
 #endif

-                               
+

                                if (from.find (audiofile_dir_string) != string::npos) {
                                if (from.find (audiofile_dir_string) != string::npos) {

-                                       
+

                                        /* audio file: only copy if asked */
 
                                        if (saveas.include_media && saveas.copy_media) {
                                        /* audio file: only copy if asked */
 
                                        if (saveas.include_media && saveas.copy_media) {

-                                               
+

                                                string to = make_new_media_path (*i, to_dir, new_folder);
 
                                                info << "media file copying from " << from << " to " << to << endmsg;
                                                string to = make_new_media_path (*i, to_dir, new_folder);
 
                                                info << "media file copying from " << from << " to " << to << endmsg;

-                                               
+

                                                if (!copy_file (from, to)) {
                                                        throw Glib::FileError (Glib::FileError::IO_ERROR,
                                                                                                   string_compose(_("\ncopying \"%1\" failed !"), from));
                                                }
                                        }
                                                if (!copy_file (from, to)) {
                                                        throw Glib::FileError (Glib::FileError::IO_ERROR,
                                                                                                   string_compose(_("\ncopying \"%1\" failed !"), from));
                                                }
                                        }

-                                       
+

                                        /* we found media files inside the session folder */
                                        /* we found media files inside the session folder */

-                                       
+

                                        internal_file_cnt++;
 
                                } else if (from.find (midifile_dir_string) != string::npos) {
                                        internal_file_cnt++;
 
                                } else if (from.find (midifile_dir_string) != string::npos) {


@@ -4415,44 +4551,44 @@ Session::save_as (SaveAs& saveas)
                                         */
 
                                        if (saveas.include_media) {
                                         */
 
                                        if (saveas.include_media) {

-                                       
+

                                                string to = make_new_media_path (*i, to_dir, new_folder);
                                                string to = make_new_media_path (*i, to_dir, new_folder);

-                                               
+

                                                info << "media file copying from " << from << " to " << to << endmsg;
                                                info << "media file copying from " << from << " to " << to << endmsg;

-                                               
+

                                                if (!copy_file (from, to)) {
                                                        throw Glib::FileError (Glib::FileError::IO_ERROR, "copy failed");
                                                }
                                        }
 
                                        /* we found media files inside the session folder */
                                                if (!copy_file (from, to)) {
                                                        throw Glib::FileError (Glib::FileError::IO_ERROR, "copy failed");
                                                }
                                        }
 
                                        /* we found media files inside the session folder */

-                                               
+

                                        internal_file_cnt++;
                                        internal_file_cnt++;

-                                       
+

                                } else if (from.find (analysis_dir_string) != string::npos) {
 
                                        /*  make sure analysis dir exists in
                                         *  new session folder, but we're not
                                         *  copying analysis files here, see
                                } else if (from.find (analysis_dir_string) != string::npos) {
 
                                        /*  make sure analysis dir exists in
                                         *  new session folder, but we're not
                                         *  copying analysis files here, see

-                                        *  below 
+                                        *  below

                                         */
                                         */

-                                       
+

                                        (void) g_mkdir_with_parents (analysis_dir().c_str(), 775);
                                        continue;
                                        (void) g_mkdir_with_parents (analysis_dir().c_str(), 775);
                                        continue;

-                                       
+

                                } else {
                                } else {

-                                       
+

                                        /* normal non-media file. Don't copy state, history, etc.
                                         */
                                        /* normal non-media file. Don't copy state, history, etc.
                                         */

-                                       
+

                                        bool do_copy = true;
                                        bool do_copy = true;

-                                       
+

                                        for (vector<string>::iterator v = do_not_copy_extensions.begin(); v != do_not_copy_extensions.end(); ++v) {
                                                if ((from.length() > (*v).length()) && (from.find (*v) == from.length() - (*v).length())) {
                                                        /* end of filename matches extension, do not copy file */
                                                        do_copy = false;
                                                        break;
                                        for (vector<string>::iterator v = do_not_copy_extensions.begin(); v != do_not_copy_extensions.end(); ++v) {
                                                if ((from.length() > (*v).length()) && (from.find (*v) == from.length() - (*v).length())) {
                                                        /* end of filename matches extension, do not copy file */
                                                        do_copy = false;
                                                        break;

-                                               } 
+                                               }

                                        }
 
                                        if (!saveas.copy_media && from.find (peakfile_suffix) != string::npos) {
                                        }
 
                                        if (!saveas.copy_media && from.find (peakfile_suffix) != string::npos) {


@@ -4461,10 +4597,10 @@ Session::save_as (SaveAs& saveas)
                                                 */
                                                do_copy = false;
                                        }
                                                 */
                                                do_copy = false;
                                        }

-                                       
+

                                        if (do_copy) {
                                                string to = Glib::build_filename (to_dir, from.substr (prefix_len));
                                        if (do_copy) {
                                                string to = Glib::build_filename (to_dir, from.substr (prefix_len));

-                                               
+

                                                info << "attempting to make directory/folder " << to << endmsg;
 
                                                if (g_mkdir_with_parents (Glib::path_get_dirname (to).c_str(), 0755)) {
                                                info << "attempting to make directory/folder " << to << endmsg;
 
                                                if (g_mkdir_with_parents (Glib::path_get_dirname (to).c_str(), 0755)) {


@@ -4472,26 +4608,26 @@ Session::save_as (SaveAs& saveas)
                                                }
 
                                                info << "attempting to copy " << from << " to " << to << endmsg;
                                                }
 
                                                info << "attempting to copy " << from << " to " << to << endmsg;

-                                               
+

                                                if (!copy_file (from, to)) {
                                                        throw Glib::FileError (Glib::FileError::IO_ERROR,
                                                                                                   string_compose(_("\ncopying \"%1\" failed !"), from));
                                                }
                                        }
                                }
                                                if (!copy_file (from, to)) {
                                                        throw Glib::FileError (Glib::FileError::IO_ERROR,
                                                                                                   string_compose(_("\ncopying \"%1\" failed !"), from));
                                                }
                                        }
                                }

-                               
+

                                /* measure file size even if we're not going to copy so that our Progress
                                   signals are correct, since we included these do-not-copy files
                                   in the computation of the total size and file count.
                                */
                                /* measure file size even if we're not going to copy so that our Progress
                                   signals are correct, since we included these do-not-copy files
                                   in the computation of the total size and file count.
                                */

-                               
+

                                GStatBuf gsb;
                                g_stat (from.c_str(), &gsb);
                                copied += gsb.st_size;
                                cnt++;
                                GStatBuf gsb;
                                g_stat (from.c_str(), &gsb);
                                copied += gsb.st_size;
                                cnt++;

-                               
+

                                double fraction = (double) copied / total_bytes;
                                double fraction = (double) copied / total_bytes;

-                               
+

                                bool keep_going = true;
 
                                if (saveas.copy_media) {
                                bool keep_going = true;
 
                                if (saveas.copy_media) {


@@ -4500,11 +4636,11 @@ Session::save_as (SaveAs& saveas)
                                         * media is not being copied, because
                                         * it will be fast(ish).
                                         */
                                         * media is not being copied, because
                                         * it will be fast(ish).
                                         */

-                                       
+

                                        /* tell someone "X percent, file M of N"; M is one-based */
                                        /* tell someone "X percent, file M of N"; M is one-based */

-                                       
+

                                        boost::optional<bool> res = saveas.Progress (fraction, cnt, all);
                                        boost::optional<bool> res = saveas.Progress (fraction, cnt, all);

-                                       
+

                                        if (res) {
                                                keep_going = *res;
                                        }
                                        if (res) {
                                                keep_going = *res;
                                        }


@@ -4538,7 +4674,7 @@ Session::save_as (SaveAs& saveas)
                }
 
                if (saveas.include_media) {
                }
 
                if (saveas.include_media) {

-               
+

                        if (saveas.copy_media) {
 #ifndef PLATFORM_WINDOWS
                                /* There are problems with analysis files on
                        if (saveas.copy_media) {
 #ifndef PLATFORM_WINDOWS
                                /* There are problems with analysis files on


@@ -4548,7 +4684,7 @@ Session::save_as (SaveAs& saveas)
                                 *
                                 * This is a tricky problem to solve so for
                                 * just don't copy these files. They will be
                                 *
                                 * This is a tricky problem to solve so for
                                 * just don't copy these files. They will be

-                                * regenerated as-needed anyway, subject to the 
+                                * regenerated as-needed anyway, subject to the

                                 * existing issue that the filenames will be
                                 * rejected by Windows, which is a separate
                                 * problem (though related).
                                 * existing issue that the filenames will be
                                 * rejected by Windows, which is a separate
                                 * problem (though related).


@@ -4557,19 +4693,19 @@ Session::save_as (SaveAs& saveas)
                                /* only needed if we are copying media, since the
                                 * analysis data refers to media data
                                 */
                                /* only needed if we are copying media, since the
                                 * analysis data refers to media data
                                 */

-                               
+

                                old = analysis_dir ();
                                if (Glib::file_test (old, Glib::FILE_TEST_EXISTS)) {
                                        string newdir = Glib::build_filename (to_dir, "analysis");
                                        copy_files (old, newdir);
                                }
                                old = analysis_dir ();
                                if (Glib::file_test (old, Glib::FILE_TEST_EXISTS)) {
                                        string newdir = Glib::build_filename (to_dir, "analysis");
                                        copy_files (old, newdir);
                                }

-#endif /* PLATFORM_WINDOWS */                          
+#endif /* PLATFORM_WINDOWS */

                        }
                }
                        }
                }

-                       
-               
+
+

                _path = to_dir;
                _path = to_dir;

-               _current_snapshot_name = saveas.new_name;
+               set_snapshot_name (saveas.new_name);

                _name = saveas.new_name;
 
                if (saveas.include_media && !saveas.copy_media) {
                _name = saveas.new_name;
 
                if (saveas.include_media && !saveas.copy_media) {


@@ -4590,12 +4726,12 @@ Session::save_as (SaveAs& saveas)
                                */
                        }
                }
                                */
                        }
                }

-               
+

                bool was_dirty = dirty ();
 
                save_state ("", false, false, !saveas.include_media);
                save_default_options ();
                bool was_dirty = dirty ();
 
                save_state ("", false, false, !saveas.include_media);
                save_default_options ();

-               
+

                if (saveas.copy_media && saveas.copy_external) {
                        if (bring_all_sources_into_session (boost::bind (&Session::save_as_bring_callback, this, _1, _2, _3))) {
                                throw Glib::FileError (Glib::FileError::NO_SPACE_LEFT, "consolidate failed");
                if (saveas.copy_media && saveas.copy_external) {
                        if (bring_all_sources_into_session (boost::bind (&Session::save_as_bring_callback, this, _1, _2, _3))) {
                                throw Glib::FileError (Glib::FileError::NO_SPACE_LEFT, "consolidate failed");


@@ -4605,14 +4741,14 @@ Session::save_as (SaveAs& saveas)
                saveas.final_session_folder_name = _path;
 
                store_recent_sessions (_name, _path);
                saveas.final_session_folder_name = _path;
 
                store_recent_sessions (_name, _path);

-               
+

                if (!saveas.switch_to) {
 
                        /* switch back to the way things were */
 
                        _path = old_path;
                        _name = old_name;
                if (!saveas.switch_to) {
 
                        /* switch back to the way things were */
 
                        _path = old_path;
                        _name = old_name;

-                       _current_snapshot_name = old_snapshot;
+                       set_snapshot_name (old_snapshot);

 
                        (*_session_dir) = old_sd;
 
 
                        (*_session_dir) = old_sd;
 


@@ -4625,7 +4761,7 @@ Session::save_as (SaveAs& saveas)
                                config.set_audio_search_path (old_config_search_path[DataType::AUDIO]);
                                config.set_midi_search_path (old_config_search_path[DataType::MIDI]);
                        }
                                config.set_audio_search_path (old_config_search_path[DataType::AUDIO]);
                                config.set_midi_search_path (old_config_search_path[DataType::MIDI]);
                        }

-                       
+

                } else {
 
                        /* prune session dirs, and update disk space statistics
                } else {
 
                        /* prune session dirs, and update disk space statistics


@@ -4637,7 +4773,7 @@ Session::save_as (SaveAs& saveas)
                        session_dirs.push_back (sp);
                        refresh_disk_space ();
 
                        session_dirs.push_back (sp);
                        refresh_disk_space ();
 

-                       /* ensure that all existing tracks reset their current capture source paths 
+                       /* ensure that all existing tracks reset their current capture source paths

                         */
                        reset_write_sources (true, true);
 
                         */
                        reset_write_sources (true, true);
 


@@ -4662,27 +4798,27 @@ Session::save_as (SaveAs& saveas)
        } catch (Glib::FileError& e) {
 
                saveas.failure_message = e.what();
        } catch (Glib::FileError& e) {
 
                saveas.failure_message = e.what();

-               
+

                /* recursively remove all the directories */
                /* recursively remove all the directories */

-               
+

                remove_directory (to_dir);
                remove_directory (to_dir);

-               
+

                /* return error */
                /* return error */

-               
+

                return -1;
 
        } catch (...) {
 
                saveas.failure_message = _("unknown reason");
                return -1;
 
        } catch (...) {
 
                saveas.failure_message = _("unknown reason");

-               
+

                /* recursively remove all the directories */
                /* recursively remove all the directories */

-               
+

                remove_directory (to_dir);
                remove_directory (to_dir);

-               
+

                /* return error */
                /* return error */

-               
+

                return -1;
        }
                return -1;
        }

-       
+

        return 0;
 }
        return 0;
 }