mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-16 11:46:25 +01:00
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 :(
*
*/
This commit is contained in:
parent
9ec031cfce
commit
19a2d384fc
2 changed files with 634 additions and 662 deletions
|
|
@ -53,21 +53,21 @@ class Crossfade;
|
||||||
|
|
||||||
namespace Properties {
|
namespace Properties {
|
||||||
/* fake the type, since regions are handled by SequenceProperty which doesn't
|
/* 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;
|
LIBARDOUR_API extern PBD::PropertyDescriptor<bool> regions;
|
||||||
}
|
}
|
||||||
|
|
||||||
class LIBARDOUR_API RegionListProperty : public PBD::SequenceProperty<std::list<boost::shared_ptr<Region> > >
|
class LIBARDOUR_API RegionListProperty : public PBD::SequenceProperty<std::list<boost::shared_ptr<Region> > >
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
RegionListProperty (Playlist&);
|
RegionListProperty (Playlist&);
|
||||||
|
|
||||||
RegionListProperty* clone () const;
|
RegionListProperty* clone () const;
|
||||||
void get_content_as_xml (boost::shared_ptr<Region>, XMLNode &) const;
|
void get_content_as_xml (boost::shared_ptr<Region>, XMLNode &) const;
|
||||||
boost::shared_ptr<Region> get_content_from_xml (XMLNode const &) const;
|
boost::shared_ptr<Region> get_content_from_xml (XMLNode const &) const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
RegionListProperty* create () const;
|
RegionListProperty* create () const;
|
||||||
|
|
||||||
/* copy construction only by ourselves */
|
/* copy construction only by ourselves */
|
||||||
|
|
@ -254,36 +254,36 @@ public:
|
||||||
|
|
||||||
void set_capture_insertion_in_progress (bool yn);
|
void set_capture_insertion_in_progress (bool yn);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
friend class Session;
|
friend class Session;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
class RegionReadLock : public Glib::Threads::RWLock::ReaderLock {
|
class RegionReadLock : public Glib::Threads::RWLock::ReaderLock {
|
||||||
public:
|
public:
|
||||||
RegionReadLock (Playlist *pl) : Glib::Threads::RWLock::ReaderLock (pl->region_lock) {}
|
RegionReadLock (Playlist *pl) : Glib::Threads::RWLock::ReaderLock (pl->region_lock) {}
|
||||||
~RegionReadLock() {}
|
~RegionReadLock() {}
|
||||||
};
|
};
|
||||||
|
|
||||||
class RegionWriteLock : public Glib::Threads::RWLock::WriterLock {
|
class RegionWriteLock : public Glib::Threads::RWLock::WriterLock {
|
||||||
public:
|
public:
|
||||||
RegionWriteLock (Playlist *pl, bool do_block_notify = true)
|
RegionWriteLock (Playlist *pl, bool do_block_notify = true)
|
||||||
: Glib::Threads::RWLock::WriterLock (pl->region_lock)
|
: Glib::Threads::RWLock::WriterLock (pl->region_lock)
|
||||||
, playlist (pl)
|
, playlist (pl)
|
||||||
, block_notify (do_block_notify) {
|
, block_notify (do_block_notify) {
|
||||||
if (block_notify) {
|
if (block_notify) {
|
||||||
playlist->delay_notifications();
|
playlist->delay_notifications();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
~RegionWriteLock() {
|
~RegionWriteLock() {
|
||||||
Glib::Threads::RWLock::WriterLock::release ();
|
Glib::Threads::RWLock::WriterLock::release ();
|
||||||
if (block_notify) {
|
if (block_notify) {
|
||||||
playlist->release_notifications ();
|
playlist->release_notifications ();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Playlist *playlist;
|
Playlist *playlist;
|
||||||
bool block_notify;
|
bool block_notify;
|
||||||
};
|
};
|
||||||
|
|
||||||
RegionListProperty regions; /* the current list of regions in the playlist */
|
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 */
|
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>) {}
|
virtual void pre_uncombine (std::vector<boost::shared_ptr<Region> >&, boost::shared_ptr<Region>) {}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
friend class RegionReadLock;
|
friend class RegionReadLock;
|
||||||
friend class RegionWriteLock;
|
friend class RegionWriteLock;
|
||||||
mutable Glib::Threads::RWLock region_lock;
|
mutable Glib::Threads::RWLock region_lock;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void setup_layering_indices (RegionList const &);
|
void setup_layering_indices (RegionList const &);
|
||||||
void coalesce_and_check_crossfades (std::list<Evoral::Range<samplepos_t> >);
|
void coalesce_and_check_crossfades (std::list<Evoral::Range<samplepos_t> >);
|
||||||
boost::shared_ptr<RegionList> find_regions_at (samplepos_t);
|
boost::shared_ptr<RegionList> find_regions_at (samplepos_t);
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue