allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

make notice about mismatched session/ardour versions more prominent, since you can guarantee that people are going to do this after release

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@14138 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis
2013-03-04 21:57:29 +00:00
parent ae85663fa7
commit 91ff55bd89
6 changed files with 45 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/ardour/ardour/session.h
View File

@@ -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;

1
libs/ardour/session.cc
View File

@@ -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);

4
libs/ardour/session_state.cc
View File

@@ -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;