Fix code and tests so that SubtitleString::v_position is between 0 and 1 (not a perce...

[libdcp.git] / src / picture_mxf_writer.cc

diff --git a/src/picture_mxf_writer.cc b/src/picture_mxf_writer.cc
index 1a128b33acc50a08aaae0df5e5ef3ef3f2c01088..46426401b456761c085ce32e219cdfaf54a17ffa 100644 (file)
--- a/src/picture_mxf_writer.cc
+++ b/src/picture_mxf_writer.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,13 +17,13 @@
 
 */
 
-#include <inttypes.h>
-#include <stdint.h>
-#include "AS_DCP.h"
 #include "KM_fileio.h"
 #include "picture_mxf_writer.h"
 #include "exceptions.h"
 #include "picture_mxf.h"
+#include "AS_DCP.h"
+#include <inttypes.h>
+#include <stdint.h>
 
 using std::istream;
 using std::ostream;
@@ -82,14 +82,12 @@ FrameInfo::write (FILE* f) const
 #endif 
 }
 
-
-PictureMXFWriter::PictureMXFWriter (PictureMXF* mxf, boost::filesystem::path file, bool overwrite)
-       : _mxf (mxf)
-       , _file (file)
-       , _frames_written (0)
+PictureMXFWriter::PictureMXFWriter (PictureMXF* mxf, boost::filesystem::path file, Standard standard, bool overwrite)
+       : MXFWriter (mxf, file)
+       , _picture_mxf (mxf)
        , _started (false)
-       , _finalized (false)
+       , _standard (standard)
        , _overwrite (overwrite)
 {
-
+       
 }