Unpick MXF from the class hierarchy.

[libdcp.git] / src / picture_mxf_writer.cc

diff --git a/src/picture_mxf_writer.cc b/src/picture_mxf_writer.cc
index 61dd854b74e49ae04ea4dc6fa49e1a214522eb3f..4593c49ad51477d247e0b8c3e06ea3b3235cb6c8 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;
@@ -31,64 +31,12 @@ using std::string;
 using boost::shared_ptr;
 using namespace dcp;
 
-FrameInfo::FrameInfo (istream& s)
-       : offset (0)
-       , size (0)
-{
-       s >> offset >> size;
-
-       if (!s.good ()) {
-               /* Make sure we zero these if something bad happened, otherwise
-                  the caller might try to alloc lots of RAM.
-               */
-               offset = size = 0;
-       }
-
-       s >> hash;
-}
-
-FrameInfo::FrameInfo (FILE* f)
-{
-#ifdef LIBDCP_WINDOWS
-       fscanf (f, "%I64u", &offset);
-       fscanf (f, "%I64u", &size);
-#else  
-       fscanf (f, "%" SCNu64, &offset);
-       fscanf (f, "%" SCNu64, &size);
-#endif 
-
-       if (ferror (f)) {
-               offset = size = 0;
-       }
-
-       char hash_buffer[128];
-       fscanf (f, "%s", hash_buffer);
-       hash = hash_buffer;
-}
-
-void
-FrameInfo::write (ostream& s) const
-{
-       s << offset << " " << size << " " << hash;
-}
-
-void
-FrameInfo::write (FILE* f) const
-{
-#ifdef LIBDCP_WINDOWS  
-       fprintf (f, "%I64u %I64u %s", offset, size, hash.c_str ());
-#else  
-       fprintf (f, "%" PRIu64 " %" PRIu64 " %s", offset, size, hash.c_str ());
-#endif 
-}
-
-
-PictureMXFWriter::PictureMXFWriter (PictureMXF* asset, bool overwrite)
-       : _asset (asset)
-       , _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)
 {
-
+       mxf->set_file (file);
 }