summaryrefslogtreecommitdiff
path: root/src/lib/types.cc
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/types.cc
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/types.cc')
-rw-r--r--src/lib/types.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/types.cc b/src/lib/types.cc
index 5474b609a..7f0bf4305 100644
--- a/src/lib/types.cc
+++ b/src/lib/types.cc
@@ -93,7 +93,7 @@ Crop::as_xml (xmlpp::Node* node) const
node->add_child("BottomCrop")->add_child_text (raw_convert<string> (bottom));
}
-CaptionType
+TextType
string_to_caption_type (string s)
{
if (s == "open") {
@@ -106,7 +106,7 @@ string_to_caption_type (string s)
}
string
-caption_type_to_string (CaptionType t)
+caption_type_to_string (TextType t)
{
switch (t) {
case CAPTION_OPEN:
@@ -119,7 +119,7 @@ caption_type_to_string (CaptionType t)
}
string
-caption_type_to_name (CaptionType t)
+caption_type_to_name (TextType t)
{
switch (t) {
case CAPTION_OPEN: