Move FrameInfo into its own file.

3 files changed, 70 insertions, 19 deletions

diff --git a/src/frame_info.h b/src/frame_info.h
new file mode 100644
index 00000000..55957cca
--- /dev/null
+++ b/src/frame_info.h
@@ -0,0 +1,68 @@
+/*
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
+
+    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.
+
+    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 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.
+*/
+
+
+#ifndef LIBDCP_FRAME_INFO_H
+#define LIBDCP_FRAME_INFO_H
+
+
+#include <stdint.h>
+#include <string>
+
+
+namespace dcp {
+
+
+/** @class FrameInfo
+ *  @brief Information about a single frame (either a monoscopic frame or a left *or* right eye stereoscopic frame)
+ */
+struct FrameInfo
+{
+	FrameInfo () = default;
+
+	FrameInfo(uint64_t o, uint64_t s, std::string h)
+		: offset(o)
+		, size(s)
+		, hash(h)
+	{}
+
+	uint64_t offset = 0;
+	uint64_t size = 0;
+	std::string hash;
+};
+
+
+}
+
+
+#endif
diff --git a/src/j2k_picture_asset_writer.h b/src/j2k_picture_asset_writer.h
index a6f5b6d2..e27a578e 100644
--- a/src/j2k_picture_asset_writer.h
+++ b/src/j2k_picture_asset_writer.h
@@ -42,6 +42,7 @@
 
 
 #include "asset_writer.h"
+#include "frame_info.h"
 #include "metadata.h"
 #include <boost/utility.hpp>
 #include <memory>
@@ -56,25 +57,6 @@ class Data;
 class J2KPictureAsset;
 
 
-/** @class FrameInfo
- *  @brief Information about a single frame (either a monoscopic frame or a left *or* right eye stereoscopic frame)
- */
-struct FrameInfo
-{
-	FrameInfo () {}
-
-	FrameInfo (uint64_t o, uint64_t s, std::string h)
-		: offset (o)
-		, size (s)
-		, hash (h)
-	{}
-
-	uint64_t offset = 0;
-	uint64_t size = 0;
-	std::string hash;
-};
-
-
 /** @class J2KPictureAssetWriter
  *  @brief Parent class for classes which write picture assets.
  */
diff --git a/src/wscript b/src/wscript
index 0a26bf30..2ce8e556 100644
--- a/src/wscript
+++ b/src/wscript
@@ -164,6 +164,7 @@ def build(bld):
               filesystem.h
               font_asset.h
               frame.h
+              frame_info.h
               fsk.h
               gamma_transfer_function.h
               h_align.h