X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fevoral%2Fevoral%2FEvent.hpp;h=ec92d575d0958b0cf18328b80207d60db6af21ba;hb=ca0c9b3636fecb5fc2106b1eae33ce3eb5c53c79;hp=facaa64e68b579432c8a5f5ca4063d9bdc65a543;hpb=d15fda6d751a465d278f477923075d4783f3b1ca;p=ardour.git

diff --git a/libs/evoral/evoral/Event.hpp b/libs/evoral/evoral/Event.hpp
index facaa64e68..ec92d575d0 100644
--- a/libs/evoral/evoral/Event.hpp
+++ b/libs/evoral/evoral/Event.hpp
@@ -19,7 +19,6 @@
 #ifndef EVORAL_EVENT_HPP
 #define EVORAL_EVENT_HPP
 
-#include <assert.h>
 #include <cstdlib>
 #include <cstring>
 #include <sstream>
@@ -48,7 +47,9 @@ template<typename Time>
 class LIBEVORAL_API Event {
 public:
 #ifdef EVORAL_EVENT_ALLOC
-	Event (EventType type=0, Time time=0, uint32_t size=0, uint8_t* buf=NULL, bool alloc=false);
+	Event (EventType type=0, Time time=Time(), uint32_t size=0, uint8_t* buf=NULL, bool alloc=false);
+
+	Event (EventType type, Time time, uint32_t size, const uint8_t* buf);
 
 	/** Copy \a copy.
 	 *
@@ -114,11 +115,11 @@ public:
 	}
 
 	inline void clear() {
-		_type = 0;
-		_original_time = 0;
-		_nominal_time = 0;
-		_size = 0;
-		_buf  = NULL;
+		_type          = 0;
+		_original_time = Time();
+		_nominal_time  = Time();
+		_size          = 0;
+		_buf           = NULL;
 	}
 
 #else
@@ -154,11 +155,8 @@ protected:
 #endif
 };
 
-} // namespace Evoral
-
-
 template<typename Time>
-LIBEVORAL_API std::ostream& operator<<(std::ostream& o, const Evoral::Event<Time>& ev) {
+/*LIBEVORAL_API*/ std::ostream& operator<<(std::ostream& o, const Evoral::Event<Time>& ev) {
 	o << "Event #" << ev.id() << " type = " << ev.event_type() << " @ " << ev.time();
 	o << std::hex;
 	for (uint32_t n = 0; n < ev.size(); ++n) {
@@ -168,6 +166,7 @@ LIBEVORAL_API std::ostream& operator<<(std::ostream& o, const Evoral::Event<Time
 	return o;
 }
 
+} // namespace Evoral
 
 #endif // EVORAL_EVENT_HPP