2016-07-08 Carl Hetherington <cth@carlh.net>
+ * Support shadow in subtitles (#911).
+
* Version 2.9.0 released.
2016-07-07 Carl Hetherington <cth@carlh.net>
* are present.
* 34 -> 35
* VideoFrameType in VideoContent is a string rather than an integer.
+ * 35 -> 36
+ * EffectColour rather than OutlineColour in Subtitle.
*/
-int const Film::current_state_version = 35;
+int const Film::current_state_version = 36;
/** Construct a Film object in a given directory.
*
property == DCPContentProperty::CAN_BE_PLAYED ||
property == SubtitleContentProperty::COLOUR ||
property == SubtitleContentProperty::OUTLINE ||
- property == SubtitleContentProperty::OUTLINE_COLOUR ||
+ property == SubtitleContentProperty::SHADOW ||
+ property == SubtitleContentProperty::EFFECT_COLOUR ||
property == FFmpegContentProperty::SUBTITLE_STREAM ||
property == VideoContentProperty::COLOUR_CONVERSION
) {
int const SubtitleContentProperty::FONTS = 507;
int const SubtitleContentProperty::COLOUR = 508;
int const SubtitleContentProperty::OUTLINE = 509;
-int const SubtitleContentProperty::OUTLINE_COLOUR = 510;
-int const SubtitleContentProperty::LINE_SPACING = 511;
+int const SubtitleContentProperty::SHADOW = 510;
+int const SubtitleContentProperty::EFFECT_COLOUR = 511;
+int const SubtitleContentProperty::LINE_SPACING = 512;
SubtitleContent::SubtitleContent (Content* parent)
: ContentPart (parent)
, _y_scale (1)
, _colour (255, 255, 255)
, _outline (false)
- , _outline_colour (0, 0, 0)
+ , _shadow (false)
+ , _effect_colour (0, 0, 0)
, _line_spacing (1)
{
node->optional_number_child<int>("Blue").get_value_or(255)
)
, _outline (node->optional_bool_child("Outline").get_value_or(false))
- , _outline_colour (
- node->optional_number_child<int>("OutlineRed").get_value_or(255),
- node->optional_number_child<int>("OutlineGreen").get_value_or(255),
- node->optional_number_child<int>("OutlineBlue").get_value_or(255)
- )
+ , _shadow (node->optional_bool_child("Shadow").get_value_or(false))
, _line_spacing (node->optional_number_child<double>("LineSpacing").get_value_or (1))
{
if (version >= 32) {
_x_scale = _y_scale = node->number_child<double> ("SubtitleScale");
}
+ if (version >= 36) {
+ _effect_colour = dcp::Colour (
+ node->optional_number_child<int>("EffectRed").get_value_or(255),
+ node->optional_number_child<int>("EffectGreen").get_value_or(255),
+ node->optional_number_child<int>("EffectBlue").get_value_or(255)
+ );
+ } else {
+ _effect_colour = dcp::Colour (
+ node->optional_number_child<int>("OutlineRed").get_value_or(255),
+ node->optional_number_child<int>("OutlineGreen").get_value_or(255),
+ node->optional_number_child<int>("OutlineBlue").get_value_or(255)
+ );
+ }
+
_language = node->optional_string_child ("SubtitleLanguage").get_value_or ("");
list<cxml::NodePtr> fonts = node->node_children ("Font");
root->add_child("Green")->add_child_text (raw_convert<string> (_colour.g));
root->add_child("Blue")->add_child_text (raw_convert<string> (_colour.b));
root->add_child("Outline")->add_child_text (raw_convert<string> (_outline));
- root->add_child("OutlineRed")->add_child_text (raw_convert<string> (_outline_colour.r));
- root->add_child("OutlineGreen")->add_child_text (raw_convert<string> (_outline_colour.g));
- root->add_child("OutlineBlue")->add_child_text (raw_convert<string> (_outline_colour.b));
+ root->add_child("Shadow")->add_child_text (raw_convert<string> (_shadow));
+ root->add_child("EffectRed")->add_child_text (raw_convert<string> (_effect_colour.r));
+ root->add_child("EffectGreen")->add_child_text (raw_convert<string> (_effect_colour.g));
+ root->add_child("EffectBlue")->add_child_text (raw_convert<string> (_effect_colour.b));
root->add_child("LineSpacing")->add_child_text (raw_convert<string> (_line_spacing));
for (list<shared_ptr<Font> >::const_iterator i = _fonts.begin(); i != _fonts.end(); ++i) {
}
void
-SubtitleContent::set_outline_colour (dcp::Colour colour)
+SubtitleContent::set_shadow (bool s)
+{
+ maybe_set (_shadow, s, SubtitleContentProperty::SHADOW);
+}
+
+void
+SubtitleContent::set_effect_colour (dcp::Colour colour)
{
- maybe_set (_outline_colour, colour, SubtitleContentProperty::OUTLINE_COLOUR);
+ maybe_set (_effect_colour, colour, SubtitleContentProperty::EFFECT_COLOUR);
}
void
static int const FONTS;
static int const COLOUR;
static int const OUTLINE;
- static int const OUTLINE_COLOUR;
+ static int const SHADOW;
+ static int const EFFECT_COLOUR;
static int const LINE_SPACING;
};
return _outline;
}
- void set_outline_colour (dcp::Colour);
+ void set_shadow (bool);
- dcp::Colour outline_colour () const {
+ bool shadow () const {
boost::mutex::scoped_lock lm (_mutex);
- return _outline_colour;
+ return _shadow;
+ }
+
+ void set_effect_colour (dcp::Colour);
+
+ dcp::Colour effect_colour () const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _effect_colour;
}
void set_line_spacing (double s);
std::list<boost::shared_ptr<Font> > _fonts;
dcp::Colour _colour;
bool _outline;
- dcp::Colour _outline_colour;
+ bool _shadow;
+ dcp::Colour _effect_colour;
std::list<boost::signals2::connection> _font_connections;
/** scaling factor for line spacing; 1 is "standard", < 1 is closer together, > 1 is further apart */
double _line_spacing;
}
}
+ dcp::Effect effect = dcp::NONE;
+ if (content()->outline()) {
+ effect = dcp::BORDER;
+ } else if (content()->shadow()) {
+ effect = dcp::SHADOW;
+ }
+
out.push_back (
dcp::SubtitleString (
string(TEXT_FONT_ID),
v_align,
dcp::DIRECTION_LTR,
j.text,
- content()->outline() ? dcp::BORDER : dcp::NONE,
- content()->outline_colour(),
+ effect,
+ content()->effect_colour(),
dcp::Time (0, 1000),
dcp::Time (0, 1000)
)
_colour = new wxColourPickerCtrl (this, wxID_ANY);
add (_colour);
- _outline = new wxCheckBox (this, wxID_ANY, _("Outline"));
+ wxRadioButton* no_effect = new wxRadioButton (this, wxID_ANY, _("No effect"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
+ add (no_effect);
+ add_spacer ();
+
+ _outline = new wxRadioButton (this, wxID_ANY, _("Outline"));
add (_outline);
add_spacer ();
- add (_("Outline colour"), true);
- _outline_colour = new wxColourPickerCtrl (this, wxID_ANY);
- add (_outline_colour);
+ _shadow = new wxRadioButton (this, wxID_ANY, _("Shadow"));
+ add (_shadow);
+ add_spacer ();
+
+ add (_("Outline / shadow colour"), true);
+ _effect_colour = new wxColourPickerCtrl (this, wxID_ANY);
+ add (_effect_colour);
layout ();
_colour->SetColour (wxColour (_content->colour().r, _content->colour().g, _content->colour().b));
_outline->SetValue (_content->outline ());
- _outline_colour->SetColour (
- wxColour (_content->outline_colour().r, _content->outline_colour().g, _content->outline_colour().b)
+ _shadow->SetValue (_content->shadow ());
+ _effect_colour->SetColour (
+ wxColour (_content->effect_colour().r, _content->effect_colour().g, _content->effect_colour().b)
);
}
wxColour const c = _colour->GetColour ();
_content->set_colour (dcp::Colour (c.Red(), c.Green(), c.Blue()));
_content->set_outline (_outline->GetValue ());
- wxColour const oc = _outline_colour->GetColour ();
- _content->set_outline_colour (dcp::Colour (oc.Red(), oc.Green(), oc.Blue()));
+ _content->set_shadow (_shadow->GetValue ());
+ wxColour const ec = _effect_colour->GetColour ();
+ _content->set_effect_colour (dcp::Colour (ec.Red(), ec.Green(), ec.Blue()));
}
#include "table_dialog.h"
#include <boost/shared_ptr.hpp>
-class wxCheckBox;
+class wxRadioButton;
class wxColourPickerCtrl;
class SubtitleContent;
private:
wxColourPickerCtrl* _colour;
- wxCheckBox* _outline;
- wxColourPickerCtrl* _outline_colour;
+ wxRadioButton* _outline;
+ wxRadioButton* _shadow;
+ wxColourPickerCtrl* _effect_colour;
boost::shared_ptr<SubtitleContent> _content;
};