summaryrefslogtreecommitdiff
path: root/src/lib/content.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-07-23 11:20:12 +0100
committerCarl Hetherington <cth@carlh.net>2018-07-23 11:20:12 +0100
commitdf17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc (patch)
tree04e6f5917ed3c2e8ea45904ff0235c08d29a6446 /src/lib/content.h
parent6f146336b73fe720c83cb75ebdf15e9cb9c02973 (diff)
More automated renaming.
ActiveCaptions -> ActiveText BitmapCaption -> BitmapText ContentCaption -> ContentText ContentTextCaption -> ContentStringText TextCaptionFileContent -> StringTextFileContent TextCaptionFileDecoder -> StringTextFileDecoder TextCaptionFile -> StringTextFile TextCaption -> StringText PlayerCaption -> PlayerText CaptionContent -> TextContent CaptionDecoder -> TextDecoder CaptionPanel -> TextPanel CaptionView -> TextView CaptionAppearanceDialog -> SubtitleAppearanceDialog CaptionType -> TextType
Diffstat (limited to 'src/lib/content.h')
-rw-r--r--src/lib/content.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/content.h b/src/lib/content.h
index d84f636fb..850cb0891 100644
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -182,10 +182,10 @@ public:
boost::shared_ptr<VideoContent> video;
boost::shared_ptr<AudioContent> audio;
- std::list<boost::shared_ptr<CaptionContent> > caption;
+ std::list<boost::shared_ptr<TextContent> > caption;
- boost::shared_ptr<CaptionContent> only_caption () const;
- boost::shared_ptr<CaptionContent> caption_of_original_type (CaptionType type) const;
+ boost::shared_ptr<TextContent> only_caption () const;
+ boost::shared_ptr<TextContent> caption_of_original_type (TextType type) const;
void signal_changed (int);