From a5efa9a500d2c1b592656e91e9ea7ef7d535dcb3 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 14 Jul 2011 17:41:06 +0000 Subject: initial pass at session-renaming functionality git-svn-id: svn://localhost/ardour2/branches/3.0@9876 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/ardour/session.h | 1 + libs/ardour/ardour/session_directory.h | 7 +- libs/ardour/midi_source.cc | 3 +- libs/ardour/midi_stretch.cc | 4 +- libs/ardour/session_directory.cc | 7 ++ libs/ardour/session_state.cc | 147 ++++++++++++++++++++++++++++++++- libs/ardour/smf_source.cc | 4 +- 7 files changed, 165 insertions(+), 8 deletions(-) (limited to 'libs/ardour') diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 6b9010642c..1daa82dc48 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -372,6 +372,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi void remove_state (std::string snapshot_name); void rename_state (std::string old_name, std::string new_name); void remove_pending_capture_state (); + int rename (const std::string&); static int rename_template (std::string old_name, std::string new_name); static int delete_template (std::string name); diff --git a/libs/ardour/ardour/session_directory.h b/libs/ardour/ardour/session_directory.h index 49ef879ea1..16d7115aee 100644 --- a/libs/ardour/ardour/session_directory.h +++ b/libs/ardour/ardour/session_directory.h @@ -35,6 +35,11 @@ public: */ SessionDirectory (const PBD::sys::path& session_path); + /** + * Change the root path of this SessionDirectory object + */ + SessionDirectory& operator= (const std::string& path); + /** * @return the absolute path to the root directory of the session */ @@ -124,7 +129,7 @@ protected: const std::vector sub_directories () const; /// The path to the root of the session directory. - const PBD::sys::path m_root_path; + PBD::sys::path m_root_path; }; } // namespace ARDOUR diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc index 4c7abd22d8..56d31ddee7 100644 --- a/libs/ardour/midi_source.cc +++ b/libs/ardour/midi_source.cc @@ -265,6 +265,7 @@ framecnt_t MidiSource::midi_write (MidiRingBuffer& source, framepos_t source_start, framecnt_t duration) { Glib::Mutex::Lock lm (_lock); + cerr << "MidiSource calling write unlocked\n"; const framecnt_t ret = write_unlocked (source, source_start, duration); _last_write_end += duration; return ret; @@ -310,7 +311,7 @@ void MidiSource::mark_streaming_write_completed () { if (_model) { - _model->end_write(false); + _model->end_write (false); } _writing = false; diff --git a/libs/ardour/midi_stretch.cc b/libs/ardour/midi_stretch.cc index 4d893d526e..4dfab65fd4 100644 --- a/libs/ardour/midi_stretch.cc +++ b/libs/ardour/midi_stretch.cc @@ -103,8 +103,8 @@ MidiStretch::run (boost::shared_ptr r, Progress* progress) new_model->append(ev, Evoral::next_event_id()); } - new_model->end_write(); - new_model->set_edited(true); + new_model->end_write (); + new_model->set_edited (true); new_src->copy_interpolation_from (src); diff --git a/libs/ardour/session_directory.cc b/libs/ardour/session_directory.cc index 8996b74f61..36a01fb77d 100644 --- a/libs/ardour/session_directory.cc +++ b/libs/ardour/session_directory.cc @@ -37,6 +37,13 @@ SessionDirectory::SessionDirectory (const path& session_path) } +SessionDirectory& +SessionDirectory::operator= (const std::string& newpath) +{ + m_root_path = newpath; + return *this; +} + bool SessionDirectory::create () { diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 8022c7670c..c8323047eb 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -48,6 +48,8 @@ #include #endif +#include + #include #include @@ -817,7 +819,7 @@ Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot } else { - if (rename (tmp_path.to_string().c_str(), xml_path.to_string().c_str()) != 0) { + if (::rename (tmp_path.to_string().c_str(), xml_path.to_string().c_str()) != 0) { error << string_compose (_("could not rename temporary session file %1 to %2"), tmp_path.to_string(), xml_path.to_string()) << endmsg; sys::remove (tmp_path); @@ -2950,7 +2952,7 @@ Session::cleanup_sources (CleanupReport& rep) peakpath, _path, strerror (errno)) << endmsg; /* try to back out */ - rename (newpath.c_str(), _path.c_str()); + ::rename (newpath.c_str(), _path.c_str()); goto out; } } @@ -3654,3 +3656,144 @@ Session::solo_cut_control() const return _solo_cut_control; } + +int +Session::rename (const std::string& new_name) +{ + string legal_name = legalize_for_path (new_name); + string newpath; + string oldstr; + string newstr; + bool first = true; + +#define RENAME ::rename + + /* Rename: + + * session directory + * interchange subdirectory + * session file + * session history + + * Backup files are left unchanged and not renamed. + */ + + /* pass one: not 100% safe check that the new directory names don't + * already exist ... + */ + + for (vector::const_iterator i = session_dirs.begin(); i != session_dirs.end(); ++i) { + vector 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 ... + */ + + if (oldstr[oldstr.length()-1] == G_DIR_SEPARATOR) { + oldstr = oldstr.substr (0, oldstr.length() - 1); + } + + string base = Glib::path_get_dirname (oldstr); + string p = Glib::path_get_basename (oldstr); + + newstr = Glib::build_filename (base, legal_name); + + if (Glib::file_test (newstr, Glib::FILE_TEST_EXISTS)) { + return -1; + } + } + + /* Session dirs */ + + for (vector::const_iterator i = session_dirs.begin(); i != session_dirs.end(); ++i) { + vector 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 ... + */ + + if (oldstr[oldstr.length()-1] == G_DIR_SEPARATOR) { + oldstr = oldstr.substr (0, oldstr.length() - 1); + } + + string base = Glib::path_get_dirname (oldstr); + string p = Glib::path_get_basename (oldstr); + + newstr = Glib::build_filename (base, legal_name); + + cerr << "Rename " << oldstr << " => " << newstr << endl; + + if (RENAME (oldstr.c_str(), newstr.c_str()) != 0) { + return 1; + } + + if (first) { + (*_session_dir) = newstr; + newpath = newstr; + first = 1; + } + + /* directory below interchange */ + + v.push_back (newstr); + v.push_back (interchange_dir_name); + v.push_back (p); + + oldstr = Glib::build_filename (v); + + v.clear (); + v.push_back (newstr); + v.push_back (interchange_dir_name); + v.push_back (legal_name); + + newstr = Glib::build_filename (v); + + cerr << "Rename " << oldstr << " => " << newstr << endl; + + if (RENAME (oldstr.c_str(), newstr.c_str()) != 0) { + return 1; + } + } + + /* state file */ + + oldstr = Glib::build_filename (newpath, _current_snapshot_name) + statefile_suffix; + newstr= Glib::build_filename (newpath, legal_name) + statefile_suffix; + + cerr << "Rename " << oldstr << " => " << newstr << endl; + + if (RENAME (oldstr.c_str(), newstr.c_str()) != 0) { + return 1; + } + + /* history file */ + + oldstr = Glib::build_filename (newpath, _current_snapshot_name) + history_suffix; + newstr = Glib::build_filename (newpath, legal_name) + history_suffix; + + cerr << "Rename " << oldstr << " => " << newstr << endl; + + if (RENAME (oldstr.c_str(), newstr.c_str()) != 0) { + return 1; + } + + _path = newpath; + _current_snapshot_name = new_name; + _name = new_name; + + set_dirty (); + + /* save state again to get everything just right */ + + save_state (_current_snapshot_name); + + return 0; + +#undef RENAME +} diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc index 158c9c144d..9078a17608 100644 --- a/libs/ardour/smf_source.cc +++ b/libs/ardour/smf_source.cc @@ -551,8 +551,8 @@ SMFSource::load_model (bool lock, bool force_reload) have_event_id = false; } - //_model->end_write (_length_beats, false, true); - _model->end_write (false); + _model->end_write (_length_beats, false, true); + //_model->end_write (false); _model->set_edited (false); _model_iter = _model->begin(); -- cgit v1.2.3