summaryrefslogtreecommitdiff
path: root/libs/ardour
diff options
context:
space:
mode:
Diffstat (limited to 'libs/ardour')
-rw-r--r--libs/ardour/ardour/location.h5
-rw-r--r--libs/ardour/location.cc8
2 files changed, 6 insertions, 7 deletions
diff --git a/libs/ardour/ardour/location.h b/libs/ardour/ardour/location.h
index f55f931731..45125e14f1 100644
--- a/libs/ardour/ardour/location.h
+++ b/libs/ardour/ardour/location.h
@@ -23,7 +23,6 @@
#include <list>
#include <iostream>
#include <map>
-#include <ctime>
#include <sys/types.h>
@@ -70,7 +69,7 @@ public:
void lock ();
void unlock ();
- time_t timestamp() { return _timestamp; };
+ int64_t timestamp() const { return _timestamp; };
samplepos_t start() const { return _start; }
samplepos_t end() const { return _end; }
samplecnt_t length() const { return _end - _start; }
@@ -162,7 +161,7 @@ private:
bool _locked;
PositionLockStyle _position_lock_style;
boost::shared_ptr<SceneChange> _scene_change;
- time_t _timestamp;
+ int64_t _timestamp;
void set_mark (bool yn);
bool set_flag_internal (bool yn, Flags flag);
diff --git a/libs/ardour/location.cc b/libs/ardour/location.cc
index 1b4b5a87c1..0ff707a80d 100644
--- a/libs/ardour/location.cc
+++ b/libs/ardour/location.cc
@@ -65,7 +65,7 @@ Location::Location (Session& s)
, _flags (Flags (0))
, _locked (false)
, _position_lock_style (AudioTime)
- , _timestamp(time(0))
+ , _timestamp (time (0))
{
assert (_start >= 0);
assert (_end >= 0);
@@ -80,7 +80,7 @@ Location::Location (Session& s, samplepos_t sample_start, samplepos_t sample_end
, _flags (bits)
, _locked (false)
, _position_lock_style (s.config.get_glue_new_markers_to_bars_and_beats() ? MusicTime : AudioTime)
- , _timestamp(time(0))
+ , _timestamp (time (0))
{
recompute_beat_from_samples (sub_num);
@@ -98,7 +98,7 @@ Location::Location (const Location& other)
, _end_beat (other._end_beat)
, _flags (other._flags)
, _position_lock_style (other._position_lock_style)
- , _timestamp(time(0))
+ , _timestamp (time (0))
{
/* copy is not locked even if original was */
@@ -114,7 +114,7 @@ Location::Location (Session& s, const XMLNode& node)
: SessionHandleRef (s)
, _flags (Flags (0))
, _position_lock_style (AudioTime)
- , _timestamp(time(0))
+ , _timestamp (time (0))
{
/* Note: _position_lock_style is initialised above in case set_state doesn't set it
(for 2.X session file compatibility).