From af51373cadb57d8b31ccb3c359e7c80d8f697487 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sat, 16 Dec 2017 23:47:08 +0100
Subject: Make events take the corresponding message directly

---
 src/server/EventWriter.cpp | 76 ++++++++++++++++------------------------------
 1 file changed, 26 insertions(+), 50 deletions(-)

(limited to 'src/server/EventWriter.cpp')

diff --git a/src/server/EventWriter.cpp b/src/server/EventWriter.cpp
index 7cec07bc..4247eda5 100644
--- a/src/server/EventWriter.cpp
+++ b/src/server/EventWriter.cpp
@@ -48,81 +48,64 @@ EventWriter::message(const Message& msg)
 void
 EventWriter::operator()(const BundleBegin& msg)
 {
-	_engine.enqueue_event(
-		new Events::Mark(_engine, _respondee, msg.seq, now(),
-		                 Events::Mark::Type::BUNDLE_START),
-		_event_mode);
+	_engine.enqueue_event(new Events::Mark(_engine, _respondee, now(), msg),
+	                      _event_mode);
 }
 
 void
 EventWriter::operator()(const BundleEnd& msg)
 {
-	_engine.enqueue_event(
-		new Events::Mark(_engine, _respondee, msg.seq, now(),
-		                 Events::Mark::Type::BUNDLE_END),
-		_event_mode);
+	_engine.enqueue_event(new Events::Mark(_engine, _respondee, now(), msg),
+	                      _event_mode);
 }
 
 void
 EventWriter::operator()(const Put& msg)
 {
-	_engine.enqueue_event(
-		new Events::Delta(_engine, _respondee, msg.seq, now(),
-		                  Events::Delta::Type::PUT, msg.ctx, msg.uri, msg.properties),
-		_event_mode);
+	_engine.enqueue_event(new Events::Delta(_engine, _respondee, now(), msg),
+	                      _event_mode);
 }
 
 void
 EventWriter::operator()(const Delta& msg)
 {
-	_engine.enqueue_event(
-		new Events::Delta(_engine, _respondee, msg.seq, now(),
-		                  Events::Delta::Type::PATCH, msg.ctx, msg.uri, msg.add, msg.remove),
-		_event_mode);
+	_engine.enqueue_event(new Events::Delta(_engine, _respondee, now(), msg),
+	                      _event_mode);
 }
 
 void
 EventWriter::operator()(const Copy& msg)
 {
-	_engine.enqueue_event(
-		new Events::Copy(_engine, _respondee, msg.seq, now(),
-		                 msg.old_uri, msg.new_uri),
-		_event_mode);
+	_engine.enqueue_event(new Events::Copy(_engine, _respondee, now(), msg),
+	                      _event_mode);
 }
 
 void
 EventWriter::operator()(const Move& msg)
 {
-	_engine.enqueue_event(
-		new Events::Move(_engine, _respondee, msg.seq, now(),
-		                 msg.old_path, msg.new_path),
-		_event_mode);
+	_engine.enqueue_event(new Events::Move(_engine, _respondee, now(), msg),
+	                      _event_mode);
 }
 
 void
 EventWriter::operator()(const Del& msg)
 {
-	_engine.enqueue_event(
-		new Events::Delete(_engine, _respondee, msg.seq, now(), msg.uri),
-		_event_mode);
+	_engine.enqueue_event(new Events::Delete(_engine, _respondee, now(), msg),
+	                      _event_mode);
 }
 
 void
 EventWriter::operator()(const Connect& msg)
 {
-	_engine.enqueue_event(
-		new Events::Connect(_engine, _respondee, msg.seq, now(),
-		                    msg.tail, msg.head),
-		_event_mode);
-
+	_engine.enqueue_event(new Events::Connect(_engine, _respondee, now(), msg),
+	                      _event_mode);
 }
 
 void
 EventWriter::operator()(const Disconnect& msg)
 {
 	_engine.enqueue_event(
-		new Events::Disconnect(_engine, _respondee, msg.seq, now(),
-		                       msg.tail, msg.head),
+		new Events::Disconnect(_engine, _respondee, now(), msg),
 		_event_mode);
 }
 
@@ -130,43 +113,36 @@ void
 EventWriter::operator()(const DisconnectAll& msg)
 {
 	_engine.enqueue_event(
-		new Events::DisconnectAll(_engine, _respondee, msg.seq, now(),
-		                          msg.graph, msg.path),
+		new Events::DisconnectAll(_engine, _respondee, now(), msg),
 		_event_mode);
 }
 
 void
 EventWriter::operator()(const SetProperty& msg)
 {
-	_engine.enqueue_event(
-		new Events::Delta(_engine, _respondee, msg.seq, now(),
-		                  Events::Delta::Type::SET, msg.ctx,
-		                  msg.subject, {{msg.predicate, msg.value}}, {}),
-		_event_mode);
+	_engine.enqueue_event(new Events::Delta(_engine, _respondee, now(), msg),
+	                      _event_mode);
 }
 
 void
 EventWriter::operator()(const Undo& msg)
 {
-	_engine.enqueue_event(
-		new Events::Undo(_engine, _respondee, msg.seq, now(), false),
-		_event_mode);
+	_engine.enqueue_event(new Events::Undo(_engine, _respondee, now(), msg),
+	                      _event_mode);
 }
 
 void
 EventWriter::operator()(const Redo& msg)
 {
-	_engine.enqueue_event(
-		new Events::Undo(_engine, _respondee, msg.seq, now(), true),
-		_event_mode);
+	_engine.enqueue_event(new Events::Undo(_engine, _respondee, now(), msg),
+	                      _event_mode);
 }
 
 void
 EventWriter::operator()(const Get& msg)
 {
-	_engine.enqueue_event(
-		new Events::Get(_engine, _respondee, msg.seq, now(), msg.subject),
-		_event_mode);
+	_engine.enqueue_event(new Events::Get(_engine, _respondee, now(), msg),
+	                      _event_mode);
 }
 
 } // namespace Server
-- 
cgit v1.2.1