X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Freel_subtitle_asset.h;h=876b35114c76fb5ca9eadf96972a011a4f78acb1;hb=689d56339857b0a82156641f28392b8d2f11beea;hp=5cdfac13a4d5a62417a70a061779e6b6fe1b8358;hpb=f9862aff32f7ea5aa10f9362d7598480b1c9cf28;p=libdcp.git diff --git a/src/reel_subtitle_asset.h b/src/reel_subtitle_asset.h index 5cdfac13..876b3511 100644 --- a/src/reel_subtitle_asset.h +++ b/src/reel_subtitle_asset.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington 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" +#include "subtitle_asset.h" namespace dcp { -class SubtitleContent; +class SubtitleAsset; /** @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: - ReelSubtitleAsset (boost::shared_ptr content, int64_t entry_point); + ReelSubtitleAsset (boost::shared_ptr asset, Fraction edit_rate, int64_t instrinsic_duration, int64_t entry_point); ReelSubtitleAsset (boost::shared_ptr); - boost::shared_ptr subtitle_content () const { - return boost::dynamic_pointer_cast (_content.object ()); + boost::shared_ptr subtitle_asset () const { + return boost::dynamic_pointer_cast (_asset_ref.object ()); } -private: +private: std::string cpl_node_name () const; };