summaryrefslogtreecommitdiff
path: root/src/subtitle_asset.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-01-17 17:42:51 +0000
committerCarl Hetherington <cth@carlh.net>2014-01-17 17:42:51 +0000
commit44791cafb91bfe1ee5c0a530c83d9f44b4d2f88f (patch)
treecd52e56f325b204035cd53639581228a6be38399 /src/subtitle_asset.h
parent77726c718ccce4af4bc82c3695a13cea859df874 (diff)
Asset -> ContentAsset.
Diffstat (limited to 'src/subtitle_asset.h')
-rw-r--r--src/subtitle_asset.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/subtitle_asset.h b/src/subtitle_asset.h
index e5e2e853..cff65b2b 100644
--- a/src/subtitle_asset.h
+++ b/src/subtitle_asset.h
@@ -21,7 +21,7 @@
#define LIBDCP_SUBTITLE_ASSET_H
#include <libcxml/cxml.h>
-#include "asset.h"
+#include "content_asset.h"
#include "dcp_time.h"
namespace dcp
@@ -133,14 +133,14 @@ private:
bool operator== (Subtitle const & a, Subtitle const & b);
std::ostream& operator<< (std::ostream& s, Subtitle const & sub);
-class SubtitleAsset : public Asset
+class SubtitleAsset : public ContentAsset
{
public:
SubtitleAsset (std::string directory, std::string xml_file);
SubtitleAsset (std::string directory, std::string movie_title, std::string language);
void write_to_cpl (xmlpp::Element *) const;
- virtual bool equals (boost::shared_ptr<const Asset>, EqualityOptions, boost::function<void (NoteType, std::string)> note) const {
+ virtual bool equals (boost::shared_ptr<const ContentAsset>, EqualityOptions, boost::function<void (NoteType, std::string)> note) const {
/* XXX */
note (ERROR, "subtitle assets not compared yet");
return true;