Remove writing of FrameInfos to disk.

2 files changed, 12 insertions, 60 deletions

diff --git a/src/picture_asset_writer.cc b/src/picture_asset_writer.cc
index 92b384db..f31c36e2 100644
--- a/src/picture_asset_writer.cc
+++ b/src/picture_asset_writer.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 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
@@ -31,58 +31,6 @@ using std::string;
 using boost::shared_ptr;
 using namespace libdcp;
 
-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	
-}
-
-
 PictureAssetWriter::PictureAssetWriter (PictureAsset* asset, bool overwrite)
 	: _asset (asset)
 	, _frames_written (0)
diff --git a/src/picture_asset_writer.h b/src/picture_asset_writer.h
index a62b20b2..d30d9a85 100644
--- a/src/picture_asset_writer.h
+++ b/src/picture_asset_writer.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 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,6 +17,9 @@
 
 */
 
+#ifndef LIBDCP_PICTURE_ASSET_WRITER_H
+#define LIBDCP_PICTURE_ASSET_WRITER_H
+
 #include <stdint.h>
 #include <string>
 #include <fstream>
@@ -32,18 +35,17 @@ class PictureAsset;
 /** Information about a single frame (either a monoscopic frame or a left *or* right eye stereoscopic frame) */	
 struct FrameInfo
 {
+	FrameInfo ()
+		: offset (0)
+		, size (0)
+	{}
+	
 	FrameInfo (uint64_t o, uint64_t s, std::string h)
 		: offset (o)
 		, size (s)
 		, hash (h)
 	{}
 
-	FrameInfo (std::istream& s);
-	FrameInfo (FILE *);
-
-	void write (std::ostream& s) const;
-	void write (FILE *) const;
-	
 	uint64_t offset;
 	uint64_t size;
 	std::string hash;
@@ -77,3 +79,5 @@ protected:
 };
 
 }
+
+#endif