projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add another believed-correct subtitle timing fix.
[dcpomatic.git]
/
src
/
lib
/
atmos_mxf_decoder.h
diff --git
a/src/lib/atmos_mxf_decoder.h
b/src/lib/atmos_mxf_decoder.h
index f5b7fe1eef1d3f69f2e4ffcfe5cdb3fc7c4d2c7e..b8e7fc53d81b19a08a2a6c80f5e67f97f4fe10ff 100644
(file)
--- a/
src/lib/atmos_mxf_decoder.h
+++ b/
src/lib/atmos_mxf_decoder.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2020
-2021
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,25
+18,28
@@
*/
*/
+
#include "atmos_metadata.h"
#include "dcpomatic_time.h"
#include "decoder.h"
#include <dcp/atmos_asset_reader.h>
#include "atmos_metadata.h"
#include "dcpomatic_time.h"
#include "decoder.h"
#include <dcp/atmos_asset_reader.h>
+
class AtmosMXFContent;
class AtmosMXFContent;
+
class AtmosMXFDecoder : public Decoder
{
public:
class AtmosMXFDecoder : public Decoder
{
public:
- AtmosMXFDecoder (
boost::shared_ptr<const Film> film, boost
::shared_ptr<const AtmosMXFContent>);
+ AtmosMXFDecoder (
std::shared_ptr<const Film> film, std
::shared_ptr<const AtmosMXFContent>);
- bool pass ();
- void seek (dcpomatic::ContentTime t, bool accurate);
+ bool pass ()
override
;
+ void seek (dcpomatic::ContentTime t, bool accurate)
override
;
private:
private:
-
boost
::shared_ptr<const AtmosMXFContent> _content;
+
std
::shared_ptr<const AtmosMXFContent> _content;
dcpomatic::ContentTime _next;
dcpomatic::ContentTime _next;
-
boost
::shared_ptr<dcp::AtmosAssetReader> _reader;
+
std
::shared_ptr<dcp::AtmosAssetReader> _reader;
boost::optional<AtmosMetadata> _metadata;
};
boost::optional<AtmosMetadata> _metadata;
};