summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour/region.h
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2010-02-10 01:38:20 +0000
committerCarl Hetherington <carl@carlh.net>2010-02-10 01:38:20 +0000
commit3c00a7ca2ae34cb65c8d3394d9a012f20c69ee77 (patch)
tree54257f7655152fab7fbe97a75ce24faf15485d49 /libs/ardour/ardour/region.h
parentc9d433d9b3f166e761bfc1b4765cc51b0a521e7d (diff)
Move ARDOUR::Change into PBD so that Stateful can be aware of
what Change a State reflects. Hence allow Stateful to do some of the work of set/get_state in Region. git-svn-id: svn://localhost/ardour2/branches/3.0@6671 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/region.h')
-rw-r--r--libs/ardour/ardour/region.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h
index 7060607a8d..414a1723f9 100644
--- a/libs/ardour/ardour/region.h
+++ b/libs/ardour/ardour/region.h
@@ -87,15 +87,15 @@ class Region
static const Flag DefaultFlags = Flag (Opaque|DefaultFadeIn|DefaultFadeOut|FadeIn|FadeOut);
- static Change FadeChanged;
- static Change SyncOffsetChanged;
- static Change MuteChanged;
- static Change OpacityChanged;
- static Change LockChanged;
- static Change LayerChanged;
- static Change HiddenChanged;
-
- PBD::Signal1<void,Change> StateChanged;
+ static PBD::Change FadeChanged;
+ static PBD::Change SyncOffsetChanged;
+ static PBD::Change MuteChanged;
+ static PBD::Change OpacityChanged;
+ static PBD::Change LockChanged;
+ static PBD::Change LayerChanged;
+ static PBD::Change HiddenChanged;
+
+ PBD::Signal1<void,PBD::Change> StateChanged;
static PBD::Signal1<void,boost::shared_ptr<ARDOUR::Region> > RegionPropertyChanged;
void unlock_property_changes () { _flags = Flag (_flags & ~DoNotSendPropertyChanges); }
void block_property_changes () { _flags = Flag (_flags | DoNotSendPropertyChanges); }
@@ -242,7 +242,7 @@ class Region
XMLNode& get_state ();
virtual XMLNode& state (bool);
virtual int set_state (const XMLNode&, int version);
- virtual int set_live_state (const XMLNode&, int version, Change&, bool send);
+ virtual int set_live_state (const XMLNode&, int version, PBD::Change&, bool send);
virtual boost::shared_ptr<Region> get_parent() const;
@@ -296,7 +296,7 @@ class Region
XMLNode& get_short_state (); /* used only by Session */
- void send_change (Change);
+ void send_change (PBD::Change);
void trim_to_internal (nframes_t position, nframes_t length, void *src);
virtual void set_position_internal (nframes_t pos, bool allow_bbt_recompute);
@@ -333,7 +333,7 @@ class Region
AnalysisFeatureList _transients;
bool _valid_transients;
mutable uint32_t _read_data_count; ///< modified in read()
- Change _pending_changed;
+ PBD::Change _pending_changed;
uint64_t _last_layer_op; ///< timestamp
Glib::Mutex _lock;
SourceList _sources;