diff options
author | David Robillard <d@drobilla.net> | 2007-04-22 18:01:10 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2007-04-22 18:01:10 +0000 |
commit | 490e18d80a22dda07bdf88dd440f7100897822de (patch) | |
tree | 21fd0236156d108bd4b7acc119e8c66f3adad492 /libs/ardour | |
parent | a9f5e379d27f74a1895a3b9d0fd8ef98c3b22e53 (diff) |
Merged with trunk R1736.
git-svn-id: svn://localhost/ardour2/branches/midi@1737 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour')
-rw-r--r-- | libs/ardour/ardour/configuration_vars.h | 2 | ||||
-rw-r--r-- | libs/ardour/ardour/session.h | 2 | ||||
-rw-r--r-- | libs/ardour/crossfade.cc | 2 | ||||
-rw-r--r-- | libs/ardour/session_state.cc | 10 |
4 files changed, 14 insertions, 2 deletions
diff --git a/libs/ardour/ardour/configuration_vars.h b/libs/ardour/ardour/configuration_vars.h index 62bf826dc9..395732e727 100644 --- a/libs/ardour/ardour/configuration_vars.h +++ b/libs/ardour/ardour/configuration_vars.h @@ -137,6 +137,8 @@ CONFIG_VARIABLE (bool, use_vst, "use-vst", true) CONFIG_VARIABLE (uint32_t, subframes_per_frame, "subframes-per-frame", 100) CONFIG_VARIABLE (uint32_t, saved_history_depth, "save-history-depth", 100) CONFIG_VARIABLE (bool, use_overlap_equivalency, "use-overlap-equivalency", false) +CONFIG_VARIABLE (bool, periodic_safety_backups, "periodic-safety-backups", true) +CONFIG_VARIABLE (uint32_t, periodic_safety_backup_interval, "periodic-safety-backup-interval", 120) /* BWAV */ diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 71f990928b..d173f43407 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -336,6 +336,8 @@ class Session : public PBD::StatefulDestructible void disable_record (bool rt_context, bool force = false); void step_back_from_record (); + void maybe_write_autosave (); + /* Proxy signal for region hidden changes */ sigc::signal<void,boost::shared_ptr<Region> > RegionHiddenChange; diff --git a/libs/ardour/crossfade.cc b/libs/ardour/crossfade.cc index d75758dfb0..f142d57628 100644 --- a/libs/ardour/crossfade.cc +++ b/libs/ardour/crossfade.cc @@ -548,7 +548,7 @@ Crossfade::compute (boost::shared_ptr<AudioRegion> a, boost::shared_ptr<AudioReg _in = bottom; _out = top; - _anchor_point = StartOfIn; + _anchor_point = EndOfOut; if (model == FullCrossfade) { _position = bottom->first_frame(); // "{" diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 609725c201..e60774e2b1 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -594,6 +594,14 @@ Session::load_diskstreams (const XMLNode& node) } void +Session::maybe_write_autosave() +{ + if (dirty() && record_status() != Recording) { + save_state("", true); + } +} + +void Session::remove_pending_capture_state () { string xml_path; @@ -700,7 +708,7 @@ Session::save_state (string snapshot_name, bool pending) tmp_path += snapshot_name; tmp_path += ".tmp"; - cerr << "actually writing state\n"; + cerr << "actually writing state to " << xml_path << endl; if (!tree.write (tmp_path)) { error << string_compose (_("state could not be saved to %1"), tmp_path) << endmsg; |