summaryrefslogtreecommitdiff
path: root/test/combine_test.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-01-18 00:27:34 +0100
committerCarl Hetherington <cth@carlh.net>2021-01-18 00:27:34 +0100
commit2915c4f48129a4cac2c8ca364b09dd8047364aad (patch)
tree119434688e7d055c89cd9d54d15c6b068755f670 /test/combine_test.cc
parent6af628a0404e7135cb77cfa6d49a8419c883f2bf (diff)
Bv2.1 8.5: FFOC and LFOC should be present and have particular values.
Diffstat (limited to 'test/combine_test.cc')
-rw-r--r--test/combine_test.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/test/combine_test.cc b/test/combine_test.cc
index 54e908d4..92949cf2 100644
--- a/test/combine_test.cc
+++ b/test/combine_test.cc
@@ -42,6 +42,7 @@
#include "test.h"
#include "types.h"
#include "verify.h"
+#include "reel_markers_asset.h"
#include <boost/algorithm/string.hpp>
#include <boost/foreach.hpp>
#include <boost/optional.hpp>
@@ -51,9 +52,10 @@
using std::list;
using std::string;
+using std::make_shared;
using std::vector;
-using boost::optional;
using std::shared_ptr;
+using boost::optional;
static void
@@ -319,7 +321,9 @@ BOOST_AUTO_TEST_CASE (combine_two_dcps_with_shared_asset)
shared_ptr<dcp::ReelMonoPictureAsset> pic(new dcp::ReelMonoPictureAsset(simple_picture("build/test/combine_input2", ""), 0));
shared_ptr<dcp::ReelSoundAsset> sound(new dcp::ReelSoundAsset(first->cpls().front()->reels().front()->main_sound()->asset(), 0));
- cpl->add (shared_ptr<dcp::Reel>(new dcp::Reel(pic, sound)));
+ auto reel = make_shared<dcp::Reel>(pic, sound);
+ reel->add (simple_markers());
+ cpl->add (reel);
second->add (cpl);
second->write_xml (dcp::SMPTE);