summaryrefslogtreecommitdiff
path: root/libs/evoral/src/Event.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2016-11-07 07:07:42 -0500
committerDavid Robillard <d@drobilla.net>2016-12-03 15:28:23 -0500
commitd17f58e5314ad826fc2473c587341facc285399d (patch)
tree198535fcd3ff849281a19ede1c821625e9f25450 /libs/evoral/src/Event.cpp
parent398a318934769dae51efe972f7ffdefc52ea2963 (diff)
Remove dead code
Diffstat (limited to 'libs/evoral/src/Event.cpp')
-rw-r--r--libs/evoral/src/Event.cpp29
1 files changed, 5 insertions, 24 deletions
diff --git a/libs/evoral/src/Event.cpp b/libs/evoral/src/Event.cpp
index 09b240284f..13d7c6c6ac 100644
--- a/libs/evoral/src/Event.cpp
+++ b/libs/evoral/src/Event.cpp
@@ -57,8 +57,7 @@ next_event_id ()
template<typename Timestamp>
Event<Timestamp>::Event(EventType type, Timestamp time, uint32_t size, uint8_t* buf, bool alloc)
: _type(type)
- , _original_time(time)
- , _nominal_time(time)
+ , _time(time)
, _size(size)
, _buf(buf)
, _id(-1)
@@ -80,8 +79,7 @@ Event<Timestamp>::Event(EventType type,
uint32_t size,
const uint8_t* buf)
: _type(type)
- , _original_time(time)
- , _nominal_time(time)
+ , _time(time)
, _size(size)
, _buf((uint8_t*)malloc(size))
, _id(-1)
@@ -93,8 +91,7 @@ Event<Timestamp>::Event(EventType type,
template<typename Timestamp>
Event<Timestamp>::Event(const Event& copy, bool owns_buf)
: _type(copy._type)
- , _original_time(copy._original_time)
- , _nominal_time(copy._nominal_time)
+ , _time(copy._time)
, _size(copy._size)
, _buf(copy._buf)
, _id (next_event_id ())
@@ -123,8 +120,7 @@ Event<Timestamp>::assign(const Event& other)
{
_id = other._id;
_type = other._type;
- _original_time = other._original_time;
- _nominal_time = other._nominal_time;
+ _time = other._time;
_owns_buf = other._owns_buf;
if (_owns_buf) {
if (other._buf) {
@@ -160,25 +156,10 @@ Event<Timestamp>::set (const uint8_t* buf, uint32_t size, Timestamp t)
_buf = const_cast<uint8_t*> (buf);
}
- _original_time = t;
- _nominal_time = t;
+ _time = t;
_size = size;
}
-template<typename Timestamp>
-void
-Event<Timestamp>::set_time (Timestamp t)
-{
- _nominal_time = t;
-}
-
-template<typename Timestamp>
-void
-Event<Timestamp>::set_original_time (Timestamp t)
-{
- _original_time = t;
-}
-
#endif // EVORAL_EVENT_ALLOC
template class Event<Evoral::Beats>;