projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump libdcp to fix an error in the player (#2401).
[dcpomatic.git]
/
src
/
lib
/
atmos_content.h
diff --git
a/src/lib/atmos_content.h
b/src/lib/atmos_content.h
index 948c3d3c0638bc216dd071544873fe4b7df22eff..cfacb9729255adc033f6d6e95fbc5fde6f450bf8 100644
(file)
--- a/
src/lib/atmos_content.h
+++ b/
src/lib/atmos_content.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.
@@
-20,6
+20,7
@@
#include "content_part.h"
#include "content_part.h"
+#include "types.h"
class Content;
class Content;
@@
-35,7
+36,8
@@
public:
class AtmosContent : public ContentPart
{
public:
class AtmosContent : public ContentPart
{
public:
- AtmosContent (Content* parent);
+ explicit AtmosContent (Content* parent);
+ AtmosContent (Content* parent, cxml::ConstNodePtr node);
static std::shared_ptr<AtmosContent> from_xml (Content* parent, cxml::ConstNodePtr node);
static std::shared_ptr<AtmosContent> from_xml (Content* parent, cxml::ConstNodePtr node);
@@
-54,8
+56,6
@@
public:
}
private:
}
private:
- AtmosContent (Content* parent, cxml::ConstNodePtr node);
-
Frame _length;
dcp::Fraction _edit_rate;
};
Frame _length;
dcp::Fraction _edit_rate;
};