diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-03-04 21:57:29 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-03-04 21:57:29 +0000 |
| commit | 91ff55bd89d44bf6d9ec222ac531f71f5700a91b (patch) | |
| tree | c79a17351fae25512828475fcb7cda2149cab0e7 /libs | |
| parent | ae85663fa7d8951ea9363eb40bd05c480bae7b92 (diff) | |
make notice about mismatched session/ardour versions more prominent, since you can guarantee that people are going to do this after release
git-svn-id: svn://localhost/ardour2/branches/3.0@14138 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/session.h | 5 | ||||
| -rw-r--r-- | libs/ardour/session.cc | 1 | ||||
| -rw-r--r-- | libs/ardour/session_state.cc | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index a012aac599..78c95acb33 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -845,6 +845,11 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi /** Emitted when the session wants Ardour to quit */ static PBD::Signal0<void> Quit; + /** Emitted when Ardour is asked to load a session in an older session + * format, and makes a backup copy. + */ + static PBD::Signal2<void,std::string,std::string> VersionMismatch; + boost::shared_ptr<Port> ltc_input_port() const; boost::shared_ptr<Port> ltc_output_port() const; diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 3281ff2f98..cb743cca62 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -119,6 +119,7 @@ PBD::Signal1<int,boost::shared_ptr<Playlist> > Session::AskAboutPlaylistDeletion PBD::Signal0<void> Session::Quit; PBD::Signal0<void> Session::FeedbackDetected; PBD::Signal0<void> Session::SuccessfulGraphSort; +PBD::Signal2<void,std::string,std::string> Session::VersionMismatch; static void clean_up_session_event (SessionEvent* ev) { delete ev; } const SessionEvent::RTeventCallback Session::rt_cleanup (clean_up_session_event); diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 7857e85f4c..74b56b787e 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -938,9 +938,7 @@ Session::load_state (string snapshot_name) if (!Glib::file_test (backup_path, Glib::FILE_TEST_EXISTS)) { - info << string_compose (_("Copying old session file %1 to %2\nUse %2 with %3 versions before 2.0 from now on"), - xmlpath, backup_path, PROGRAM_NAME) - << endmsg; + VersionMismatch (xmlpath, backup_path); if (!copy_file (xmlpath, backup_path)) {; return -1; |