Cleanup: extract pass_atmos().

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index 1dc37d38492b73a9c20d7ad146f2ae15940b71ec..9f1a80160062dcc33decdf95395075f2b3a8be28 100644 (file)
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -205,6 +205,15 @@ DCPDecoder::pass_audio(Frame frame, double video_frame_rate)
 }
 
 
+void
+DCPDecoder::pass_atmos(Frame frame)
+{
+       DCPOMATIC_ASSERT (_atmos_metadata);
+       auto const entry_point = (*_reel)->atmos()->entry_point().get_value_or(0);
+       atmos->emit (film(), _atmos_reader->get_frame(entry_point + frame), _offset + frame, *_atmos_metadata);
+}
+
+
 Decoder::PassResult
 DCPDecoder::pass ()
 {
@@ -241,9 +250,7 @@ DCPDecoder::pass ()
        }
 
        if (_atmos_reader) {
-               DCPOMATIC_ASSERT (_atmos_metadata);
-               auto const entry_point = (*_reel)->atmos()->entry_point().get_value_or(0);
-               atmos->emit (film(), _atmos_reader->get_frame(entry_point + frame), _offset + frame, *_atmos_metadata);
+               pass_atmos(frame);
        }
 
        _next += ContentTime::from_frames (1, vfr);

diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index dfe941eb0e7aeacba3c560ef1cc3c40799793f43..56e7a73f5275d5802c6bfeb6073a70264c7ca35a 100644 (file)
--- a/src/lib/dcp_decoder.h
+++ b/src/lib/dcp_decoder.h
@@ -75,6 +75,7 @@ private:
        void get_readers ();
        void pass_video(Frame frame, dcp::Size size);
        void pass_audio(Frame frame, double video_frame_rate);
+       void pass_atmos(Frame frame);
        void pass_texts (dcpomatic::ContentTime next, dcp::Size size);
        void pass_texts (
                dcpomatic::ContentTime next,