summaryrefslogtreecommitdiff
path: root/src/lib/decoder.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-06-19 13:30:02 +0200
committerCarl Hetherington <cth@carlh.net>2020-06-19 13:42:24 +0200
commita0c931b6bfb05b56996a75bbfcf378cd44ef18e1 (patch)
treed02d8cb5ef0fd0f8ce0751bf17fab9c98ffd1868 /src/lib/decoder.h
parentcabe0934c60fb6e74bf4c3023bdcb5c68753e5d9 (diff)
Make Atmos content work more like other content. Now its MXFsencrypt-atmos
are re-written, meaning that they can be encrypted. This commit is mostly just for the backend. We also need a fair few checks/restrictions in the UI: - any present atmos content dictates the project frame rate - no mixed edit rates of atmos content - probably some other things I haven't thought of
Diffstat (limited to 'src/lib/decoder.h')
-rw-r--r--src/lib/decoder.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index ddea58aac..316109ebb 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.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.
@@ -34,6 +34,7 @@ class Decoded;
class VideoDecoder;
class AudioDecoder;
class TextDecoder;
+class AtmosDecoder;
class DecoderPart;
/** @class Decoder.
@@ -48,6 +49,7 @@ public:
boost::shared_ptr<VideoDecoder> video;
boost::shared_ptr<AudioDecoder> audio;
std::list<boost::shared_ptr<TextDecoder> > text;
+ boost::shared_ptr<AtmosDecoder> atmos;
boost::shared_ptr<TextDecoder> only_text () const;