summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour/playlist.h
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2018-12-21 16:35:07 +0100
committerRobin Gareus <robin@gareus.org>2018-12-21 17:33:55 +0100
commit19a2d384fc11348aaa17a0e398bf05750d9f8edd (patch)
treefb9093e64cc13645be3c17693ef357eb20172073 /libs/ardour/ardour/playlist.h
parent9ec031cfce1d3eba9eb5e9d96d6ea3d4b1b256b7 (diff)
NO-OP: whitespace
* Remove leading and trailing whitespace. * use tabs to indent, space to align /* prefer C-style comments like this, * always use an asterisk on every line, this * way small ASCII-graphics are always aligned * using spaces after the asterisk. * * ^ * / \ * / \ * / \ * / \ * / \ * / /\ \ * /__/ \_/\_^__\ * A R D O U R * << NO asterisk, there may be tabs :( * */
Diffstat (limited to 'libs/ardour/ardour/playlist.h')
-rw-r--r--libs/ardour/ardour/playlist.h68
1 files changed, 34 insertions, 34 deletions
diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h
index a8fabd7e65..22e8e67552 100644
--- a/libs/ardour/ardour/playlist.h
+++ b/libs/ardour/ardour/playlist.h
@@ -53,21 +53,21 @@ class Crossfade;
namespace Properties {
/* fake the type, since regions are handled by SequenceProperty which doesn't
- care about such things.
- */
+ * care about such things.
+ */
LIBARDOUR_API extern PBD::PropertyDescriptor<bool> regions;
}
class LIBARDOUR_API RegionListProperty : public PBD::SequenceProperty<std::list<boost::shared_ptr<Region> > >
{
- public:
+public:
RegionListProperty (Playlist&);
RegionListProperty* clone () const;
void get_content_as_xml (boost::shared_ptr<Region>, XMLNode &) const;
boost::shared_ptr<Region> get_content_from_xml (XMLNode const &) const;
- private:
+private:
RegionListProperty* create () const;
/* copy construction only by ourselves */
@@ -254,36 +254,36 @@ public:
void set_capture_insertion_in_progress (bool yn);
- protected:
+protected:
friend class Session;
- protected:
- class RegionReadLock : public Glib::Threads::RWLock::ReaderLock {
- public:
- RegionReadLock (Playlist *pl) : Glib::Threads::RWLock::ReaderLock (pl->region_lock) {}
- ~RegionReadLock() {}
- };
-
- class RegionWriteLock : public Glib::Threads::RWLock::WriterLock {
- public:
- RegionWriteLock (Playlist *pl, bool do_block_notify = true)
- : Glib::Threads::RWLock::WriterLock (pl->region_lock)
- , playlist (pl)
- , block_notify (do_block_notify) {
- if (block_notify) {
- playlist->delay_notifications();
- }
- }
-
- ~RegionWriteLock() {
- Glib::Threads::RWLock::WriterLock::release ();
- if (block_notify) {
- playlist->release_notifications ();
- }
- }
- Playlist *playlist;
- bool block_notify;
- };
+protected:
+ class RegionReadLock : public Glib::Threads::RWLock::ReaderLock {
+ public:
+ RegionReadLock (Playlist *pl) : Glib::Threads::RWLock::ReaderLock (pl->region_lock) {}
+ ~RegionReadLock() {}
+ };
+
+ class RegionWriteLock : public Glib::Threads::RWLock::WriterLock {
+ public:
+ RegionWriteLock (Playlist *pl, bool do_block_notify = true)
+ : Glib::Threads::RWLock::WriterLock (pl->region_lock)
+ , playlist (pl)
+ , block_notify (do_block_notify) {
+ if (block_notify) {
+ playlist->delay_notifications();
+ }
+ }
+
+ ~RegionWriteLock() {
+ Glib::Threads::RWLock::WriterLock::release ();
+ if (block_notify) {
+ playlist->release_notifications ();
+ }
+ }
+ Playlist *playlist;
+ bool block_notify;
+ };
RegionListProperty regions; /* the current list of regions in the playlist */
std::set<boost::shared_ptr<Region> > all_regions; /* all regions ever added to this playlist */
@@ -410,12 +410,12 @@ public:
*/
virtual void pre_uncombine (std::vector<boost::shared_ptr<Region> >&, boost::shared_ptr<Region>) {}
- private:
+private:
friend class RegionReadLock;
friend class RegionWriteLock;
mutable Glib::Threads::RWLock region_lock;
- private:
+private:
void setup_layering_indices (RegionList const &);
void coalesce_and_check_crossfades (std::list<Evoral::Range<samplepos_t> >);
boost::shared_ptr<RegionList> find_regions_at (samplepos_t);