Make Atmos content work more like other content. Now its MXFs

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

diff --git a/src/lib/dcp_encoder.h b/src/lib/dcp_encoder.h
index 8a2ad947dcc95d3f391d878f7ef18cad0a9ed2e6..e5df30fb524ac9cb897883bdfe1addb610f65310 100644 (file)
--- a/src/lib/dcp_encoder.h
+++ b/src/lib/dcp_encoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,9 +18,12 @@
 
 */
 
+#include "atmos_metadata.h"
 #include "types.h"
 #include "player_text.h"
+#include "dcp_text_track.h"
 #include "encoder.h"
+#include <dcp/atmos_frame.h>
 #include <boost/weak_ptr.hpp>
 
 class Film;
@@ -40,7 +43,7 @@ public:
 
        void go ();
 
-       float current_rate () const;
+       boost::optional<float> current_rate () const;
        Frame frames_done () const;
 
        /** @return true if we are in the process of calling Encoder::process_end */
@@ -50,9 +53,10 @@ public:
 
 private:
 
-       void video (boost::shared_ptr<PlayerVideo>, DCPTime);
-       void audio (boost::shared_ptr<AudioBuffers>, DCPTime);
-       void text (PlayerText, TextType, DCPTimePeriod);
+       void video (boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime);
+       void audio (boost::shared_ptr<AudioBuffers>, dcpomatic::DCPTime);
+       void text (PlayerText, TextType, boost::optional<DCPTextTrack>, dcpomatic::DCPTimePeriod);
+       void atmos (boost::shared_ptr<const dcp::AtmosFrame>, dcpomatic::DCPTime, AtmosMetadata metadata);
 
        boost::shared_ptr<Writer> _writer;
        boost::shared_ptr<J2KEncoder> _j2k_encoder;
@@ -62,4 +66,5 @@ private:
        boost::signals2::scoped_connection _player_video_connection;
        boost::signals2::scoped_connection _player_audio_connection;
        boost::signals2::scoped_connection _player_text_connection;
+       boost::signals2::scoped_connection _player_atmos_connection;
 };