summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour/location.h
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2019-04-08 01:56:52 +0200
committerRobin Gareus <robin@gareus.org>2019-04-08 01:56:52 +0200
commit94409c80f3d42789e5d9246d7343dfa5354bc14e (patch)
treea7c3b82917d603b25bc95cf54726bd05fb4fd89e /libs/ardour/ardour/location.h
parente4f18c177161466d28e357bcfc5ad946c6f7634a (diff)
NO-OP: whitespace
Diffstat (limited to 'libs/ardour/ardour/location.h')
-rw-r--r--libs/ardour/ardour/location.h40
1 files changed, 19 insertions, 21 deletions
diff --git a/libs/ardour/ardour/location.h b/libs/ardour/ardour/location.h
index e6f65fc389..d31277ee71 100644
--- a/libs/ardour/ardour/location.h
+++ b/libs/ardour/ardour/location.h
@@ -14,7 +14,6 @@
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 __ardour_location_h__
@@ -44,7 +43,7 @@ class SceneChange;
/** Location on Timeline - abstract representation for Markers, Loop/Punch Ranges, CD-Markers etc. */
class LIBARDOUR_API Location : public SessionHandleRef, public PBD::StatefulDestructible
{
- public:
+public:
enum Flags {
IsMark = 0x1,
IsAutoPunch = 0x2,
@@ -70,7 +69,7 @@ class LIBARDOUR_API Location : public SessionHandleRef, public PBD::StatefulDest
void lock ();
void unlock ();
- samplepos_t start() const { return _start; }
+ samplepos_t start() const { return _start; }
samplepos_t end() const { return _end; }
samplecnt_t length() const { return _end - _start; }
@@ -110,8 +109,8 @@ class LIBARDOUR_API Location : public SessionHandleRef, public PBD::StatefulDest
void set_scene_change (boost::shared_ptr<SceneChange>);
/* these are static signals for objects that want to listen to all
- locations at once.
- */
+ * locations at once.
+ */
static PBD::Signal1<void,Location*> name_changed;
static PBD::Signal1<void,Location*> end_changed;
@@ -124,8 +123,8 @@ class LIBARDOUR_API Location : public SessionHandleRef, public PBD::StatefulDest
static PBD::Signal1<void,Location*> changed;
/* these are member signals for objects that care only about
- changes to this object
- */
+ * changes to this object
+ */
PBD::Signal0<void> Changed;
@@ -149,13 +148,13 @@ class LIBARDOUR_API Location : public SessionHandleRef, public PBD::StatefulDest
void recompute_samples_from_beat ();
static PBD::Signal0<void> scene_changed; /* for use by backend scene change management, class level */
- PBD::Signal0<void> SceneChangeChanged; /* for use by objects interested in this object */
+ PBD::Signal0<void> SceneChangeChanged; /* for use by objects interested in this object */
- private:
+private:
std::string _name;
- samplepos_t _start;
+ samplepos_t _start;
double _start_beat;
- samplepos_t _end;
+ samplepos_t _end;
double _end_beat;
Flags _flags;
bool _locked;
@@ -170,7 +169,7 @@ class LIBARDOUR_API Location : public SessionHandleRef, public PBD::StatefulDest
/** A collection of session locations including unique dedicated locations (loop, punch, etc) */
class LIBARDOUR_API Locations : public SessionHandleRef, public PBD::StatefulDestructible
{
- public:
+public:
typedef std::list<Location *> LocationList;
Locations (Session &);
@@ -214,8 +213,8 @@ class LIBARDOUR_API Locations : public SessionHandleRef, public PBD::StatefulDes
PBD::Signal1<void,Location*> current_changed;
/* Objects that care about individual addition and removal of Locations should connect to added/removed.
- If an object additionally cares about potential mass clearance of Locations, they should connect to changed.
- */
+ * If an object additionally cares about potential mass clearance of Locations, they should connect to changed.
+ */
PBD::Signal1<void,Location*> added;
PBD::Signal1<void,Location*> removed;
@@ -223,8 +222,8 @@ class LIBARDOUR_API Locations : public SessionHandleRef, public PBD::StatefulDes
template<class T> void apply (T& obj, void (T::*method)(const LocationList&)) const {
/* We don't want to hold the lock while the given method runs, so take a copy
- of the list and pass that instead.
- */
+ * of the list and pass that instead.
+ */
Locations::LocationList copy;
{
Glib::Threads::Mutex::Lock lm (lock);
@@ -233,11 +232,10 @@ class LIBARDOUR_API Locations : public SessionHandleRef, public PBD::StatefulDes
(obj.*method)(copy);
}
- private:
-
- LocationList locations;
- Location *current_location;
- mutable Glib::Threads::Mutex lock;
+private:
+ LocationList locations;
+ Location* current_location;
+ mutable Glib::Threads::Mutex lock;
int set_current_unlocked (Location *);
void location_changed (Location*);