White space: shuffler.{cc,h}

2 files changed, 20 insertions, 20 deletions

diff --git a/src/lib/shuffler.cc b/src/lib/shuffler.cc
index a4ea0f5dc..9ce24e3d5 100644
--- a/src/lib/shuffler.cc
+++ b/src/lib/shuffler.cc
@@ -19,12 +19,12 @@
 */
 
 
-#include "shuffler.h"
 #include "content_video.h"
 #include "dcpomatic_assert.h"
 #include "dcpomatic_log.h"
-#include <string>
+#include "shuffler.h"
 #include <iostream>
+#include <string>
 
 
 using std::make_pair;
@@ -49,29 +49,29 @@ struct Comparator
 
 
 void
-Shuffler::video (weak_ptr<Piece> weak_piece, ContentVideo video)
+Shuffler::video(weak_ptr<Piece> weak_piece, ContentVideo video)
 {
 	LOG_DEBUG_THREE_D("Shuffler::video time=%1 eyes=%2 part=%3", to_string(video.time), static_cast<int>(video.eyes), static_cast<int>(video.part));
 
 	if (video.eyes != Eyes::LEFT && video.eyes != Eyes::RIGHT) {
 		/* Pass through anything that we don't care about */
-		Video (weak_piece, video);
+		Video(weak_piece, video);
 		return;
 	}
 
-	auto piece = weak_piece.lock ();
-	DCPOMATIC_ASSERT (piece);
+	auto piece = weak_piece.lock();
+	DCPOMATIC_ASSERT(piece);
 
 	if (!_last && video.eyes == Eyes::LEFT) {
-		LOG_DEBUG_THREE_D_NC ("Shuffler first after clear");
+		LOG_DEBUG_THREE_D_NC("Shuffler first after clear");
 		/* We haven't seen anything since the last clear() and we have some eyes-left so assume everything is OK */
-		Video (weak_piece, video);
+		Video(weak_piece, video);
 		_last = video;
 		return;
 	}
 
-	_store.push_back (make_pair (weak_piece, video));
-	_store.sort (Comparator());
+	_store.push_back(make_pair(weak_piece, video));
+	_store.sort(Comparator());
 
 	while (true) {
 
@@ -102,26 +102,26 @@ Shuffler::video (weak_ptr<Piece> weak_piece, ContentVideo video)
 		}
 
 		LOG_DEBUG_THREE_D("Shuffler emits time=%1 eyes=%2 store=%3", to_string(_store.front().second.time), static_cast<int>(_store.front().second.eyes), _store.size());
-		Video (_store.front().first, _store.front().second);
+		Video(_store.front().first, _store.front().second);
 		_last = _store.front().second;
-		_store.pop_front ();
+		_store.pop_front();
 	}
 }
 
 
 void
-Shuffler::clear ()
+Shuffler::clear()
 {
-	LOG_DEBUG_THREE_D_NC ("Shuffler::clear");
-	_store.clear ();
+	LOG_DEBUG_THREE_D_NC("Shuffler::clear");
+	_store.clear();
 	_last = optional<ContentVideo>();
 }
 
 
 void
-Shuffler::flush ()
+Shuffler::flush()
 {
 	for (auto i: _store) {
-		Video (i.first, i.second);
+		Video(i.first, i.second);
 	}
 }
diff --git a/src/lib/shuffler.h b/src/lib/shuffler.h
index 4d1404560..487e06511 100644
--- a/src/lib/shuffler.h
+++ b/src/lib/shuffler.h
@@ -35,9 +35,9 @@ class Piece;
 class Shuffler
 {
 public:
-	void clear ();
-	void flush ();
-	void video (std::weak_ptr<Piece>, ContentVideo video);
+	void clear();
+	void flush();
+	void video(std::weak_ptr<Piece>, ContentVideo video);
 
 	boost::signals2::signal<void (std::weak_ptr<Piece>, ContentVideo)> Video;