diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2011-05-25 18:51:00 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-05-25 18:51:00 +0000 |
commit | 9925ab554e65ac31a41eff1fa03a9c12aad1973e (patch) | |
tree | 401f1aafeceb160b3adb98de3a6a97889278b11a /libs/ardour/ardour | |
parent | 04b54f8dd1e1be93250b1fe0f133665d0ff493e4 (diff) |
logic to copy audio region fade in/fade out into compound regions (one-way for now)
git-svn-id: svn://localhost/ardour2/branches/3.0@9588 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r-- | libs/ardour/ardour/audioplaylist.h | 3 | ||||
-rw-r--r-- | libs/ardour/ardour/playlist.h | 3 | ||||
-rw-r--r-- | libs/ardour/ardour/region_sorters.h | 64 |
3 files changed, 70 insertions, 0 deletions
diff --git a/libs/ardour/ardour/audioplaylist.h b/libs/ardour/ardour/audioplaylist.h index b9ed739a79..a8426b5f51 100644 --- a/libs/ardour/ardour/audioplaylist.h +++ b/libs/ardour/ardour/audioplaylist.h @@ -106,6 +106,9 @@ public: void remove_dependents (boost::shared_ptr<Region> region); void copy_dependents (const std::vector<TwoRegions>&, boost::shared_ptr<Playlist>); + void pre_combine (std::vector<boost::shared_ptr<Region> >&, boost::shared_ptr<Region>); + void pre_uncombine (std::vector<boost::shared_ptr<Region> >&, boost::shared_ptr<Region>); + private: CrossfadeListProperty _crossfades; Crossfades _pending_xfade_adds; diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index 5406886faa..dfb16d79bc 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -390,6 +390,9 @@ public: framecnt_t length; framepos_t start; }; + + virtual void pre_combine (std::vector<boost::shared_ptr<Region> >&, boost::shared_ptr<Region>) {} + virtual void pre_uncombine (std::vector<boost::shared_ptr<Region> >&, boost::shared_ptr<Region>) {} }; } /* namespace ARDOUR */ diff --git a/libs/ardour/ardour/region_sorters.h b/libs/ardour/ardour/region_sorters.h new file mode 100644 index 0000000000..ca09f194b1 --- /dev/null +++ b/libs/ardour/ardour/region_sorters.h @@ -0,0 +1,64 @@ +/* + Copyright (C) 2000-2011 Paul Davis + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#ifndef __libardour_region_sorters_h__ +#define __libardour_region_sorters_h__ + +#include "ardour/region.h" + +namespace ARDOUR { + +struct RegionSortByPosition { + bool operator() (boost::shared_ptr<Region> a, boost::shared_ptr<Region> b) { + return a->position() < b->position(); + } +}; + +struct RegionSortByLastLayerOp { + bool operator() (boost::shared_ptr<Region> a, boost::shared_ptr<Region> b) { + return a->last_layer_op() < b->last_layer_op(); + } +}; + +struct RegionSortByLayer { + bool operator() (boost::shared_ptr<Region> a, boost::shared_ptr<Region> b) { + return a->layer() < b->layer(); + } +}; + +struct RegionSortByLayerWithPending { + bool operator () (boost::shared_ptr<Region> a, boost::shared_ptr<Region> b) { + + double p = a->layer (); + if (a->pending_explicit_relayer()) { + p += 0.5; + } + + double q = b->layer (); + if (b->pending_explicit_relayer()) { + q += 0.5; + } + + return p < q; + } +}; + +} // namespace + +#endif /* __libardour_region_sorters_h__ */ |