(1) remove most uses of MementoCommand for Playlist and Region (2) move frozen state from Region into Stateful, renamed "suspend property changes" (3) successive changes to a Property (scalar) after clear_history() do not keep resetting the old value (fixes region trim)

git-svn-id: svn://localhost/ardour2/branches/3.0@6720 d708f5d6-7413-0410-9779-e7cbd77b26cf

6 files changed, 6 insertions, 14 deletions

diff --git a/libs/ardour/ardour/audio_track.h b/libs/ardour/ardour/audio_track.h
index fc5b4255b3..be8d988a41 100644
--- a/libs/ardour/ardour/audio_track.h
+++ b/libs/ardour/ardour/audio_track.h
@@ -49,7 +49,7 @@ class AudioTrack : public Track
 
 	int export_stuff (BufferSet& bufs, sframes_t start_frame, nframes_t nframes, bool enable_processing = true);
 
-	void freeze (InterThreadInfo&);
+	void freeze_me (InterThreadInfo&);
 	void unfreeze ();
 
 	boost::shared_ptr<Region> bounce (InterThreadInfo&);
diff --git a/libs/ardour/ardour/automation_list.h b/libs/ardour/ardour/automation_list.h
index 1778771c5f..79acedebf3 100644
--- a/libs/ardour/ardour/automation_list.h
+++ b/libs/ardour/ardour/automation_list.h
@@ -50,7 +50,6 @@ class AutomationList : public PBD::StatefulDestructible, public Evoral::ControlL
 	AutomationList& operator= (const AutomationList&);
 	bool operator== (const AutomationList&);
 
-	void freeze();
 	void thaw ();
 	void mark_dirty () const;
 
diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h
index bc636eea83..6f8fda78da 100644
--- a/libs/ardour/ardour/midi_track.h
+++ b/libs/ardour/ardour/midi_track.h
@@ -53,7 +53,7 @@ public:
 
 	int export_stuff (BufferSet& bufs, nframes_t nframes, sframes_t end_frame);
 
-	void freeze (InterThreadInfo&);
+	void freeze_me (InterThreadInfo&);
 	void unfreeze ();
 
 	boost::shared_ptr<Region> bounce (InterThreadInfo&);
diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h
index 1da185c6f2..09dd8f203c 100644
--- a/libs/ardour/ardour/region.h
+++ b/libs/ardour/ardour/region.h
@@ -93,9 +93,6 @@ class Region
 
         PBD::PropertyList* property_factory (const XMLNode&) const;
 
-	void unlock_property_changes () { _no_property_changes = false; }
-	void block_property_changes () { _no_property_changes = true; }
-	
 	virtual ~Region();
 	
 	/** Note: changing the name of a Region does not constitute an edit */
@@ -156,8 +153,7 @@ class Region
 	void set_position_lock_style (PositionLockStyle ps);
 	void recompute_position_from_lock_style ();
 
-	void freeze ();
-	void thaw ();
+	void suspend_property_changes ();
 
 	bool covers (framepos_t frame) const {
 		return first_frame() <= frame && frame <= last_frame();
@@ -288,6 +284,7 @@ class Region
 
   protected:
 	void send_change (const PBD::PropertyChange&);
+        void mid_thaw (const PBD::PropertyChange&);
 
 	void trim_to_internal (framepos_t position, framecnt_t length, void *src);
 	virtual void set_position_internal (framepos_t pos, bool allow_bbt_recompute);
@@ -304,7 +301,6 @@ class Region
 	virtual void recompute_at_end () = 0;
 	
 	DataType                _type;
-	bool                    _no_property_changes;
 
 	PBD::Property<bool>        _muted;
 	PBD::Property<bool>        _opaque;
@@ -332,14 +328,11 @@ class Region
 	framepos_t              _last_position;
 	PositionLockStyle       _positional_lock_style;
 	mutable RegionEditState _first_edit;
-	int                     _frozen;
 	BBT_Time                _bbt_time;
 	AnalysisFeatureList     _transients;
 	bool                    _valid_transients;
 	mutable uint64_t        _read_data_count;  ///< modified in read()
-	PBD::PropertyChange     _pending_changed;
 	uint64_t                _last_layer_op;  ///< timestamp
-	Glib::Mutex             _lock;
 	SourceList              _sources;
 	/** Used when timefx are applied, so we can always use the original source */
 	SourceList              _master_sources;
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index d26c84a795..cf88f2e6bd 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -603,7 +603,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 	boost::shared_ptr<Region> write_one_track (AudioTrack&, nframes_t start, nframes_t end,
 			bool overwrite, std::vector<boost::shared_ptr<Source> >&, InterThreadInfo& wot,
 			bool enable_processing = true);
-	int freeze (InterThreadInfo&);
+	int freeze_all (InterThreadInfo&);
 
 	/* session-wide solo/mute/rec-enable */
 
diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h
index 0ed4b8c70b..eee9f03fe5 100644
--- a/libs/ardour/ardour/track.h
+++ b/libs/ardour/ardour/track.h
@@ -74,7 +74,7 @@ class Track : public Route
 
 	FreezeState freeze_state() const;
 
-	virtual void freeze (InterThreadInfo&) = 0;
+	virtual void freeze_me (InterThreadInfo&) = 0;
 	virtual void unfreeze () = 0;
 
 	virtual boost::shared_ptr<Region> bounce (InterThreadInfo&) = 0;