Make Piece content/decoder vectors and all members private.

diff --git a/src/lib/piece.h b/src/lib/piece.h
index 440beecf4bd6af079bd5b552fae0fddd3ead7a44..8309be0848f3e0215410cff6cbe6b9ab99313676 100644 (file)
--- a/src/lib/piece.h
+++ b/src/lib/piece.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -30,17 +30,13 @@ class Decoder;
 class Piece
 {
 public:
-       Piece (boost::shared_ptr<Content> c, boost::shared_ptr<Decoder> d, FrameRateChange f)
-               : content (c)
-               , decoder (d)
-               , frc (f)
-               , done (false)
-       {}
-
-       boost::shared_ptr<Content> content;
-       boost::shared_ptr<Decoder> decoder;
-       FrameRateChange frc;
-       bool done;
+       Piece (boost::shared_ptr<Content> c, boost::shared_ptr<Decoder> d, FrameRateChange f);
+
+private:
+       std::vector<boost::shared_ptr<Content> > _content;
+       std::vector<boost::shared_ptr<Decoder> > _decoder;
+       FrameRateChange _frc;
+       bool _done;
 };
 
 #endif

diff --git a/src/lib/wscript b/src/lib/wscript
index 7b7b3cf20c06e4de2aea2c9e1fee3a8c0641869a..293d0524406015aade9c4b590f79ce159b3f9ac3 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -132,6 +132,7 @@ sources = """
           log_entry.cc
           mid_side_decoder.cc
           overlaps.cc
+          piece.cc
           player.cc
           player_text.cc
           player_video.cc