Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas
[ardour.git] / libs / ardour / session_state.cc
index a7d7a0be4ca57503851db7bf79468f654082726d..6a06863e9e16b1ca347cd261df2fe3e374d861ff 100644 (file)
 #include <unistd.h>
 #include <sys/stat.h>
 #include <climits>
-#include <fcntl.h>
-#include <poll.h>
 #include <signal.h>
-#include <sys/mman.h>
 #include <sys/time.h>
 
 #ifdef HAVE_SYS_VFS_H
 #include <sys/vfs.h>
-#else
+#endif
+
+#ifdef __APPLE__
 #include <sys/param.h>
 #include <sys/mount.h>
 #endif
 #include "pbd/enumwriter.h"
 #include "pbd/error.h"
 #include "pbd/file_utils.h"
+#include "pbd/pathexpand.h"
 #include "pbd/pathscanner.h"
 #include "pbd/pthread_utils.h"
 #include "pbd/stacktrace.h"
 #include "pbd/convert.h"
 #include "pbd/clear_dir.h"
+#include "pbd/localtime_r.h"
 
 #include "ardour/amp.h"
+#include "ardour/async_midi_port.h"
 #include "ardour/audio_diskstream.h"
 #include "ardour/audio_track.h"
 #include "ardour/audioengine.h"
 #include "ardour/control_protocol_manager.h"
 #include "ardour/directory_names.h"
 #include "ardour/filename_extensions.h"
+#include "ardour/graph.h"
 #include "ardour/location.h"
 #include "ardour/midi_model.h"
 #include "ardour/midi_patch_manager.h"
 #include "ardour/midi_region.h"
+#include "ardour/midi_scene_changer.h"
 #include "ardour/midi_source.h"
 #include "ardour/midi_track.h"
 #include "ardour/pannable.h"
@@ -124,119 +128,40 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-/** @param snapshot_name Snapshot name, without the .ardour prefix */
 void
-Session::first_stage_init (string fullpath, string snapshot_name)
+Session::pre_engine_init (string fullpath)
 {
-       if (fullpath.length() == 0) {
+       if (fullpath.empty()) {
                destroy ();
                throw failed_constructor();
        }
 
-       char buf[PATH_MAX+1];
-       if (!realpath (fullpath.c_str(), buf) && (errno != ENOENT)) {
-               error << string_compose(_("Could not use path %1 (%2)"), buf, strerror(errno)) << endmsg;
-               destroy ();
-               throw failed_constructor();
-       }
+       /* discover canonical fullpath */
 
-       _path = string(buf);
+       _path = canonical_path(fullpath);
+
+       /* we require _path to end with a dir separator */
 
        if (_path[_path.length()-1] != G_DIR_SEPARATOR) {
                _path += G_DIR_SEPARATOR;
        }
 
-       /* these two are just provisional settings. set_state()
-          will likely override them.
-       */
-
-       _name = _current_snapshot_name = snapshot_name;
-
-       set_history_depth (Config->get_history_depth());
-
-       _current_frame_rate = _engine.sample_rate ();
-       _nominal_frame_rate = _current_frame_rate;
-       _base_frame_rate = _current_frame_rate;
+       /* is it new ? */
 
-       _tempo_map = new TempoMap (_current_frame_rate);
-       _tempo_map->PropertyChanged.connect_same_thread (*this, boost::bind (&Session::tempo_map_changed, this, _1));
+       _is_new = !Glib::file_test (_path, Glib::FileTest (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR));
 
+       /* finish initialization that can't be done in a normal C++ constructor
+          definition.
+       */
 
-       _non_soloed_outs_muted = false;
-       _listen_cnt = 0;
-       _solo_isolated_cnt = 0;
+       timerclear (&last_mmc_step);
        g_atomic_int_set (&processing_prohibited, 0);
-       _transport_speed = 0;
-       _default_transport_speed = 1.0;
-       _last_transport_speed = 0;
-       _target_transport_speed = 0;
-       auto_play_legal = false;
-       transport_sub_state = 0;
-       _transport_frame = 0;
-       _requested_return_frame = -1;
-       _session_range_location = 0;
        g_atomic_int_set (&_record_status, Disabled);
-       loop_changing = false;
-       play_loop = false;
-       have_looped = false;
-       _last_roll_location = 0;
-       _last_roll_or_reversal_location = 0;
-       _last_record_location = 0;
-       pending_locate_frame = 0;
-       pending_locate_roll = false;
-       pending_locate_flush = false;
-       state_was_pending = false;
-       set_next_event ();
-       outbound_mtc_timecode_frame = 0;
-       next_quarter_frame_to_send = -1;
-       current_block_size = 0;
-       solo_update_disabled = false;
-       _have_captured = false;
-       _worst_output_latency = 0;
-       _worst_input_latency = 0;
-       _worst_track_latency = 0;
-       _state_of_the_state = StateOfTheState(CannotSave|InitialConnecting|Loading);
-       _was_seamless = Config->get_seamless_loop ();
-       _slave = 0;
-       _send_qf_mtc = false;
-       _pframes_since_last_mtc = 0;
        g_atomic_int_set (&_playback_load, 100);
        g_atomic_int_set (&_capture_load, 100);
-       _play_range = false;
-       _exporting = false;
-       pending_abort = false;
-       _adding_routes_in_progress = false;
-       destructive_index = 0;
-       first_file_data_format_reset = true;
-       first_file_header_format_reset = true;
-       post_export_sync = false;
-       midi_control_ui = 0;
-        _step_editors = 0;
-        no_questions_about_missing_files = false;
-        _speakers.reset (new Speakers);
-       _clicks_cleared = 0;
-       ignore_route_processor_changes = false;
-       _pre_export_mmc_enabled = false;
-
-       AudioDiskstream::allocate_working_buffers();
-
-       /* default short fade = 15ms */
-
-       SndFileSource::setup_standard_crossfades (*this, frame_rate());
-
-       last_mmc_step.tv_sec = 0;
-       last_mmc_step.tv_usec = 0;
-       step_speed = 0.0;
-
-       /* click sounds are unset by default, which causes us to internal
-          waveforms for clicks.
-       */
-
-       click_length = 0;
-       click_emphasis_length = 0;
-       _clicking = false;
-
-       process_function = &Session::process_with_events;
+       set_next_event ();
+       _all_route_group->set_active (true, this);
+       interpolation.add_channel_to (0, 0);
 
        if (config.get_use_video_sync()) {
                waiting_for_sync_offset = true;
@@ -244,32 +169,19 @@ Session::first_stage_init (string fullpath, string snapshot_name)
                waiting_for_sync_offset = false;
        }
 
-       last_timecode_when = 0;
-       last_timecode_valid = false;
-
-       sync_time_vars ();
-
        last_rr_session_dir = session_dirs.begin();
-       refresh_disk_space ();
 
+       set_history_depth (Config->get_history_depth());
+       
         /* default: assume simple stereo speaker configuration */
 
         _speakers->setup_default_speakers (2);
 
-       /* slave stuff */
-
-       average_slave_delta = 1800; // !!! why 1800 ????
-       have_first_delta_accumulator = false;
-       delta_accumulator_cnt = 0;
-       _slave_state = Stopped;
-
         _solo_cut_control.reset (new ProxyControllable (_("solo cut control (dB)"), PBD::Controllable::GainLike,
                                                         boost::bind (&RCConfiguration::set_solo_mute_gain, Config, _1),
                                                         boost::bind (&RCConfiguration::get_solo_mute_gain, Config)));
         add_controllable (_solo_cut_control);
 
-       _engine.GraphReordered.connect_same_thread (*this, boost::bind (&Session::graph_reordered, this));
-
        /* These are all static "per-class" signals */
 
        SourceFactory::SourceCreated.connect_same_thread (*this, boost::bind (&Session::add_source, this, _1));
@@ -282,77 +194,137 @@ Session::first_stage_init (string fullpath, string snapshot_name)
 
        Delivery::disable_panners ();
        IO::disable_connecting ();
+
+       AudioFileSource::set_peak_dir (_session_dir->peak_path());
 }
 
 int
-Session::second_stage_init ()
+Session::post_engine_init ()
 {
-       AudioFileSource::set_peak_dir (_session_dir->peak_path());
+       BootMessage (_("Set block size and sample rate"));
 
-       if (!_is_new) {
-               if (load_state (_current_snapshot_name)) {
-                       return -1;
-               }
-       }
+       set_block_size (_engine.samples_per_cycle());
+       set_frame_rate (_engine.sample_rate());
 
+       BootMessage (_("Using configuration"));
+
+       _midi_ports = new MidiPortManager;
+       
+       MIDISceneChanger* msc;
+
+       _scene_changer = msc = new MIDISceneChanger (*this);
+       msc->set_input_port (scene_input_port());
+       msc->set_output_port (scene_out());
+
+       boost::function<framecnt_t(void)> timer_func (boost::bind (&Session::audible_frame, this));
+       boost::dynamic_pointer_cast<AsyncMIDIPort>(scene_in())->set_timer (timer_func);
+
+       setup_midi_machine_control ();
+       
        if (_butler->start_thread()) {
                return -1;
        }
-
+       
        if (start_midi_thread ()) {
                return -1;
        }
-
-       setup_midi_machine_control ();
-
-       // set_state() will call setup_raid_path(), but if it's a new session we need
-       // to call setup_raid_path() here.
-
-       if (state_tree) {
-               if (set_state (*state_tree->root(), Stateful::loading_state_version)) {
-                       return -1;
-               }
-       } else {
-               setup_raid_path(_path);
-       }
-
-       /* we can't save till after ::when_engine_running() is called,
-          because otherwise we save state with no connections made.
-          therefore, we reset _state_of_the_state because ::set_state()
-          will have cleared it.
-
-          we also have to include Loading so that any events that get
-          generated between here and the end of ::when_engine_running()
-          will be processed directly rather than queued.
-       */
-
-       _state_of_the_state = StateOfTheState (_state_of_the_state|CannotSave|Loading);
-
-       _locations->changed.connect_same_thread (*this, boost::bind (&Session::locations_changed, this));
-       _locations->added.connect_same_thread (*this, boost::bind (&Session::locations_added, this, _1));
+       
        setup_click_sounds (0);
        setup_midi_control ();
 
-       /* Pay attention ... */
-
        _engine.Halted.connect_same_thread (*this, boost::bind (&Session::engine_halted, this));
        _engine.Xrun.connect_same_thread (*this, boost::bind (&Session::xrun_recovery, this));
 
-       midi_clock = new MidiClockTicker ();
-       midi_clock->set_session (this);
-
        try {
-               when_engine_running ();
-       }
+               /* tempo map requires sample rate knowledge */
+
+               _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 */
 
-       /* handle this one in a different way than all others, so that its clear what happened */
+               midi_clock = new MidiClockTicker ();
+               midi_clock->set_session (this);
 
-       catch (AudioEngine::PortRegistrationFailure& err) {
+               /* crossfades require sample rate knowledge */
+
+               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 ();
+               
+               /* 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;
+                       }
+               } else {
+                       // set_state() will call setup_raid_path(), but if it's a new session we need
+                       // to call setup_raid_path() here.
+                       setup_raid_path (_path);
+               }
+
+               /* ENGINE */
+
+               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);
+
+               /* Reset all 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.
+                */
+               
+               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.
+               */
+               
+               // 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.
+                */
+               
+               hookup_io ();
+               
+               /* 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 ();
+               
+               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));
+               
+               /* update latencies */
+               
+               initialize_latencies ();
+               
+               _locations->changed.connect_same_thread (*this, boost::bind (&Session::locations_changed, this));
+               _locations->added.connect_same_thread (*this, boost::bind (&Session::locations_added, this, _1));
+               
+       } catch (AudioEngine::PortRegistrationFailure& err) {
+               /* handle this one in a different way than all others, so that its clear what happened */
                error << err.what() << endmsg;
                return -1;
-       }
-
-       catch (...) {
+       } catch (...) {
                return -1;
        }
 
@@ -375,21 +347,21 @@ Session::second_stage_init ()
 
        DirtyChanged (); /* EMIT SIGNAL */
 
-       if (state_was_pending) {
-               save_state (_current_snapshot_name);
+       if (_is_new) {
+               save_state ("");
+       } else if (state_was_pending) {
+               save_state ("");
                remove_pending_capture_state ();
                state_was_pending = false;
        }
 
-       BootMessage (_("Session loading complete"));
-
        return 0;
 }
 
 string
 Session::raid_path () const
 {
-       SearchPath raid_search_path;
+       Searchpath raid_search_path;
 
        for (vector<space_and_path>::const_iterator i = session_dirs.begin(); i != session_dirs.end(); ++i) {
                raid_search_path += (*i).path;
@@ -410,11 +382,11 @@ Session::setup_raid_path (string path)
 
        session_dirs.clear ();
 
-       SearchPath search_path(path);
-       SearchPath sound_search_path;
-       SearchPath midi_search_path;
+       Searchpath search_path(path);
+       Searchpath sound_search_path;
+       Searchpath midi_search_path;
 
-       for (SearchPath::const_iterator i = search_path.begin(); i != search_path.end(); ++i) {
+       for (Searchpath::const_iterator i = search_path.begin(); i != search_path.end(); ++i) {
                sp.path = *i;
                sp.blocks = 0; // not needed
                session_dirs.push_back (sp);
@@ -527,9 +499,10 @@ Session::create (const string& session_template, BusProfile* bus_profile)
                ifstream in(in_path.c_str());
 
                if (in) {
-                       string out_path = _path;
-                       out_path += _name;
-                       out_path += statefile_suffix;
+                       /* no need to call legalize_for_path() since the string
+                        * in session_template is already a legal path name
+                        */
+                       string out_path = Glib::build_filename (_session_dir->root_path(), _name + statefile_suffix);
 
                        ofstream out(out_path.c_str());
 
@@ -609,8 +582,6 @@ Session::create (const string& session_template, BusProfile* bus_profile)
                add_monitor_section ();
        }
 
-       save_state ("");
-
        return 0;
 }
 
@@ -761,9 +732,9 @@ Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot
 
        } else {
 
-               if (::rename (tmp_path.c_str(), xml_path.c_str()) != 0) {
-                       error << string_compose (_("could not rename temporary session file %1 to %2"),
-                                       tmp_path, xml_path) << 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;
                        if (g_remove (tmp_path.c_str()) != 0) {
                                error << string_compose(_("Could not remove temporary session file at path \"%1\" (%2)"),
                                                tmp_path, g_strerror (errno)) << endmsg;
@@ -839,7 +810,7 @@ Session::load_state (string snapshot_name)
 
        set_dirty();
 
-       _writable = exists_and_writable (xmlpath);
+       _writable = exists_and_writable (xmlpath) && exists_and_writable(Glib::path_get_dirname(xmlpath));
 
        if (!state_tree->read (xmlpath)) {
                error << string_compose(_("Could not understand session file %1"), xmlpath) << endmsg;
@@ -957,7 +928,7 @@ Session::state (bool full_state)
                                p += (*i).path;
 
                                if (next != session_dirs.end()) {
-                                       p += ':';
+                                       p += G_SEARCHPATH_SEPARATOR;
                                } else {
                                        break;
                                }
@@ -1352,13 +1323,7 @@ Session::set_state (const XMLNode& node, int version)
        if ((child = find_named_node (node, "Click")) == 0) {
                warning << _("Session: XML state has no click section") << endmsg;
        } else if (_click_io) {
-               const XMLNodeList& children (child->children());
-               XMLNodeList::const_iterator i = children.begin();
-               _click_io->set_state (**i, version);
-               ++i;
-               if (i != children.end()) {
-                       _click_gain->set_state (**i, version);
-               }
+               setup_click_state (&node);
        }
 
        if ((child = find_named_node (node, ControlProtocolManager::state_node_name)) != 0) {
@@ -2082,6 +2047,54 @@ Session::refresh_disk_space ()
                        _total_free_4k_blocks_uncertain = true;
                }
        }
+#elif defined (COMPILER_MSVC)
+       vector<string> scanned_volumes;
+       vector<string>::iterator j;
+       vector<space_and_path>::iterator i;
+    DWORD nSectorsPerCluster, nBytesPerSector,
+          nFreeClusters, nTotalClusters;
+    char disk_drive[4];
+       bool volume_found;
+
+       _total_free_4k_blocks = 0;
+
+       for (i = session_dirs.begin(); i != session_dirs.end(); i++) {
+               strncpy (disk_drive, (*i).path.c_str(), 3);
+               disk_drive[3] = 0;
+               strupr(disk_drive);
+
+               volume_found = false;
+               if (0 != (GetDiskFreeSpace(disk_drive, &nSectorsPerCluster, &nBytesPerSector, &nFreeClusters, &nTotalClusters)))
+               {
+                       int64_t nBytesPerCluster = nBytesPerSector * nSectorsPerCluster;
+                       int64_t nFreeBytes = nBytesPerCluster * (int64_t)nFreeClusters;
+                       i->blocks = (uint32_t)(nFreeBytes / 4096);
+
+                       for (j = scanned_volumes.begin(); j != scanned_volumes.end(); j++) {
+                               if (0 == j->compare(disk_drive)) {
+                                       volume_found = true;
+                                       break;
+                               }
+                       }
+
+                       if (!volume_found) {
+                               scanned_volumes.push_back(disk_drive);
+                               _total_free_4k_blocks += i->blocks;
+                       }
+               }
+       }
+
+       if (0 == _total_free_4k_blocks) {
+               strncpy (disk_drive, path().c_str(), 3);
+               disk_drive[3] = 0;
+
+               if (0 != (GetDiskFreeSpace(disk_drive, &nSectorsPerCluster, &nBytesPerSector, &nFreeClusters, &nTotalClusters)))
+               {
+                       int64_t nBytesPerCluster = nBytesPerSector * nSectorsPerCluster;
+                       int64_t nFreeBytes = nBytesPerCluster * (int64_t)nFreeClusters;
+                       _total_free_4k_blocks = (uint32_t)(nFreeBytes / 4096);
+               }
+       }
 #endif
 }
 
@@ -2268,7 +2281,7 @@ Session::auto_save()
 }
 
 static bool
-state_file_filter (const string &str, void */*arg*/)
+state_file_filter (const string &str, void/*arg*/)
 {
        return (str.length() > strlen(statefile_suffix) &&
                str.find (statefile_suffix) == (str.length() - strlen (statefile_suffix)));
@@ -2445,7 +2458,7 @@ Session::commit_reversible_command (Command *cmd)
 }
 
 static bool
-accept_all_audio_files (const string& path, void */*arg*/)
+accept_all_audio_files (const string& path, void/*arg*/)
 {
         if (!Glib::file_test (path, Glib::FILE_TEST_IS_REGULAR)) {
                 return false;
@@ -2459,7 +2472,7 @@ accept_all_audio_files (const string& path, void */*arg*/)
 }
 
 static bool
-accept_all_midi_files (const string& path, void */*arg*/)
+accept_all_midi_files (const string& path, void/*arg*/)
 {
         if (!Glib::file_test (path, Glib::FILE_TEST_IS_REGULAR)) {
                 return false;
@@ -2471,7 +2484,7 @@ accept_all_midi_files (const string& path, void */*arg*/)
 }
 
 static bool
-accept_all_state_files (const string& path, void */*arg*/)
+accept_all_state_files (const string& path, void/*arg*/)
 {
         if (!Glib::file_test (path, Glib::FILE_TEST_IS_REGULAR)) {
                 return false;
@@ -2627,6 +2640,8 @@ Session::cleanup_sources (CleanupReport& rep)
        bool used;
        string spath;
        int ret = -1;
+       string tmppath1;
+       string tmppath2;
 
        _state_of_the_state = (StateOfTheState) (_state_of_the_state | InCleanup);
 
@@ -2677,7 +2692,7 @@ Session::cleanup_sources (CleanupReport& rep)
                audio_path += sdir.sound_path();
 
                if (nexti != session_dirs.end()) {
-                       audio_path += ':';
+                       audio_path += G_SEARCHPATH_SEPARATOR;
                }
 
                i = nexti;
@@ -2695,7 +2710,7 @@ Session::cleanup_sources (CleanupReport& rep)
                midi_path += sdir.midi_path();
 
                if (nexti != session_dirs.end()) {
-                       midi_path += ':';
+                       midi_path += G_SEARCHPATH_SEPARATOR;
                }
 
                i = nexti;
@@ -2733,27 +2748,28 @@ Session::cleanup_sources (CleanupReport& rep)
                 ++tmp;
 
                if ((fs = boost::dynamic_pointer_cast<FileSource> (i->second)) != 0) {
-                        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.
-                                */
+                       if (!fs->is_stub()) {
 
-                                RegionFactory::remove_regions_using_source (i->second);
-                                sources.erase (i);
-                        }
+                               if (playlists->source_use_count (fs) != 0) {
+                                       all_sources.insert (fs->path());
+                               } else {
+                                       
+                                       /* we might not remove this source from disk, because it may be used
+                                          by other snapshots, but its not being used in this version
+                                          so lets get rid of it now, along with any representative regions
+                                          in the region list.
+                                       */
+                                       
+                                       RegionFactory::remove_regions_using_source (i->second);
+                                       sources.erase (i);
+                               }
+                       }
                }
 
                 i = tmp;
        }
 
-       char tmppath1[PATH_MAX+1];
-       char tmppath2[PATH_MAX+1];
-
         if (candidates) {
                 for (vector<string*>::iterator x = candidates->begin(); x != candidates->end(); ++x) {
 
@@ -2762,19 +2778,10 @@ Session::cleanup_sources (CleanupReport& rep)
 
                         for (set<string>::iterator i = all_sources.begin(); i != all_sources.end(); ++i) {
 
-                                if (realpath(spath.c_str(), tmppath1) == 0) {
-                                        error << string_compose (_("Cannot expand path %1 (%2)"),
-                                                                 spath, strerror (errno)) << endmsg;
-                                        continue;
-                                }
-
-                                if (realpath((*i).c_str(),  tmppath2) == 0) {
-                                        error << string_compose (_("Cannot expand path %1 (%2)"),
-                                                                 (*i), strerror (errno)) << endmsg;
-                                        continue;
-                                }
+                               tmppath1 = canonical_path (spath);
+                               tmppath2 = canonical_path ((*i));
 
-                                if (strcmp(tmppath1, tmppath2) == 0) {
+                               if (tmppath1 == tmppath2) {
                                         used = true;
                                         break;
                                 }
@@ -2878,7 +2885,7 @@ Session::cleanup_sources (CleanupReport& rep)
                string peakpath = peak_path (base);
 
                if (Glib::file_test (peakpath.c_str(), Glib::FILE_TEST_EXISTS)) {
-                       if (::unlink (peakpath.c_str()) != 0) {
+                       if (::g_unlink (peakpath.c_str()) != 0) {
                                error << string_compose (_("cannot remove peakfile %1 for %2 (%3)"),
                                                          peakpath, _path, strerror (errno))
                                      << endmsg;
@@ -3485,22 +3492,6 @@ Session::config_changed (std::string p, bool ours)
                /* XXX DO SOMETHING HERE TO TELL THE GUI THAT WE NEED
                   TO SET REMOTE ID'S
                */
-       } else if (p == "sync-all-route-ordering") {
-
-               /* sync to editor order unless mixer is used for remote IDs 
-                */
-
-               switch (Config->get_remote_model()) {
-               case UserOrdered:
-                       sync_order_keys (EditorSort);
-                       break;
-               case EditorOrdered:
-                       sync_order_keys (EditorSort);
-                       break;
-               case MixerOrdered:
-                       sync_order_keys (MixerSort);
-               }
-                       
        } else if (p == "initial-program-change") {
 
                if (_mmc->output_port() && Config->get_initial_program_change() >= 0) {
@@ -3573,6 +3564,9 @@ Session::load_diskstreams_2X (XMLNode const & node, int)
 void
 Session::setup_midi_machine_control ()
 {
+       _mmc = new MIDI::MachineControl;
+       _mmc->set_ports (_midi_ports->mmc_input_port(), _midi_ports->mmc_output_port());
+
        _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->Stop.connect_same_thread (*this, boost::bind (&Session::mmc_stop, this, _1));
@@ -3620,8 +3614,6 @@ Session::rename (const std::string& new_name)
 
        string const old_sources_root = _session_dir->sources_root();
 
-#define RENAME ::rename
-
        /* Rename:
 
         * session directory
@@ -3683,7 +3675,8 @@ Session::rename (const std::string& new_name)
 
                cerr << "Rename " << oldstr << " => " << newstr << endl;                
 
-               if (RENAME (oldstr.c_str(), newstr.c_str()) != 0) {
+               if (::g_rename (oldstr.c_str(), newstr.c_str()) != 0) {
+                       error << string_compose (_("renaming %s as %2 failed (%3)"), oldstr, newstr, g_strerror (errno)) << endmsg;
                        return 1;
                }
 
@@ -3710,7 +3703,8 @@ Session::rename (const std::string& new_name)
                
                cerr << "Rename " << oldstr << " => " << newstr << endl;
                
-               if (RENAME (oldstr.c_str(), newstr.c_str()) != 0) {
+               if (::g_rename (oldstr.c_str(), newstr.c_str()) != 0) {
+                       error << string_compose (_("renaming %s as %2 failed (%3)"), oldstr, newstr, g_strerror (errno)) << endmsg;
                        return 1;
                }
        }
@@ -3722,7 +3716,8 @@ Session::rename (const std::string& new_name)
        
        cerr << "Rename " << oldstr << " => " << newstr << endl;                
 
-       if (RENAME (oldstr.c_str(), newstr.c_str()) != 0) {
+       if (::g_rename (oldstr.c_str(), newstr.c_str()) != 0) {
+               error << string_compose (_("renaming %s as %2 failed (%3)"), oldstr, newstr, g_strerror (errno)) << endmsg;
                return 1;
        }
 
@@ -3736,7 +3731,8 @@ Session::rename (const std::string& new_name)
                
                cerr << "Rename " << oldstr << " => " << newstr << endl;                
                
-               if (RENAME (oldstr.c_str(), newstr.c_str()) != 0) {
+               if (::g_rename (oldstr.c_str(), newstr.c_str()) != 0) {
+                       error << string_compose (_("renaming %s as %2 failed (%3)"), oldstr, newstr, g_strerror (errno)) << endmsg;
                        return 1;
                }
        }
@@ -3760,6 +3756,11 @@ Session::rename (const std::string& new_name)
        _current_snapshot_name = new_name;
        _name = new_name;
 
+       /* re-add directory separator - reverse hack to oldstr above */
+       if (_path[_path.length()-1] != G_DIR_SEPARATOR) {
+               _path += G_DIR_SEPARATOR;
+       }
+
        set_dirty ();
 
        /* save state again to get everything just right */
@@ -3772,6 +3773,69 @@ Session::rename (const std::string& new_name)
        store_recent_sessions (new_name, _path);
 
        return 0;
+}
+
+int
+Session::get_session_info_from_path (XMLTree& tree, const string& xmlpath)
+{
+       if (!Glib::file_test (xmlpath, Glib::FILE_TEST_EXISTS)) {
+               return -1;
+        }
+
+       if (!tree.read (xmlpath)) {
+               return -1;
+       }
+
+       return 0;
+}
+
+int
+Session::get_info_from_path (const string& xmlpath, float& sample_rate, SampleFormat& data_format)
+{
+       XMLTree tree;
+       bool found_sr = false;
+       bool found_data_format = false;
+
+       if (get_session_info_from_path (tree, xmlpath)) {
+               return -1;
+       }
+
+       /* sample rate */
+
+       const XMLProperty* prop;
+       if ((prop = tree.root()->property (X_("sample-rate"))) != 0) {          
+               sample_rate = atoi (prop->value());
+               found_sr = true;
+       }
+
+       const XMLNodeList& children (tree.root()->children());
+       for (XMLNodeList::const_iterator c = children.begin(); c != children.end(); ++c) {
+               const XMLNode* child = *c;
+               if (child->name() == "Config") {
+                       const XMLNodeList& options (child->children());
+                       for (XMLNodeList::const_iterator oc = options.begin(); oc != options.end(); ++oc) {
+                               const XMLNode* option = *oc;
+                               const XMLProperty* name = option->property("name");
+
+                               if (!name) {
+                                       continue;
+                               }
+
+                               if (name->value() == "native-file-data-format") {
+                                       const XMLProperty* value = option->property ("value");
+                                       if (value) {
+                                               SampleFormat fmt = (SampleFormat) string_2_enum (option->property ("value")->value(), fmt);
+                                               data_format = fmt;
+                                               found_data_format = true;
+                                               break;
+                                       }
+                               }
+                       }
+               }
+               if (found_data_format) {
+                       break;
+               }
+       }
 
-#undef RENAME
+       return !(found_sr && found_data_format); // zero if they are both found
 }