Use J2KFrameInfo instead of FrameInfo.

7 files changed, 19 insertions, 9 deletions

diff --git a/src/frame_info.h b/src/frame_info.h
index 55957cca..a49f52a9 100644
--- a/src/frame_info.h
+++ b/src/frame_info.h
@@ -62,6 +62,16 @@ struct FrameInfo
 };
 
 
+struct J2KFrameInfo : public FrameInfo
+{
+	J2KFrameInfo() = default;
+
+	J2KFrameInfo(uint64_t offset_, uint64_t size_, std::string hash_)
+		: FrameInfo(offset_, size_, hash_)
+	{}
+};
+
+
 }
 
 
diff --git a/src/j2k_picture_asset_writer.cc b/src/j2k_picture_asset_writer.cc
index 5a552b52..75be51ba 100644
--- a/src/j2k_picture_asset_writer.cc
+++ b/src/j2k_picture_asset_writer.cc
@@ -60,7 +60,7 @@ J2KPictureAssetWriter::J2KPictureAssetWriter (J2KPictureAsset* asset, boost::fil
 }
 
 
-FrameInfo
+J2KFrameInfo
 J2KPictureAssetWriter::write (Data const& data)
 {
 	return write (data.data(), data.size());
diff --git a/src/j2k_picture_asset_writer.h b/src/j2k_picture_asset_writer.h
index e27a578e..0cfcbdf5 100644
--- a/src/j2k_picture_asset_writer.h
+++ b/src/j2k_picture_asset_writer.h
@@ -63,10 +63,10 @@ class J2KPictureAsset;
 class J2KPictureAssetWriter : public AssetWriter
 {
 public:
-	virtual FrameInfo write (uint8_t const *, int) = 0;
 	virtual void fake_write (int) = 0;
+	virtual J2KFrameInfo write(uint8_t const *, int) = 0;
 
-	FrameInfo write (Data const& data);
+	J2KFrameInfo write(Data const& data);
 
 protected:
 	template <class P, class Q>
diff --git a/src/mono_j2k_picture_asset_writer.cc b/src/mono_j2k_picture_asset_writer.cc
index 035f0020..807b4081 100644
--- a/src/mono_j2k_picture_asset_writer.cc
+++ b/src/mono_j2k_picture_asset_writer.cc
@@ -93,7 +93,7 @@ MonoJ2KPictureAssetWriter::start (uint8_t const * data, int size)
 }
 
 
-FrameInfo
+J2KFrameInfo
 MonoJ2KPictureAssetWriter::write (uint8_t const * data, int size)
 {
 	DCP_ASSERT (!_finalized);
@@ -117,7 +117,7 @@ MonoJ2KPictureAssetWriter::write (uint8_t const * data, int size)
 	}
 
 	++_frames_written;
-	return FrameInfo (before_offset, _state->mxf_writer.Tell() - before_offset, hash);
+	return J2KFrameInfo(before_offset, _state->mxf_writer.Tell() - before_offset, hash);
 }
 
 
diff --git a/src/mono_j2k_picture_asset_writer.h b/src/mono_j2k_picture_asset_writer.h
index 62785c9a..25dfbb2b 100644
--- a/src/mono_j2k_picture_asset_writer.h
+++ b/src/mono_j2k_picture_asset_writer.h
@@ -66,8 +66,8 @@ class MonoJ2KPictureAssetWriter : public J2KPictureAssetWriter
 public:
 	~MonoJ2KPictureAssetWriter();
 
-	FrameInfo write (uint8_t const *, int) override;
 	void fake_write (int size) override;
+	J2KFrameInfo write(uint8_t const *, int) override;
 	bool finalize () override;
 
 private:
diff --git a/src/stereo_j2k_picture_asset_writer.cc b/src/stereo_j2k_picture_asset_writer.cc
index 5a881f79..b5263b7d 100644
--- a/src/stereo_j2k_picture_asset_writer.cc
+++ b/src/stereo_j2k_picture_asset_writer.cc
@@ -87,7 +87,7 @@ StereoJ2KPictureAssetWriter::start (uint8_t const * data, int size)
 }
 
 
-FrameInfo
+J2KFrameInfo
 StereoJ2KPictureAssetWriter::write (uint8_t const * data, int size)
 {
 	DCP_ASSERT (!_finalized);
@@ -123,7 +123,7 @@ StereoJ2KPictureAssetWriter::write (uint8_t const * data, int size)
 		++_frames_written;
 	}
 
-	return FrameInfo (before_offset, _state->mxf_writer.Tell() - before_offset, hash);
+	return J2KFrameInfo(before_offset, _state->mxf_writer.Tell() - before_offset, hash);
 }
 
 
diff --git a/src/stereo_j2k_picture_asset_writer.h b/src/stereo_j2k_picture_asset_writer.h
index c15a1172..98d112f6 100644
--- a/src/stereo_j2k_picture_asset_writer.h
+++ b/src/stereo_j2k_picture_asset_writer.h
@@ -65,8 +65,8 @@ public:
 	 *  @param data JPEG2000 data.
 	 *  @param size Size of data.
 	 */
-	FrameInfo write (uint8_t const * data, int size) override;
 	void fake_write (int size) override;
+	J2KFrameInfo write(uint8_t const * data, int size) override;
 	bool finalize () override;
 
 private: