summaryrefslogtreecommitdiff
path: root/src/subtitle_asset.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-08-22 18:03:18 +0100
committerCarl Hetherington <cth@carlh.net>2012-08-22 18:03:18 +0100
commit422c8a63d2368a2e63aee4c391207e3332d1d4c7 (patch)
tree67c27019f5d47130f7512f1d46e75ced3a2558bc /src/subtitle_asset.h
parent78979cc6ad60c03bfc2e3757722d8e18d670a4c3 (diff)
More subs tests.
Diffstat (limited to 'src/subtitle_asset.h')
-rw-r--r--src/subtitle_asset.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/subtitle_asset.h b/src/subtitle_asset.h
index 72563470..efcab3a3 100644
--- a/src/subtitle_asset.h
+++ b/src/subtitle_asset.h
@@ -35,12 +35,6 @@ public:
float v_position;
VAlign v_align;
std::string text;
- Time fade_up_time;
- Time fade_down_time;
-
-private:
- Time fade_time (std::string name);
-
};
class SubtitleNode : public XMLNode
@@ -51,8 +45,13 @@ public:
Time in;
Time out;
+ Time fade_up_time;
+ Time fade_down_time;
std::list<boost::shared_ptr<FontNode> > font_nodes;
std::list<boost::shared_ptr<TextNode> > text_nodes;
+
+private:
+ Time fade_time (std::string name);
};
class FontNode : public XMLNode