Add new write() method.

[libdcp.git] / src / picture_asset_writer.cc

diff --git a/src/picture_asset_writer.cc b/src/picture_asset_writer.cc
index c1c9bd8565e67f2f9333457a7736127793154ddc..c30be1bc4f35a78d033ac46f7b93a645db5feeba 100644 (file)
--- a/src/picture_asset_writer.cc
+++ b/src/picture_asset_writer.cc
@@ -1,94 +1,67 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
-#include <inttypes.h>
-#include <stdint.h>
-#include "AS_DCP.h"
-#include "KM_fileio.h"
+
+/** @file  src/picture_asset_writer.cc
+ *  @brief PictureAssetWriter and FrameInfo classes
+ */
+
+
 #include "picture_asset_writer.h"
 #include "exceptions.h"
 #include "picture_asset.h"
+#include <asdcp/KM_fileio.h>
+#include <asdcp/AS_DCP.h>
+#include <inttypes.h>
+#include <stdint.h>
+
 
-using std::istream;
-using std::ostream;
 using std::string;
-using boost::shared_ptr;
+using std::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
+PictureAssetWriter::PictureAssetWriter (PictureAsset* asset, boost::filesystem::path file, bool overwrite)
+       : AssetWriter (asset, file)
+       , _picture_asset (asset)
+       , _overwrite (overwrite)
 {
-#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 
+       asset->set_file (file);
 }
 
 
-PictureAssetWriter::PictureAssetWriter (PictureAsset* asset, bool overwrite)
-       : _asset (asset)
-       , _frames_written (0)
-       , _started (false)
-       , _finalized (false)
-       , _overwrite (overwrite)
+FrameInfo
+PictureAssetWriter::write (Data const& data)
 {
-
+       return write (data.data(), data.size());
 }