diff options
author | David Robillard <d@drobilla.net> | 2006-10-21 22:59:29 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2006-10-21 22:59:29 +0000 |
commit | 22e41063d5b0c4c80eab3e3a375b734ca7d76169 (patch) | |
tree | e95cc99ff4e2f12bb41d1fdb0d1abf9525e92416 /libs/ardour/ardour/audioregion.h | |
parent | fedf3d34f32264ac57c6a222b678dc90f2bb1a88 (diff) |
Merged with trunk R999.
git-svn-id: svn://localhost/ardour2/branches/midi@1000 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/audioregion.h')
-rw-r--r-- | libs/ardour/ardour/audioregion.h | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h index 3ac62da2ca..e14cfd0180 100644 --- a/libs/ardour/ardour/audioregion.h +++ b/libs/ardour/ardour/audioregion.h @@ -42,18 +42,6 @@ class Session; class AudioFilter; class AudioSource; -struct AudioRegionState : public RegionState -{ - AudioRegionState (std::string why); - - Curve _fade_in; - Curve _fade_out; - Curve _envelope; - gain_t _scale_amplitude; - uint32_t _fade_in_disabled; - uint32_t _fade_out_disabled; -}; - class AudioRegion : public Region { public: @@ -125,8 +113,6 @@ class AudioRegion : public Region int separate_by_channel (ARDOUR::Session&, vector<AudioRegion*>&) const; - UndoAction get_memento() const; - /* filter */ int apply (AudioFilter&); @@ -159,9 +145,6 @@ class AudioRegion : public Region void set_default_fade_out (); void set_default_envelope (); - StateManager::State* state_factory (std::string why) const; - Change restore_state (StateManager::State&); - void recompute_gain_at_end (); void recompute_gain_at_start (); @@ -185,6 +168,9 @@ class AudioRegion : public Region gain_t _scale_amplitude; uint32_t _fade_in_disabled; uint32_t _fade_out_disabled; + + protected: + int set_live_state (const XMLNode&, Change&, bool send); }; } /* namespace ARDOUR */ |