Cleanup: use a namespace.

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

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index 0f4e1afa1fadb2ff535294e3ca014d672466fbd3..e72573ebc085352aa751cd82c4cdc39268f251cf 100644 (file)
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -304,7 +304,7 @@ DCPDecoder::pass_texts (
                                                        ContentTime::from_frames(_offset - entry_point, vfr) + ContentTime::from_seconds(b.out().as_seconds())
                                                        ),
                                                strings,
-                                               _dcp_content->standard()
+                                               asset->subtitle_standard()
                                                );
                                        strings.clear ();
                                }
@@ -340,7 +340,7 @@ DCPDecoder::pass_texts (
                                        ContentTime::from_frames(_offset - entry_point, vfr) + ContentTime::from_seconds(b.out().as_seconds())
                                        ),
                                strings,
-                               _dcp_content->standard()
+                               asset->subtitle_standard()
                                );
                        strings.clear ();
                }
@@ -368,6 +368,7 @@ DCPDecoder::get_readers ()
                return;
        }
 
+       DCPOMATIC_ASSERT(video);
        if (!video->ignore() && (*_reel)->main_picture()) {
                auto asset = (*_reel)->main_picture()->asset ();
                auto mono = dynamic_pointer_cast<dcp::MonoPictureAsset> (asset);
@@ -387,6 +388,7 @@ DCPDecoder::get_readers ()
                _stereo_reader.reset ();
        }
 
+       DCPOMATIC_ASSERT(audio);
        if (!audio->ignore() && (*_reel)->main_sound()) {
                _sound_reader = (*_reel)->main_sound()->asset()->start_read ();
                _sound_reader->set_check_hmac (false);