summaryrefslogtreecommitdiff
path: root/src/reel.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-09-01 22:52:21 +0100
committerCarl Hetherington <cth@carlh.net>2013-09-01 22:52:21 +0100
commit2b8326dcc766aae7e1c275a6c89050c6aa507f96 (patch)
treee0c0fb4b5a7c35e3af91bc43d508a621b7a0315f /src/reel.h
parent8924ad6077ecb84385ecdcd244921af2dc34f9fb (diff)
Fill in various AssetInstance bits.
Diffstat (limited to 'src/reel.h')
-rw-r--r--src/reel.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/reel.h b/src/reel.h
index a5e79331..b6684d02 100644
--- a/src/reel.h
+++ b/src/reel.h
@@ -32,9 +32,9 @@ namespace xmlpp {
namespace libdcp {
-class PictureAsset;
-class SoundAsset;
-class SubtitleAsset;
+class MainPicture;
+class MainSound;
+class MainSubtitle;
class KDM;
/** @brief A reel within a DCP; the part which actually contains picture, sound and subtitle data */
@@ -42,24 +42,24 @@ class Reel
{
public:
Reel (
- boost::shared_ptr<PictureAsset> picture,
- boost::shared_ptr<SoundAsset> sound,
- boost::shared_ptr<SubtitleAsset> subtitle
+ boost::shared_ptr<MainPicture> picture,
+ boost::shared_ptr<MainSound> sound,
+ boost::shared_ptr<MainSubtitle> subtitle
)
: _main_picture (picture)
, _main_sound (sound)
, _main_subtitle (subtitle)
{}
- boost::shared_ptr<const PictureAsset> main_picture () const {
+ boost::shared_ptr<const MainPicture> main_picture () const {
return _main_picture;
}
- boost::shared_ptr<const SoundAsset> main_sound () const {
+ boost::shared_ptr<const MainSound> main_sound () const {
return _main_sound;
}
- boost::shared_ptr<const SubtitleAsset> main_subtitle () const {
+ boost::shared_ptr<const MainSubtitle> main_subtitle () const {
return _main_subtitle;
}
@@ -72,9 +72,9 @@ public:
void add_kdm (KDM const &);
private:
- boost::shared_ptr<PictureAsset> _main_picture;
- boost::shared_ptr<SoundAsset> _main_sound;
- boost::shared_ptr<SubtitleAsset> _main_subtitle;
+ boost::shared_ptr<MainPicture> _main_picture;
+ boost::shared_ptr<MainSound> _main_sound;
+ boost::shared_ptr<MainSubtitle> _main_subtitle;
};
}