24 files changed, 92 insertions, 59 deletions

diff --git a/src/asset_writer.cc b/src/asset_writer.cc
index b9bac187..4f5cf4be 100644
--- a/src/asset_writer.cc
+++ b/src/asset_writer.cc
@@ -48,13 +48,13 @@ using namespace dcp;
  *  @param mxf MXF that we are writing.
  *  @param file File to write to.
  */
-AssetWriter::AssetWriter (MXF* mxf, boost::filesystem::path file, Standard standard)
+AssetWriter::AssetWriter (MXF* mxf, boost::filesystem::path file)
 	: _mxf (mxf)
 	, _file (file)
 	, _frames_written (0)
 	, _finalized (false)
 	, _started (false)
-	, _encryption_context (new EncryptionContext (mxf->key(), standard))
+	, _encryption_context (new EncryptionContext (mxf->key(), mxf->standard()))
 {
 
 }
diff --git a/src/asset_writer.h b/src/asset_writer.h
index 814405d4..bc055d70 100644
--- a/src/asset_writer.h
+++ b/src/asset_writer.h
@@ -63,7 +63,7 @@ public:
 	}
 
 protected:
-	AssetWriter (MXF* mxf, boost::filesystem::path file, Standard standard);
+	AssetWriter (MXF* mxf, boost::filesystem::path file);
 
 	/** MXF that we are writing */
 	MXF* _mxf;
diff --git a/src/atmos_asset.cc b/src/atmos_asset.cc
index eac01dcf..ab17493d 100644
--- a/src/atmos_asset.cc
+++ b/src/atmos_asset.cc
@@ -42,7 +42,8 @@ using boost::shared_ptr;
 using namespace dcp;
 
 AtmosAsset::AtmosAsset (Fraction edit_rate, int first_frame, int max_channel_count, int max_object_count, string atmos_id, int atmos_version)
-	: _edit_rate (edit_rate)
+	: MXF (SMPTE)
+	, _edit_rate (edit_rate)
 	, _intrinsic_duration (0)
 	, _first_frame (first_frame)
 	, _max_channel_count (max_channel_count)
@@ -55,6 +56,7 @@ AtmosAsset::AtmosAsset (Fraction edit_rate, int first_frame, int max_channel_cou
 
 AtmosAsset::AtmosAsset (boost::filesystem::path file)
 	: Asset (file)
+	, MXF (SMPTE)
 {
 	ASDCP::ATMOS::MXFReader reader;
 	Kumu::Result_t r = reader.OpenRead (file.string().c_str());
diff --git a/src/atmos_asset_writer.cc b/src/atmos_asset_writer.cc
index eb0d608a..60529a2c 100644
--- a/src/atmos_asset_writer.cc
+++ b/src/atmos_asset_writer.cc
@@ -52,7 +52,7 @@ struct AtmosAssetWriter::ASDCPState
 };
 
 AtmosAssetWriter::AtmosAssetWriter (AtmosAsset* asset, boost::filesystem::path file)
-	: AssetWriter (asset, file, SMPTE)
+	: AssetWriter (asset, file)
 	, _state (new AtmosAssetWriter::ASDCPState)
 	, _asset (asset)
 {
@@ -67,7 +67,7 @@ AtmosAssetWriter::AtmosAssetWriter (AtmosAsset* asset, boost::filesystem::path f
 
 	_state->desc.AtmosVersion = 0;
 
-	_asset->fill_writer_info (&_state->writer_info, _asset->id(), SMPTE);
+	_asset->fill_writer_info (&_state->writer_info, _asset->id());
 }
 
 void
diff --git a/src/mono_picture_asset.cc b/src/mono_picture_asset.cc
index 407a3614..cebd8fa1 100644
--- a/src/mono_picture_asset.cc
+++ b/src/mono_picture_asset.cc
@@ -73,8 +73,8 @@ MonoPictureAsset::MonoPictureAsset (boost::filesystem::path file)
 	_id = read_writer_info (info);
 }
 
-MonoPictureAsset::MonoPictureAsset (Fraction edit_rate)
-	: PictureAsset (edit_rate)
+MonoPictureAsset::MonoPictureAsset (Fraction edit_rate, Standard standard)
+	: PictureAsset (edit_rate, standard)
 {
 
 }
@@ -167,10 +167,10 @@ MonoPictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt, No
 }
 
 shared_ptr<PictureAssetWriter>
-MonoPictureAsset::start_write (boost::filesystem::path file, Standard standard, bool overwrite)
+MonoPictureAsset::start_write (boost::filesystem::path file, bool overwrite)
 {
 	/* XXX: can't we use shared_ptr here? */
-	return shared_ptr<MonoPictureAssetWriter> (new MonoPictureAssetWriter (this, file, standard, overwrite));
+	return shared_ptr<MonoPictureAssetWriter> (new MonoPictureAssetWriter (this, file, overwrite));
 }
 
 shared_ptr<MonoPictureAssetReader>
diff --git a/src/mono_picture_asset.h b/src/mono_picture_asset.h
index ea276bcd..7a1c0d0a 100644
--- a/src/mono_picture_asset.h
+++ b/src/mono_picture_asset.h
@@ -54,11 +54,12 @@ public:
 
 	/** Create a MonoPictureAsset with a given edit rate.
 	 *  @param edit_rate Edit rate (i.e. frame rate) in frames per second.
+	 *  @param standard DCP standard (INTEROP or SMPTE).
 	 */
-	explicit MonoPictureAsset (Fraction edit_rate);
+	explicit MonoPictureAsset (Fraction edit_rate, Standard standard);
 
 	/** Start a progressive write to a MonoPictureAsset */
-	boost::shared_ptr<PictureAssetWriter> start_write (boost::filesystem::path, Standard standard, bool);
+	boost::shared_ptr<PictureAssetWriter> start_write (boost::filesystem::path, bool);
 	boost::shared_ptr<MonoPictureAssetReader> start_read () const;
 
 	bool equals (
diff --git a/src/mono_picture_asset_writer.cc b/src/mono_picture_asset_writer.cc
index a51c3861..b48e46e9 100644
--- a/src/mono_picture_asset_writer.cc
+++ b/src/mono_picture_asset_writer.cc
@@ -57,8 +57,8 @@ struct MonoPictureAssetWriter::ASDCPState : public ASDCPStateBase
 /** @param a Asset to write to.  `a' must not be deleted while
  *  this writer class still exists, or bad things will happen.
  */
-MonoPictureAssetWriter::MonoPictureAssetWriter (PictureAsset* asset, boost::filesystem::path file, Standard standard, bool overwrite)
-	: PictureAssetWriter (asset, file, standard, overwrite)
+MonoPictureAssetWriter::MonoPictureAssetWriter (PictureAsset* asset, boost::filesystem::path file, bool overwrite)
+	: PictureAssetWriter (asset, file, overwrite)
 	, _state (new MonoPictureAssetWriter::ASDCPState)
 {
 
@@ -67,7 +67,7 @@ MonoPictureAssetWriter::MonoPictureAssetWriter (PictureAsset* asset, boost::file
 void
 MonoPictureAssetWriter::start (uint8_t const * data, int size)
 {
-	dcp::start (this, _state, _standard, _picture_asset, data, size);
+	dcp::start (this, _state, _picture_asset, data, size);
 	_picture_asset->set_frame_rate (_picture_asset->edit_rate());
 }
 
diff --git a/src/mono_picture_asset_writer.h b/src/mono_picture_asset_writer.h
index dcea0294..2284cd3c 100644
--- a/src/mono_picture_asset_writer.h
+++ b/src/mono_picture_asset_writer.h
@@ -66,7 +66,7 @@ public:
 private:
 	friend class MonoPictureAsset;
 
-	MonoPictureAssetWriter (PictureAsset *, boost::filesystem::path file, Standard standard, bool);
+	MonoPictureAssetWriter (PictureAsset *, boost::filesystem::path file, bool);
 	void start (uint8_t const *, int);
 
 	/* do this with an opaque pointer so we don't have to include
diff --git a/src/mxf.cc b/src/mxf.cc
index 03e3d1d8..008dbc2a 100644
--- a/src/mxf.cc
+++ b/src/mxf.cc
@@ -60,17 +60,27 @@ using namespace dcp;
 MXF::MXF ()
 	: _context_id (make_uuid ())
 {
+	/* Subclasses can create MXFs with unspecified _standard but are expected to fill
+	   _standard in once the MXF is read.
+	*/
+}
+
+MXF::MXF (Standard standard)
+	: _context_id (make_uuid ())
+	, _standard (standard)
+{
 
 }
 
 void
-MXF::fill_writer_info (ASDCP::WriterInfo* writer_info, string id, Standard standard) const
+MXF::fill_writer_info (ASDCP::WriterInfo* writer_info, string id) const
 {
 	writer_info->ProductVersion = _metadata.product_version;
 	writer_info->CompanyName = _metadata.company_name;
 	writer_info->ProductName = _metadata.product_name.c_str();
 
-	if (standard == INTEROP) {
+	DCP_ASSERT (_standard);
+	if (_standard == INTEROP) {
 		writer_info->LabelSetType = ASDCP::LS_MXF_INTEROP;
 	} else {
 		writer_info->LabelSetType = ASDCP::LS_MXF_SMPTE;
@@ -117,6 +127,17 @@ MXF::read_writer_info (ASDCP::WriterInfo const & info)
 		_key_id = buffer;
 	}
 
+	switch (info.LabelSetType) {
+	case ASDCP::LS_MXF_INTEROP:
+		_standard = INTEROP;
+		break;
+	case ASDCP::LS_MXF_SMPTE:
+		_standard = SMPTE;
+		break;
+	default:
+		DCP_ASSERT (false);
+	}
+
 	_metadata.read (info);
 
 	Kumu::bin2UUIDhex (info.AssetUUID, ASDCP::UUIDlen, buffer, sizeof (buffer));
diff --git a/src/mxf.h b/src/mxf.h
index 8f83fafd..aef8b12d 100644
--- a/src/mxf.h
+++ b/src/mxf.h
@@ -37,6 +37,7 @@
 #include "asset.h"
 #include "key.h"
 #include "metadata.h"
+#include "dcp_assert.h"
 
 #include <boost/signals2.hpp>
 
@@ -61,7 +62,7 @@ class PictureAssetWriter;
 class MXF
 {
 public:
-	MXF ();
+	MXF (Standard standard);
 	virtual ~MXF () {}
 
 	/** @return true if the data is encrypted */
@@ -112,16 +113,22 @@ public:
 		return _metadata;
 	}
 
+	Standard standard () const {
+		DCP_ASSERT (_standard);
+		return *_standard;
+	}
+
 protected:
 	template <class P, class Q>
-	friend void start (PictureAssetWriter* writer, boost::shared_ptr<P> state, Standard standard, Q* mxf, uint8_t const * data, int size);
+	friend void start (PictureAssetWriter* writer, boost::shared_ptr<P> state, Q* mxf, uint8_t const * data, int size);
+
+	MXF ();
 
 	std::string read_writer_info (ASDCP::WriterInfo const &);
 	/** Fill in a ADSCP::WriteInfo struct.
 	 *  @param w struct to fill in.
-	 *  @param standard INTEROP or SMPTE.
 	 */
-	void fill_writer_info (ASDCP::WriterInfo* w, std::string id, Standard standard) const;
+	void fill_writer_info (ASDCP::WriterInfo* w, std::string id) const;
 
 	/** ID of the key used for encryption/decryption, if there is one */
 	boost::optional<std::string> _key_id;
@@ -129,6 +136,7 @@ protected:
 	boost::optional<Key> _key;
 	std::string _context_id;
 	MXFMetadata _metadata;
+	boost::optional<Standard> _standard;
 };
 
 }
diff --git a/src/picture_asset.cc b/src/picture_asset.cc
index a0a7d7d7..7c4eb7b5 100644
--- a/src/picture_asset.cc
+++ b/src/picture_asset.cc
@@ -55,6 +55,7 @@ using std::make_pair;
 using boost::shared_ptr;
 using namespace dcp;
 
+/** Load a PictureAsset from a file */
 PictureAsset::PictureAsset (boost::filesystem::path file)
 	: Asset (file)
 	, _intrinsic_duration (0)
@@ -62,8 +63,10 @@ PictureAsset::PictureAsset (boost::filesystem::path file)
 
 }
 
-PictureAsset::PictureAsset (Fraction edit_rate)
-	: _edit_rate (edit_rate)
+/** Create a new PictureAsset with a given edit rate and standard */
+PictureAsset::PictureAsset (Fraction edit_rate, Standard standard)
+	: MXF (standard)
+	, _edit_rate (edit_rate)
 	, _intrinsic_duration (0)
 {
 
diff --git a/src/picture_asset.h b/src/picture_asset.h
index a03b85d2..696776da 100644
--- a/src/picture_asset.h
+++ b/src/picture_asset.h
@@ -62,11 +62,10 @@ class PictureAsset : public Asset, public MXF
 {
 public:
 	explicit PictureAsset (boost::filesystem::path file);
-	explicit PictureAsset (Fraction edit_rate);
+	explicit PictureAsset (Fraction edit_rate, Standard standard);
 
 	virtual boost::shared_ptr<PictureAssetWriter> start_write (
 		boost::filesystem::path file,
-		Standard standard,
 		bool overwrite
 		) = 0;
 
diff --git a/src/picture_asset_writer.cc b/src/picture_asset_writer.cc
index e3d7b70e..6861562e 100644
--- a/src/picture_asset_writer.cc
+++ b/src/picture_asset_writer.cc
@@ -43,10 +43,9 @@ using std::string;
 using boost::shared_ptr;
 using namespace dcp;
 
-PictureAssetWriter::PictureAssetWriter (PictureAsset* asset, boost::filesystem::path file, Standard standard, bool overwrite)
-	: AssetWriter (asset, file, standard)
+PictureAssetWriter::PictureAssetWriter (PictureAsset* asset, boost::filesystem::path file, bool overwrite)
+	: AssetWriter (asset, file)
 	, _picture_asset (asset)
-	, _standard (standard)
 	, _overwrite (overwrite)
 {
 	asset->set_file (file);
diff --git a/src/picture_asset_writer.h b/src/picture_asset_writer.h
index f26ff2a0..f2bd611b 100644
--- a/src/picture_asset_writer.h
+++ b/src/picture_asset_writer.h
@@ -82,12 +82,11 @@ public:
 
 protected:
 	template <class P, class Q>
-	friend void start (PictureAssetWriter *, boost::shared_ptr<P>, Standard, Q *, uint8_t const *, int);
+	friend void start (PictureAssetWriter *, boost::shared_ptr<P>, Q *, uint8_t const *, int);
 
-	PictureAssetWriter (PictureAsset *, boost::filesystem::path, Standard standard, bool);
+	PictureAssetWriter (PictureAsset *, boost::filesystem::path, bool);
 
 	PictureAsset* _picture_asset;
-	Standard _standard;
 	bool _overwrite;
 };
 
diff --git a/src/picture_asset_writer_common.cc b/src/picture_asset_writer_common.cc
index eae6318f..2caadc6e 100644
--- a/src/picture_asset_writer_common.cc
+++ b/src/picture_asset_writer_common.cc
@@ -50,7 +50,7 @@ struct ASDCPStateBase
 }
 
 template <class P, class Q>
-void dcp::start (PictureAssetWriter* writer, shared_ptr<P> state, Standard standard, Q* asset, uint8_t const * data, int size)
+void dcp::start (PictureAssetWriter* writer, shared_ptr<P> state, Q* asset, uint8_t const * data, int size)
 {
 	asset->set_file (writer->_file);
 
@@ -64,7 +64,7 @@ void dcp::start (PictureAssetWriter* writer, shared_ptr<P> state, Standard stand
 	asset->set_size (Size (state->picture_descriptor.StoredWidth, state->picture_descriptor.StoredHeight));
 	asset->set_screen_aspect_ratio (Fraction (state->picture_descriptor.AspectRatio.Numerator, state->picture_descriptor.AspectRatio.Denominator));
 
-	asset->fill_writer_info (&state->writer_info, asset->id(), standard);
+	asset->fill_writer_info (&state->writer_info, asset->id());
 
 	Kumu::Result_t r = state->mxf_writer.OpenWrite (
 		asset->file()->string().c_str(),
diff --git a/src/smpte_subtitle_asset.cc b/src/smpte_subtitle_asset.cc
index c85afc2e..a0472f3f 100644
--- a/src/smpte_subtitle_asset.cc
+++ b/src/smpte_subtitle_asset.cc
@@ -63,7 +63,8 @@ using boost::dynamic_pointer_cast;
 using namespace dcp;
 
 SMPTESubtitleAsset::SMPTESubtitleAsset ()
-	: _intrinsic_duration (0)
+	: MXF (SMPTE)
+	, _intrinsic_duration (0)
 	, _edit_rate (24, 1)
 	, _time_code_rate (24)
 	, _xml_id (make_uuid ())
@@ -293,10 +294,10 @@ SMPTESubtitleAsset::xml_as_string () const
 void
 SMPTESubtitleAsset::write (boost::filesystem::path p) const
 {
-	EncryptionContext enc (key (), SMPTE);
+	EncryptionContext enc (key(), SMPTE);
 
 	ASDCP::WriterInfo writer_info;
-	fill_writer_info (&writer_info, _id, SMPTE);
+	fill_writer_info (&writer_info, _id);
 
 	ASDCP::TimedText::TimedTextDescriptor descriptor;
 	descriptor.EditRate = ASDCP::Rational (_edit_rate.numerator, _edit_rate.denominator);
diff --git a/src/sound_asset.cc b/src/sound_asset.cc
index 74d41212..b8ed6fb5 100644
--- a/src/sound_asset.cc
+++ b/src/sound_asset.cc
@@ -84,8 +84,9 @@ SoundAsset::SoundAsset (boost::filesystem::path file)
 	_id = read_writer_info (info);
 }
 
-SoundAsset::SoundAsset (Fraction edit_rate, int sampling_rate, int channels)
-	: _edit_rate (edit_rate)
+SoundAsset::SoundAsset (Fraction edit_rate, int sampling_rate, int channels, Standard standard)
+	: MXF (standard)
+	, _edit_rate (edit_rate)
 	, _intrinsic_duration (0)
 	, _channels (channels)
 	, _sampling_rate (sampling_rate)
@@ -192,10 +193,10 @@ SoundAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt, NoteHand
 }
 
 shared_ptr<SoundAssetWriter>
-SoundAsset::start_write (boost::filesystem::path file, Standard standard)
+SoundAsset::start_write (boost::filesystem::path file)
 {
 	/* XXX: can't we use a shared_ptr here? */
-	return shared_ptr<SoundAssetWriter> (new SoundAssetWriter (this, file, standard));
+	return shared_ptr<SoundAssetWriter> (new SoundAssetWriter (this, file));
 }
 
 shared_ptr<SoundAssetReader>
diff --git a/src/sound_asset.h b/src/sound_asset.h
index 6d090312..77495152 100644
--- a/src/sound_asset.h
+++ b/src/sound_asset.h
@@ -56,9 +56,9 @@ class SoundAsset : public Asset, public MXF
 {
 public:
 	explicit SoundAsset (boost::filesystem::path file);
-	SoundAsset (Fraction edit_rate, int sampling_rate, int channels);
+	SoundAsset (Fraction edit_rate, int sampling_rate, int channels, Standard standard);
 
-	boost::shared_ptr<SoundAssetWriter> start_write (boost::filesystem::path file, Standard standard);
+	boost::shared_ptr<SoundAssetWriter> start_write (boost::filesystem::path file);
 	boost::shared_ptr<SoundAssetReader> start_read () const;
 
 	bool equals (
diff --git a/src/sound_asset_writer.cc b/src/sound_asset_writer.cc
index 3cb25db5..1bb2959d 100644
--- a/src/sound_asset_writer.cc
+++ b/src/sound_asset_writer.cc
@@ -53,8 +53,8 @@ struct SoundAssetWriter::ASDCPState
 	ASDCP::PCM::AudioDescriptor desc;
 };
 
-SoundAssetWriter::SoundAssetWriter (SoundAsset* asset, boost::filesystem::path file, Standard standard)
-	: AssetWriter (asset, file, standard)
+SoundAssetWriter::SoundAssetWriter (SoundAsset* asset, boost::filesystem::path file)
+	: AssetWriter (asset, file)
 	, _state (new SoundAssetWriter::ASDCPState)
 	, _asset (asset)
 	, _frame_buffer_offset (0)
@@ -68,7 +68,7 @@ SoundAssetWriter::SoundAssetWriter (SoundAsset* asset, boost::filesystem::path f
 	_state->desc.BlockAlign = 3 * _asset->channels();
 	_state->desc.AvgBps = _asset->sampling_rate() * _state->desc.BlockAlign;
 	_state->desc.LinkedTrackID = 0;
-	if (standard == INTEROP) {
+	if (asset->standard() == INTEROP) {
 		_state->desc.ChannelFormat = ASDCP::PCM::CF_NONE;
 	} else {
 		/* Just use WTF ("wild track format") for SMPTE for now; searches suggest that this
@@ -86,7 +86,7 @@ SoundAssetWriter::SoundAssetWriter (SoundAsset* asset, boost::filesystem::path f
 	_state->frame_buffer.Size (ASDCP::PCM::CalcFrameBufferSize (_state->desc));
 	memset (_state->frame_buffer.Data(), 0, _state->frame_buffer.Capacity());
 
-	_asset->fill_writer_info (&_state->writer_info, _asset->id(), standard);
+	_asset->fill_writer_info (&_state->writer_info, _asset->id());
 }
 
 void
diff --git a/src/sound_asset_writer.h b/src/sound_asset_writer.h
index 0a7d8cda..b2de9e8e 100644
--- a/src/sound_asset_writer.h
+++ b/src/sound_asset_writer.h
@@ -63,7 +63,7 @@ public:
 private:
 	friend class SoundAsset;
 
-	SoundAssetWriter (SoundAsset *, boost::filesystem::path, Standard standard);
+	SoundAssetWriter (SoundAsset *, boost::filesystem::path);
 
 	void write_current_frame ();
 
diff --git a/src/stereo_picture_asset.cc b/src/stereo_picture_asset.cc
index 4bbf7268..e5ed363e 100644
--- a/src/stereo_picture_asset.cc
+++ b/src/stereo_picture_asset.cc
@@ -70,17 +70,16 @@ StereoPictureAsset::StereoPictureAsset (boost::filesystem::path file)
 	_id = read_writer_info (info);
 }
 
-StereoPictureAsset::StereoPictureAsset (Fraction edit_rate)
-	: PictureAsset
-	  (edit_rate)
+StereoPictureAsset::StereoPictureAsset (Fraction edit_rate, Standard standard)
+	: PictureAsset (edit_rate, standard)
 {
 
 }
 
 shared_ptr<PictureAssetWriter>
-StereoPictureAsset::start_write (boost::filesystem::path file, Standard standard, bool overwrite)
+StereoPictureAsset::start_write (boost::filesystem::path file, bool overwrite)
 {
-	return shared_ptr<StereoPictureAssetWriter> (new StereoPictureAssetWriter (this, file, standard, overwrite));
+	return shared_ptr<StereoPictureAssetWriter> (new StereoPictureAssetWriter (this, file, overwrite));
 }
 
 shared_ptr<StereoPictureAssetReader>
diff --git a/src/stereo_picture_asset.h b/src/stereo_picture_asset.h
index fbf4e618..704ea1d4 100644
--- a/src/stereo_picture_asset.h
+++ b/src/stereo_picture_asset.h
@@ -44,10 +44,10 @@ class StereoPictureAsset : public PictureAsset
 {
 public:
 	explicit StereoPictureAsset (boost::filesystem::path file);
-	explicit StereoPictureAsset (Fraction edit_rate);
+	explicit StereoPictureAsset (Fraction edit_rate, Standard standard);
 
 	/** Start a progressive write to a StereoPictureAsset */
-	boost::shared_ptr<PictureAssetWriter> start_write (boost::filesystem::path file, Standard, bool);
+	boost::shared_ptr<PictureAssetWriter> start_write (boost::filesystem::path file, bool);
 	boost::shared_ptr<StereoPictureAssetReader> start_read () const;
 
 	bool equals (
diff --git a/src/stereo_picture_asset_writer.cc b/src/stereo_picture_asset_writer.cc
index 09faec28..db770e8b 100644
--- a/src/stereo_picture_asset_writer.cc
+++ b/src/stereo_picture_asset_writer.cc
@@ -50,8 +50,8 @@ struct StereoPictureAssetWriter::ASDCPState : public ASDCPStateBase
 	ASDCP::JP2K::MXFSWriter mxf_writer;
 };
 
-StereoPictureAssetWriter::StereoPictureAssetWriter (PictureAsset* mxf, boost::filesystem::path file, Standard standard, bool overwrite)
-	: PictureAssetWriter (mxf, file, standard, overwrite)
+StereoPictureAssetWriter::StereoPictureAssetWriter (PictureAsset* mxf, boost::filesystem::path file, bool overwrite)
+	: PictureAssetWriter (mxf, file, overwrite)
 	, _state (new StereoPictureAssetWriter::ASDCPState)
 	, _next_eye (EYE_LEFT)
 {
@@ -61,7 +61,7 @@ StereoPictureAssetWriter::StereoPictureAssetWriter (PictureAsset* mxf, boost::fi
 void
 StereoPictureAssetWriter::start (uint8_t const * data, int size)
 {
-	dcp::start (this, _state, _standard, _picture_asset, data, size);
+	dcp::start (this, _state, _picture_asset, data, size);
 	_picture_asset->set_frame_rate (Fraction (_picture_asset->edit_rate().numerator * 2, _picture_asset->edit_rate().denominator));
 }
 
diff --git a/src/stereo_picture_asset_writer.h b/src/stereo_picture_asset_writer.h
index 1b0956d3..82b78757 100644
--- a/src/stereo_picture_asset_writer.h
+++ b/src/stereo_picture_asset_writer.h
@@ -65,7 +65,7 @@ public:
 private:
 	friend class StereoPictureAsset;
 
-	StereoPictureAssetWriter (PictureAsset *, boost::filesystem::path file, Standard, bool);
+	StereoPictureAssetWriter (PictureAsset *, boost::filesystem::path file, bool);
 	void start (uint8_t const *, int);
 
 	/* do this with an opaque pointer so we don't have to include