projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix incorrect reading of ScreenAspectRatio.
[libdcp.git]
/
src
/
reel_subtitle_asset.h
diff --git
a/src/reel_subtitle_asset.h
b/src/reel_subtitle_asset.h
index 5cdfac13a4d5a62417a70a061779e6b6fe1b8358..876b35114c76fb5ca9eadf96972a011a4f78acb1 100644
(file)
--- a/
src/reel_subtitle_asset.h
+++ b/
src/reel_subtitle_asset.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-201
4
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
5
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-25,10
+25,11
@@
#define LIBDCP_REEL_SUBTITLE_ASSET_H
#include "reel_asset.h"
#define LIBDCP_REEL_SUBTITLE_ASSET_H
#include "reel_asset.h"
+#include "subtitle_asset.h"
namespace dcp {
namespace dcp {
-class Subtitle
Conten
t;
+class Subtitle
Asse
t;
/** @class ReelSubtitleAsset
* @brief Part of a Reel's description which refers to a subtitle XML file.
/** @class ReelSubtitleAsset
* @brief Part of a Reel's description which refers to a subtitle XML file.
@@
-36,14
+37,14
@@
class SubtitleContent;
class ReelSubtitleAsset : public ReelAsset
{
public:
class ReelSubtitleAsset : public ReelAsset
{
public:
- ReelSubtitleAsset (boost::shared_ptr<Subtitle
Content> content
, int64_t entry_point);
+ ReelSubtitleAsset (boost::shared_ptr<Subtitle
Asset> asset, Fraction edit_rate, int64_t instrinsic_duration
, int64_t entry_point);
ReelSubtitleAsset (boost::shared_ptr<const cxml::Node>);
ReelSubtitleAsset (boost::shared_ptr<const cxml::Node>);
- boost::shared_ptr<Subtitle
Content> subtitle_conten
t () const {
- return boost::dynamic_pointer_cast<Subtitle
Content> (_content
.object ());
+ boost::shared_ptr<Subtitle
Asset> subtitle_asse
t () const {
+ return boost::dynamic_pointer_cast<Subtitle
Asset> (_asset_ref
.object ());
}
}
-private:
+private:
std::string cpl_node_name () const;
};
std::string cpl_node_name () const;
};