From 011291e265e266664e1446482b84451adca3102f Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 27 Sep 2022 00:52:20 +0200
Subject: [PATCH] Use EnumIndexedVector in ReelWriter.

---
 src/lib/reel_writer.cc | 7 ++-----
 src/lib/reel_writer.h  | 3 ++-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index a247349d5..4227a45fd 100644
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -315,7 +315,7 @@ ReelWriter::write (shared_ptr<const Data> encoded, Frame frame, Eyes eyes)
 
 	auto fin = _picture_asset_writer->write (encoded->data(), encoded->size());
 	write_frame_info (frame, eyes, fin);
-	_last_written[static_cast<int>(eyes)] = encoded;
+	_last_written[eyes] = encoded;
 }
 
 
@@ -355,10 +355,7 @@ ReelWriter::repeat_write (Frame frame, Eyes eyes)
 		return;
 	}
 
-	auto fin = _picture_asset_writer->write (
-		_last_written[static_cast<int>(eyes)]->data(),
-		_last_written[static_cast<int>(eyes)]->size()
-		);
+	auto fin = _picture_asset_writer->write(_last_written[eyes]->data(), _last_written[eyes]->size());
 	write_frame_info (frame, eyes, fin);
 }
 
diff --git a/src/lib/reel_writer.h b/src/lib/reel_writer.h
index 6e92e8923..e2c713cc5 100644
--- a/src/lib/reel_writer.h
+++ b/src/lib/reel_writer.h
@@ -22,6 +22,7 @@
 #include "atmos_metadata.h"
 #include "dcp_text_track.h"
 #include "dcpomatic_time.h"
+#include "enum_indexed_vector.h"
 #include "font_id_map.h"
 #include "player_text.h"
 #include "referenced_reel_asset.h"
@@ -125,7 +126,7 @@ private:
 	/** the first picture frame index that does not already exist in our MXF */
 	int _first_nonexistent_frame;
 	/** the data of the last written frame, if there is one */
-	std::shared_ptr<const dcp::Data> _last_written[static_cast<int>(Eyes::COUNT)];
+	EnumIndexedVector<std::shared_ptr<const dcp::Data>, Eyes> _last_written;
 	/** index of this reel within the DCP (starting from 0) */
 	int _reel_index;
 	/** number of reels in the DCP */
-- 
2.30.2