Re-add missing audio mapping in butler for preview.

[dcpomatic.git] / src / lib / dcp_decoder.h

diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index 12e37104e599b76f7e272d212bef9fdfb1683b7d..71687ad15df1e3eabe711466f7d27cc21f78e776 100644 (file)
--- a/src/lib/dcp_decoder.h
+++ b/src/lib/dcp_decoder.h
@@ -23,19 +23,20 @@
  */
 
 #include "decoder.h"
+#include "dcp.h"
+#include <dcp/mono_picture_asset_reader.h>
+#include <dcp/stereo_picture_asset_reader.h>
+#include <dcp/sound_asset_reader.h>
 
 namespace dcp {
        class Reel;
-       class MonoPictureAssetReader;
-       class StereoPictureAssetReader;
-       class SoundAssetReader;
 }
 
 class DCPContent;
 class Log;
 struct dcp_subtitle_within_dcp_test;
 
-class DCPDecoder : public Decoder
+class DCPDecoder : public DCP, public Decoder
 {
 public:
        DCPDecoder (boost::shared_ptr<const DCPContent>, boost::shared_ptr<Log> log);
@@ -46,18 +47,15 @@ public:
 
        void set_decode_referenced ();
 
+       bool pass ();
+       void seek (ContentTime t, bool accurate);
+
 private:
        friend struct dcp_subtitle_within_dcp_test;
 
-       bool pass (PassReason, bool accurate);
-       void seek (ContentTime t, bool accurate);
        void next_reel ();
        void get_readers ();
 
-       std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
-       std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;
-
-       boost::shared_ptr<const DCPContent> _dcp_content;
        /** Time of next thing to return from pass relative to the start of _reel */
        ContentTime _next;
        std::list<boost::shared_ptr<dcp::Reel> > _reels;