Add fix_empty_font_ids() to replace empty Font ids with a dummy string.

[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 b66c6cbe431e71cd30abcb9b7b757d31c06d6dac..4caf80f96e7427a4bf413abf02b424cb5af1b109 100644 (file)
--- a/src/mono_picture_asset_reader.h
+++ b/src/mono_picture_asset_reader.h
@@ -15,34 +15,32 @@
 
     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.
 */
 
-#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;
-
-       MonoPictureAssetReader (MonoPictureAsset const *);
-
-       ASDCP::JP2K::MXFReader* _reader;
-};
+typedef AssetReader<ASDCP::JP2K::MXFReader, MonoPictureFrame> MonoPictureAssetReader;
 
 }
+
+#endif