Adapt for changes in parent branch, and test churn.

[libdcp.git] / src / picture_asset_writer.h

diff --git a/src/picture_asset_writer.h b/src/picture_asset_writer.h
index 5527537da4688dec74cc4e6261ccdee8e3c01069..f2bd611b1977aa083d8bf8e7413d959908379754 100644 (file)
--- a/src/picture_asset_writer.h
+++ b/src/picture_asset_writer.h
@@ -45,7 +45,6 @@
 #include <boost/utility.hpp>
 #include <stdint.h>
 #include <string>
-#include <fstream>
 
 namespace dcp {
 
@@ -78,17 +77,16 @@ struct FrameInfo
 class PictureAssetWriter : public AssetWriter
 {
 public:
-       virtual FrameInfo write (uint8_t *, int) = 0;
+       virtual FrameInfo write (uint8_t const *, int) = 0;
        virtual void fake_write (int) = 0;
 
 protected:
        template <class P, class Q>
-       friend void start (PictureAssetWriter *, boost::shared_ptr<P>, Standard, Q *, uint8_t *, int);
+       friend void start (PictureAssetWriter *, boost::shared_ptr<P>, Q *, uint8_t const *, int);
 
-       PictureAssetWriter (PictureAsset *, boost::filesystem::path, Standard standard, bool);
+       PictureAssetWriter (PictureAsset *, boost::filesystem::path, bool);
 
        PictureAsset* _picture_asset;
-       Standard _standard;
        bool _overwrite;
 };