summaryrefslogtreecommitdiff
path: root/src/lib/dcp_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/dcp_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/dcp_content.h')
-rw-r--r--src/lib/dcp_content.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index f01790b89..fedc43d64 100644
--- a/src/lib/dcp_content.h
+++ b/src/lib/dcp_content.h
@@ -108,17 +108,17 @@ public:
bool can_reference_audio (std::string &) const;
- void set_reference_caption (CaptionType type, bool r);
+ void set_reference_caption (TextType type, bool r);
/** @param type Original type of captions in the DCP.
* @return true if these captions are to be referenced.
*/
- bool reference_caption (CaptionType type) const {
+ bool reference_caption (TextType type) const {
boost::mutex::scoped_lock lm (_mutex);
return _reference_caption[type];
}
- bool can_reference_caption (CaptionType type, std::string &) const;
+ bool can_reference_caption (TextType type, std::string &) const;
void set_cpl (std::string id);