Tidy up a bit; vertical white space, group metadata together,

[libdcp.git] / src / mono_picture_asset_reader.h

diff --git a/src/mono_picture_asset_reader.h b/src/mono_picture_asset_reader.h
index 08f9fde0f4a23759a011d4693f01c0ae2bf818ca..4caf80f96e7427a4bf413abf02b424cb5af1b109 100644 (file)
--- a/src/mono_picture_asset_reader.h
+++ b/src/mono_picture_asset_reader.h
@@ -31,32 +31,16 @@
     files in the program, then also delete it here.
 */
 
-#include "asset_reader.h"
-#include <boost/shared_ptr.hpp>
+#ifndef LIBDCP_MONO_PICTURE_ASSET_READER_H
+#define LIBDCP_MONO_PICTURE_ASSET_READER_H
 
-namespace ASDCP {
-       namespace JP2K {
-               class MXFReader;
-       }
-}
+#include "asset_reader.h"
+#include "mono_picture_frame.h"
 
 namespace dcp {
 
-class MonoPictureFrame;
-class MonoPictureAsset;
-
-class MonoPictureAssetReader : public AssetReader
-{
-public:
-       ~MonoPictureAssetReader ();
-       boost::shared_ptr<const MonoPictureFrame> get_frame (int n) const;
-
-private:
-       friend class MonoPictureAsset;
-
-       explicit MonoPictureAssetReader (MonoPictureAsset const *);
-
-       ASDCP::JP2K::MXFReader* _reader;
-};
+typedef AssetReader<ASDCP::JP2K::MXFReader, MonoPictureFrame> MonoPictureAssetReader;
 
 }
+
+#endif