boost::algorithm::replace_all (t, ">", ">");
i.set_text (t);
- /* Force our configured appearance */
- i.set_colour (content()->colour());
- i.set_effect_colour (content()->effect_colour());
- if (content()->outline()) {
- i.set_effect (dcp::BORDER);
- } else if (content()->shadow()) {
- i.set_effect (dcp::SHADOW);
+ /* Set any forced appearance */
+ if (content()->colour()) {
+ i.set_colour (*content()->colour());
+ }
+ if (content()->effect_colour()) {
+ i.set_effect_colour (*content()->effect_colour());
+ }
+ if (content()->effect()) {
+ i.set_effect (*content()->effect());
+ }
+ if (content()->fade_in()) {
+ i.set_fade_up_time (dcp::Time(content()->fade_in()->seconds(), 1000));
+ }
+ if (content()->fade_out()) {
+ i.set_fade_down_time (dcp::Time(content()->fade_out()->seconds(), 1000));
}
- i.set_fade_up_time (dcp::Time(content()->fade_in().seconds(), 1000));
- i.set_fade_down_time (dcp::Time(content()->fade_out().seconds(), 1000));
}
TextStart (ContentTextSubtitle (from, s));