Add test() to cscript.

[libdcp.git] / src / picture_asset_writer.h

diff --git a/src/picture_asset_writer.h b/src/picture_asset_writer.h
index 6f33d3b693cf40c563595a2489d504b176b09b45..d30d9a858654c3a908c8e4410d0ebe1532f866c0 100644 (file)
--- 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>
@@ -29,18 +32,20 @@ namespace libdcp {
 
 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);
-
-       void write (std::ostream& s);
-       
        uint64_t offset;
        uint64_t size;
        std::string hash;
@@ -58,7 +63,7 @@ protected:
        template <class P, class Q>
        friend void start (PictureAssetWriter *, boost::shared_ptr<P>, Q *, uint8_t *, int);
 
-       PictureAssetWriter (PictureAsset *, bool, MXFMetadata const &);
+       PictureAssetWriter (PictureAsset *, bool);
 
        PictureAsset* _asset;
        
@@ -71,71 +76,8 @@ protected:
        /** true if finalize() has been called */
        bool _finalized;
        bool _overwrite;
-       MXFMetadata _metadata;
-};
-
-/** A helper class for writing to MonoPictureAssets progressively (i.e. writing frame-by-frame,
- *  rather than giving libdcp all the frames in one go).
- *
- *  Objects of this class can only be created with MonoPictureAsset::start_write().
- *
- *  Frames can be written to the MonoPictureAsset by calling write() with a JPEG2000 image
- *  (a verbatim .j2c file).  finalize() must be called after the last frame has been written.
- *  The action of finalize() can't be done in MonoPictureAssetWriter's destructor as it may
- *  throw an exception.
- */
-class MonoPictureAssetWriter : public PictureAssetWriter
-{
-public:
-       FrameInfo write (uint8_t *, int);
-       void fake_write (int size);
-       void finalize ();
-
-private:
-       friend class MonoPictureAsset;
-
-       MonoPictureAssetWriter (PictureAsset *, bool, MXFMetadata const &);
-       void start (uint8_t *, int);
-
-       /* do this with an opaque pointer so we don't have to include
-          ASDCP headers
-       */
-          
-       struct MonoASDCPState;
-       boost::shared_ptr<MonoASDCPState> _state;
-};
-
-/** A helper class for writing to StereoPictureAssets progressively (i.e. writing frame-by-frame,
- *  rather than giving libdcp all the frames in one go).
- *
- *  Objects of this class can only be created with StereoPictureAsset::start_write().
- *
- *  Frames can be written to the MonoPictureAsset by calling write() with a JPEG2000 image
- *  (a verbatim .j2c file).  finalize() must be called after the last frame has been written.
- *  The action of finalize() can't be done in MonoPictureAssetWriter's destructor as it may
- *  throw an exception.
- */
-class StereoPictureAssetWriter : public PictureAssetWriter
-{
-public:
-       FrameInfo write (uint8_t *, int);
-       void fake_write (int size);
-       void finalize ();
-
-private:
-       friend class StereoPictureAsset;
-
-       StereoPictureAssetWriter (PictureAsset *, bool, MXFMetadata const &);
-       void start (uint8_t *, int);
-
-       /* do this with an opaque pointer so we don't have to include
-          ASDCP headers
-       */
-          
-       struct StereoASDCPState;
-       boost::shared_ptr<StereoASDCPState> _state;
-
-       libdcp::Eye _next_eye;
 };
 
 }
+
+#endif