From 2246204c213d61b2cde7a85d6038156283670c9d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 30 Apr 2015 19:22:31 +0100 Subject: Rename some things to ...Node. --- src/font.cc | 96 ----------------------------------------- src/font.h | 59 ------------------------- src/font_node.cc | 96 +++++++++++++++++++++++++++++++++++++++++ src/font_node.h | 59 +++++++++++++++++++++++++ src/interop_load_font.cc | 56 ------------------------ src/interop_load_font.h | 40 ----------------- src/interop_load_font_node.cc | 56 ++++++++++++++++++++++++ src/interop_load_font_node.h | 40 +++++++++++++++++ src/interop_subtitle_content.cc | 22 +++++----- src/interop_subtitle_content.h | 8 ++-- src/load_font.h | 35 --------------- src/load_font_node.h | 35 +++++++++++++++ src/smpte_load_font.cc | 31 ------------- src/smpte_load_font.h | 39 ----------------- src/smpte_load_font_node.cc | 31 +++++++++++++ src/smpte_load_font_node.h | 39 +++++++++++++++++ src/smpte_subtitle_content.cc | 14 +++--- src/smpte_subtitle_content.h | 6 +-- src/subtitle.cc | 72 ------------------------------- src/subtitle.h | 56 ------------------------ src/subtitle_content.cc | 22 +++++----- src/subtitle_content.h | 24 +++++------ src/subtitle_node.cc | 72 +++++++++++++++++++++++++++++++ src/subtitle_node.h | 56 ++++++++++++++++++++++++ src/text.cc | 63 --------------------------- src/text.h | 57 ------------------------ src/text_node.cc | 63 +++++++++++++++++++++++++++ src/text_node.h | 57 ++++++++++++++++++++++++ src/wscript | 10 ++--- 29 files changed, 657 insertions(+), 657 deletions(-) delete mode 100644 src/font.cc delete mode 100644 src/font.h create mode 100644 src/font_node.cc create mode 100644 src/font_node.h delete mode 100644 src/interop_load_font.cc delete mode 100644 src/interop_load_font.h create mode 100644 src/interop_load_font_node.cc create mode 100644 src/interop_load_font_node.h delete mode 100644 src/load_font.h create mode 100644 src/load_font_node.h delete mode 100644 src/smpte_load_font.cc delete mode 100644 src/smpte_load_font.h create mode 100644 src/smpte_load_font_node.cc create mode 100644 src/smpte_load_font_node.h delete mode 100644 src/subtitle.cc delete mode 100644 src/subtitle.h create mode 100644 src/subtitle_node.cc create mode 100644 src/subtitle_node.h delete mode 100644 src/text.cc delete mode 100644 src/text.h create mode 100644 src/text_node.cc create mode 100644 src/text_node.h (limited to 'src') diff --git a/src/font.cc b/src/font.cc deleted file mode 100644 index 8656e909..00000000 --- a/src/font.cc +++ /dev/null @@ -1,96 +0,0 @@ -/* - Copyright (C) 2012-2014 Carl Hetherington - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - -#include "types.h" -#include "raw_convert.h" -#include "font.h" -#include "xml.h" -#include "text.h" -#include -#include - -using std::string; -using std::list; -using boost::shared_ptr; -using boost::optional; -using namespace dcp; - -Font::Font (cxml::ConstNodePtr node, int tcr) -{ - text = node->content (); - - id = node->optional_string_attribute ("Id"); - size = node->optional_number_attribute ("Size").get_value_or (0); - italic = node->optional_bool_attribute ("Italic"); - optional c = node->optional_string_attribute ("Color"); - if (c) { - colour = Colour (c.get ()); - } - optional const e = node->optional_string_attribute ("Effect"); - if (e) { - effect = string_to_effect (e.get ()); - } - c = node->optional_string_attribute ( "EffectColor"); - if (c) { - effect_colour = Colour (c.get ()); - } - - list s = node->node_children ("Subtitle"); - BOOST_FOREACH (cxml::NodePtr& i, s) { - subtitle_nodes.push_back (shared_ptr (new Subtitle (i, tcr))); - } - - list f = node->node_children ("Font"); - BOOST_FOREACH (cxml::NodePtr& i, f) { - font_nodes.push_back (shared_ptr (new Font (i, tcr))); - } - - list t = node->node_children ("Text"); - BOOST_FOREACH (cxml::NodePtr& i, t) { - text_nodes.push_back (shared_ptr (new Text (i, tcr))); - } -} - -Font::Font (std::list > const & font_nodes) - : size (0) - , italic (false) - , colour ("FFFFFFFF") - , effect_colour ("FFFFFFFF") -{ - for (list >::const_iterator i = font_nodes.begin(); i != font_nodes.end(); ++i) { - if ((*i)->id) { - id = (*i)->id; - } - if ((*i)->size != 0) { - size = (*i)->size; - } - if ((*i)->italic) { - italic = (*i)->italic.get (); - } - if ((*i)->colour) { - colour = (*i)->colour.get (); - } - if ((*i)->effect) { - effect = (*i)->effect.get (); - } - if ((*i)->effect_colour) { - effect_colour = (*i)->effect_colour.get (); - } - } -} diff --git a/src/font.h b/src/font.h deleted file mode 100644 index a2589be4..00000000 --- a/src/font.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - Copyright (C) 2012-2014 Carl Hetherington - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - -/** @file src/font.h - * @brief Font class - */ - -#include "types.h" -#include "subtitle.h" -#include -#include -#include -#include - -namespace dcp { - -/** @class Font - * @brief Helper class for parsing subtitle XML. - */ -class Font -{ -public: - Font () - : size (0) - {} - - Font (cxml::ConstNodePtr node, int tcr); - Font (std::list > const & font_nodes); - - std::string text; - boost::optional id; - int size; - boost::optional italic; - boost::optional colour; - boost::optional effect; - boost::optional effect_colour; - - std::list > subtitle_nodes; - std::list > font_nodes; - std::list > text_nodes; -}; - -} diff --git a/src/font_node.cc b/src/font_node.cc new file mode 100644 index 00000000..257a6b51 --- /dev/null +++ b/src/font_node.cc @@ -0,0 +1,96 @@ +/* + Copyright (C) 2012-2015 Carl Hetherington + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#include "types.h" +#include "raw_convert.h" +#include "font_node.h" +#include "xml.h" +#include "text_node.h" +#include +#include + +using std::string; +using std::list; +using boost::shared_ptr; +using boost::optional; +using namespace dcp; + +FontNode::FontNode (cxml::ConstNodePtr node, int tcr) +{ + text = node->content (); + + id = node->optional_string_attribute ("Id"); + size = node->optional_number_attribute ("Size").get_value_or (0); + italic = node->optional_bool_attribute ("Italic"); + optional c = node->optional_string_attribute ("Color"); + if (c) { + colour = Colour (c.get ()); + } + optional const e = node->optional_string_attribute ("Effect"); + if (e) { + effect = string_to_effect (e.get ()); + } + c = node->optional_string_attribute ( "EffectColor"); + if (c) { + effect_colour = Colour (c.get ()); + } + + list s = node->node_children ("Subtitle"); + BOOST_FOREACH (cxml::NodePtr& i, s) { + subtitle_nodes.push_back (shared_ptr (new SubtitleNode (i, tcr))); + } + + list f = node->node_children ("Font"); + BOOST_FOREACH (cxml::NodePtr& i, f) { + font_nodes.push_back (shared_ptr (new FontNode (i, tcr))); + } + + list t = node->node_children ("Text"); + BOOST_FOREACH (cxml::NodePtr& i, t) { + text_nodes.push_back (shared_ptr (new TextNode (i, tcr))); + } +} + +FontNode::FontNode (std::list > const & font_nodes) + : size (0) + , italic (false) + , colour ("FFFFFFFF") + , effect_colour ("FFFFFFFF") +{ + for (list >::const_iterator i = font_nodes.begin(); i != font_nodes.end(); ++i) { + if ((*i)->id) { + id = (*i)->id; + } + if ((*i)->size != 0) { + size = (*i)->size; + } + if ((*i)->italic) { + italic = (*i)->italic.get (); + } + if ((*i)->colour) { + colour = (*i)->colour.get (); + } + if ((*i)->effect) { + effect = (*i)->effect.get (); + } + if ((*i)->effect_colour) { + effect_colour = (*i)->effect_colour.get (); + } + } +} diff --git a/src/font_node.h b/src/font_node.h new file mode 100644 index 00000000..97efde73 --- /dev/null +++ b/src/font_node.h @@ -0,0 +1,59 @@ +/* + Copyright (C) 2012-2015 Carl Hetherington + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +/** @file src/font_node.h + * @brief FontNode class + */ + +#include "types.h" +#include "subtitle_node.h" +#include +#include +#include +#include + +namespace dcp { + +/** @class Font + * @brief Helper class for parsing subtitle XML. + */ +class FontNode +{ +public: + FontNode () + : size (0) + {} + + FontNode (cxml::ConstNodePtr node, int tcr); + FontNode (std::list > const & font_nodes); + + std::string text; + boost::optional id; + int size; + boost::optional italic; + boost::optional colour; + boost::optional effect; + boost::optional effect_colour; + + std::list > subtitle_nodes; + std::list > font_nodes; + std::list > text_nodes; +}; + +} diff --git a/src/interop_load_font.cc b/src/interop_load_font.cc deleted file mode 100644 index d29e49de..00000000 --- a/src/interop_load_font.cc +++ /dev/null @@ -1,56 +0,0 @@ -/* - Copyright (C) 2012-2014 Carl Hetherington - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - -#include "interop_load_font.h" -#include - -using std::string; -using boost::shared_ptr; -using boost::optional; -using namespace dcp; - -InteropLoadFont::InteropLoadFont (string id_, string uri_) - : LoadFont (id_) - , uri (uri_) -{ - -} - -InteropLoadFont::InteropLoadFont (cxml::ConstNodePtr node) -{ - optional x = node->optional_string_attribute ("Id"); - if (!x) { - x = node->optional_string_attribute ("ID"); - } - id = x.get_value_or (""); - - uri = node->string_attribute ("URI"); -} - -bool -dcp::operator== (InteropLoadFont const & a, InteropLoadFont const & b) -{ - return a.id == b.id && a.uri == b.uri; -} - -bool -dcp::operator!= (InteropLoadFont const & a, InteropLoadFont const & b) -{ - return !(a == b); -} diff --git a/src/interop_load_font.h b/src/interop_load_font.h deleted file mode 100644 index 0ab39ad4..00000000 --- a/src/interop_load_font.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - Copyright (C) 2012-2014 Carl Hetherington - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - -#include "load_font.h" -#include -#include -#include - -namespace dcp { - -class InteropLoadFont : public LoadFont -{ -public: - InteropLoadFont () {} - InteropLoadFont (std::string id, std::string uri); - InteropLoadFont (cxml::ConstNodePtr node); - - std::string uri; -}; - -bool operator== (InteropLoadFont const & a, InteropLoadFont const & b); -bool operator!= (InteropLoadFont const & a, InteropLoadFont const & b); - -} diff --git a/src/interop_load_font_node.cc b/src/interop_load_font_node.cc new file mode 100644 index 00000000..7c15f401 --- /dev/null +++ b/src/interop_load_font_node.cc @@ -0,0 +1,56 @@ +/* + Copyright (C) 2012-2015 Carl Hetherington + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#include "interop_load_font_node.h" +#include + +using std::string; +using boost::shared_ptr; +using boost::optional; +using namespace dcp; + +InteropLoadFontNode::InteropLoadFontNode (string id_, string uri_) + : LoadFontNode (id_) + , uri (uri_) +{ + +} + +InteropLoadFontNode::InteropLoadFontNode (cxml::ConstNodePtr node) +{ + optional x = node->optional_string_attribute ("Id"); + if (!x) { + x = node->optional_string_attribute ("ID"); + } + id = x.get_value_or (""); + + uri = node->string_attribute ("URI"); +} + +bool +dcp::operator== (InteropLoadFontNode const & a, InteropLoadFontNode const & b) +{ + return a.id == b.id && a.uri == b.uri; +} + +bool +dcp::operator!= (InteropLoadFontNode const & a, InteropLoadFontNode const & b) +{ + return !(a == b); +} diff --git a/src/interop_load_font_node.h b/src/interop_load_font_node.h new file mode 100644 index 00000000..5afe8693 --- /dev/null +++ b/src/interop_load_font_node.h @@ -0,0 +1,40 @@ +/* + Copyright (C) 2012-2014 Carl Hetherington + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#include "load_font_node.h" +#include +#include +#include + +namespace dcp { + +class InteropLoadFontNode : public LoadFontNode +{ +public: + InteropLoadFontNode () {} + InteropLoadFontNode (std::string id, std::string uri); + InteropLoadFontNode (cxml::ConstNodePtr node); + + std::string uri; +}; + +bool operator== (InteropLoadFontNode const & a, InteropLoadFontNode const & b); +bool operator!= (InteropLoadFontNode const & a, InteropLoadFontNode const & b); + +} diff --git a/src/interop_subtitle_content.cc b/src/interop_subtitle_content.cc index 1018d85c..2ba698db 100644 --- a/src/interop_subtitle_content.cc +++ b/src/interop_subtitle_content.cc @@ -18,10 +18,10 @@ */ #include "interop_subtitle_content.h" -#include "interop_load_font.h" +#include "interop_load_font_node.h" #include "xml.h" #include "raw_convert.h" -#include "font.h" +#include "font_node.h" #include using std::list; @@ -40,12 +40,12 @@ InteropSubtitleContent::InteropSubtitleContent (boost::filesystem::path file) _id = xml->string_child ("SubtitleID"); _movie_title = xml->string_child ("MovieTitle"); - _load_font_nodes = type_children (xml, "LoadFont"); + _load_font_nodes = type_children (xml, "LoadFont"); list f = xml->node_children ("Font"); - list > font_nodes; + list > font_nodes; BOOST_FOREACH (cxml::NodePtr& i, f) { - font_nodes.push_back (shared_ptr (new Font (i, 250))); + font_nodes.push_back (shared_ptr (new FontNode (i, 250))); } parse_common (xml, font_nodes); @@ -78,7 +78,7 @@ InteropSubtitleContent::xml_as_string () const root->add_child("ReelNumber")->add_child_text (raw_convert (_reel_number)); root->add_child("Language")->add_child_text (_language); - for (list >::const_iterator i = _load_font_nodes.begin(); i != _load_font_nodes.end(); ++i) { + for (list >::const_iterator i = _load_font_nodes.begin(); i != _load_font_nodes.end(); ++i) { xmlpp::Element* load_font = root->add_child("LoadFont"); load_font->set_attribute ("Id", (*i)->id); load_font->set_attribute ("URI", (*i)->uri); @@ -175,7 +175,7 @@ InteropSubtitleContent::xml_as_string () const void InteropSubtitleContent::add_font (string id, string uri) { - _load_font_nodes.push_back (shared_ptr (new InteropLoadFont (id, uri))); + _load_font_nodes.push_back (shared_ptr (new InteropLoadFontNode (id, uri))); } bool @@ -190,8 +190,8 @@ InteropSubtitleContent::equals (shared_ptr other_asset, EqualityOpt return false; } - list >::const_iterator i = _load_font_nodes.begin (); - list >::const_iterator j = other->_load_font_nodes.begin (); + list >::const_iterator i = _load_font_nodes.begin (); + list >::const_iterator j = other->_load_font_nodes.begin (); while (i != _load_font_nodes.end ()) { if (j == _load_font_nodes.end ()) { @@ -216,10 +216,10 @@ InteropSubtitleContent::equals (shared_ptr other_asset, EqualityOpt return true; } -list > +list > InteropSubtitleContent::load_font_nodes () const { - list > lf; + list > lf; copy (_load_font_nodes.begin(), _load_font_nodes.end(), back_inserter (lf)); return lf; } diff --git a/src/interop_subtitle_content.h b/src/interop_subtitle_content.h index 98a4b599..cb7c52d5 100644 --- a/src/interop_subtitle_content.h +++ b/src/interop_subtitle_content.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ namespace dcp { -class InteropLoadFont; +class InteropLoadFontNode; class InteropSubtitleContent : public SubtitleContent { @@ -36,7 +36,7 @@ public: NoteHandler note ) const; - std::list > load_font_nodes () const; + std::list > load_font_nodes () const; void add_font (std::string id, std::string uri); @@ -44,7 +44,7 @@ public: private: std::string _movie_title; - std::list > _load_font_nodes; + std::list > _load_font_nodes; }; } diff --git a/src/load_font.h b/src/load_font.h deleted file mode 100644 index 15906ef6..00000000 --- a/src/load_font.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - Copyright (C) 2012-2015 Carl Hetherington - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - -#include - -namespace dcp { - -class LoadFont -{ -public: - LoadFont () {} - LoadFont (std::string id_) - : id (id_) - {} - - std::string id; -}; - -} diff --git a/src/load_font_node.h b/src/load_font_node.h new file mode 100644 index 00000000..24f193bd --- /dev/null +++ b/src/load_font_node.h @@ -0,0 +1,35 @@ +/* + Copyright (C) 2012-2015 Carl Hetherington + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#include + +namespace dcp { + +class LoadFontNode +{ +public: + LoadFontNode () {} + LoadFontNode (std::string id_) + : id (id_) + {} + + std::string id; +}; + +} diff --git a/src/smpte_load_font.cc b/src/smpte_load_font.cc deleted file mode 100644 index 0991f7db..00000000 --- a/src/smpte_load_font.cc +++ /dev/null @@ -1,31 +0,0 @@ -/* - Copyright (C) 2012-2014 Carl Hetherington - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - -#include "smpte_load_font.h" -#include - -using std::string; -using boost::shared_ptr; -using namespace dcp; - -SMPTELoadFont::SMPTELoadFont (shared_ptr node) - : LoadFont (node->string_attribute ("ID")) -{ - urn = node->content().substr (9); -} diff --git a/src/smpte_load_font.h b/src/smpte_load_font.h deleted file mode 100644 index 7df9ea29..00000000 --- a/src/smpte_load_font.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - Copyright (C) 2012-2014 Carl Hetherington - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - -#include "load_font.h" -#include -#include - -namespace cxml { - class Node; -} - -namespace dcp { - -class SMPTELoadFont : public LoadFont -{ -public: - SMPTELoadFont () {} - SMPTELoadFont (boost::shared_ptr node); - - std::string urn; -}; - -} diff --git a/src/smpte_load_font_node.cc b/src/smpte_load_font_node.cc new file mode 100644 index 00000000..11f7d5a4 --- /dev/null +++ b/src/smpte_load_font_node.cc @@ -0,0 +1,31 @@ +/* + Copyright (C) 2012-2014 Carl Hetherington + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#include "smpte_load_font_node.h" +#include + +using std::string; +using boost::shared_ptr; +using namespace dcp; + +SMPTELoadFontNode::SMPTELoadFontNode (shared_ptr node) + : LoadFontNode (node->string_attribute ("ID")) +{ + urn = node->content().substr (9); +} diff --git a/src/smpte_load_font_node.h b/src/smpte_load_font_node.h new file mode 100644 index 00000000..1ca7786a --- /dev/null +++ b/src/smpte_load_font_node.h @@ -0,0 +1,39 @@ +/* + Copyright (C) 2012-2015 Carl Hetherington + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#include "load_font_node.h" +#include +#include + +namespace cxml { + class Node; +} + +namespace dcp { + +class SMPTELoadFontNode : public LoadFontNode +{ +public: + SMPTELoadFontNode () {} + SMPTELoadFontNode (boost::shared_ptr node); + + std::string urn; +}; + +} diff --git a/src/smpte_subtitle_content.cc b/src/smpte_subtitle_content.cc index 4435fe23..e95a64fc 100644 --- a/src/smpte_subtitle_content.cc +++ b/src/smpte_subtitle_content.cc @@ -18,8 +18,8 @@ */ #include "smpte_subtitle_content.h" -#include "smpte_load_font.h" -#include "font.h" +#include "smpte_load_font_node.h" +#include "font_node.h" #include "exceptions.h" #include "xml.h" #include "AS_DCP.h" @@ -62,25 +62,25 @@ SMPTESubtitleContent::SMPTESubtitleContent (boost::filesystem::path file, bool m _id = xml->string_child("Id").substr (9); } - _load_font_nodes = type_children (xml, "LoadFont"); + _load_font_nodes = type_children (xml, "LoadFont"); int tcr = xml->number_child ("TimeCodeRate"); shared_ptr subtitle_list = xml->optional_node_child ("SubtitleList"); list f = subtitle_list->node_children ("Font"); - list > font_nodes; + list > font_nodes; BOOST_FOREACH (cxml::NodePtr& i, f) { - font_nodes.push_back (shared_ptr (new Font (i, tcr))); + font_nodes.push_back (shared_ptr (new FontNode (i, tcr))); } parse_common (xml, font_nodes); } -list > +list > SMPTESubtitleContent::load_font_nodes () const { - list > lf; + list > lf; copy (_load_font_nodes.begin(), _load_font_nodes.end(), back_inserter (lf)); return lf; } diff --git a/src/smpte_subtitle_content.h b/src/smpte_subtitle_content.h index a47cbb3c..8526e0ec 100644 --- a/src/smpte_subtitle_content.h +++ b/src/smpte_subtitle_content.h @@ -22,7 +22,7 @@ namespace dcp { -class SMPTELoadFont; +class SMPTELoadFontNode; class SMPTESubtitleContent : public SubtitleContent { @@ -32,12 +32,12 @@ public: */ SMPTESubtitleContent (boost::filesystem::path file, bool mxf = true); - std::list > load_font_nodes () const; + std::list > load_font_nodes () const; static bool valid_mxf (boost::filesystem::path); private: - std::list > _load_font_nodes; + std::list > _load_font_nodes; }; } diff --git a/src/subtitle.cc b/src/subtitle.cc deleted file mode 100644 index 6c2ccd7e..00000000 --- a/src/subtitle.cc +++ /dev/null @@ -1,72 +0,0 @@ -/* - Copyright (C) 2012-2015 Carl Hetherington - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - -#include "subtitle.h" -#include "xml.h" -#include "font.h" -#include "text.h" -#include -#include - -using std::string; -using std::list; -using boost::optional; -using boost::shared_ptr; -using boost::lexical_cast; -using namespace dcp; - -Subtitle::Subtitle (boost::shared_ptr node, int tcr) -{ - in = Time (node->string_attribute ("TimeIn"), tcr); - out = Time (node->string_attribute ("TimeOut"), tcr); - - list f = node->node_children ("Font"); - for (list::iterator i = f.begin(); i != f.end(); ++i) { - font_nodes.push_back (shared_ptr (new Font (*i, tcr))); - } - - list t = node->node_children ("Text"); - for (list::iterator i = t.begin(); i != t.end(); ++i) { - text_nodes.push_back (shared_ptr (new Text (*i, tcr))); - } - - fade_up_time = fade_time (node, "FadeUpTime", tcr); - fade_down_time = fade_time (node, "FadeDownTime", tcr); -} - -Time -Subtitle::fade_time (shared_ptr node, string name, int tcr) -{ - string const u = node->optional_string_attribute (name).get_value_or (""); - Time t; - - if (u.empty ()) { - t = Time (0, 0, 0, 20, 250); - } else if (u.find (":") != string::npos) { - t = Time (u, tcr); - } else { - t = Time (0, 0, 0, lexical_cast (u), tcr); - } - - if (t > Time (0, 0, 8, 0, 250)) { - t = Time (0, 0, 8, 0, 250); - } - - return t; -} diff --git a/src/subtitle.h b/src/subtitle.h deleted file mode 100644 index 0958a1d4..00000000 --- a/src/subtitle.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - Copyright (C) 2012-2014 Carl Hetherington - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - -#ifndef LIBDCP_SUBTITLE_H -#define LIBDCP_SUBTITLE_H - -#include "dcp_time.h" -#include -#include -#include - -namespace cxml { - class Node; -} - -namespace dcp { - -class Font; -class Text; - -class Subtitle -{ -public: - Subtitle () {} - Subtitle (boost::shared_ptr node, int tcr); - - Time in; - Time out; - Time fade_up_time; - Time fade_down_time; - std::list > font_nodes; - std::list > text_nodes; - -private: - Time fade_time (boost::shared_ptr, std::string name, int tcr); -}; - -} - -#endif diff --git a/src/subtitle_content.cc b/src/subtitle_content.cc index 07fd90f0..f8321273 100644 --- a/src/subtitle_content.cc +++ b/src/subtitle_content.cc @@ -21,8 +21,8 @@ #include "subtitle_content.h" #include "util.h" #include "xml.h" -#include "font.h" -#include "text.h" +#include "font_node.h" +#include "text_node.h" #include "subtitle_string.h" #include "dcp_assert.h" #include "AS_DCP.h" @@ -56,7 +56,7 @@ SubtitleContent::SubtitleContent (boost::filesystem::path file) } void -SubtitleContent::parse_common (shared_ptr xml, list > font_nodes) +SubtitleContent::parse_common (shared_ptr xml, list > font_nodes) { _reel_number = xml->string_child ("ReelNumber"); _language = xml->string_child ("Language"); @@ -72,16 +72,16 @@ SubtitleContent::parse_common (shared_ptr xml, list xml, - list > const & font_nodes, + list > const & font_nodes, ParseState& parse_state ) { - for (list >::const_iterator i = font_nodes.begin(); i != font_nodes.end(); ++i) { + for (list >::const_iterator i = font_nodes.begin(); i != font_nodes.end(); ++i) { parse_state.font_nodes.push_back (*i); maybe_add_subtitle ((*i)->text, parse_state); - for (list >::iterator j = (*i)->subtitle_nodes.begin(); j != (*i)->subtitle_nodes.end(); ++j) { + for (list >::iterator j = (*i)->subtitle_nodes.begin(); j != (*i)->subtitle_nodes.end(); ++j) { parse_state.subtitle_nodes.push_back (*j); examine_text_nodes (xml, (*j)->text_nodes, parse_state); examine_font_nodes (xml, (*j)->font_nodes, parse_state); @@ -98,11 +98,11 @@ SubtitleContent::examine_font_nodes ( void SubtitleContent::examine_text_nodes ( shared_ptr xml, - list > const & text_nodes, + list > const & text_nodes, ParseState& parse_state ) { - for (list >::const_iterator i = text_nodes.begin(); i != text_nodes.end(); ++i) { + for (list >::const_iterator i = text_nodes.begin(); i != text_nodes.end(); ++i) { parse_state.text_nodes.push_back (*i); maybe_add_subtitle ((*i)->text, parse_state); examine_font_nodes (xml, (*i)->font_nodes, parse_state); @@ -124,9 +124,9 @@ SubtitleContent::maybe_add_subtitle (string text, ParseState const & parse_state DCP_ASSERT (!parse_state.text_nodes.empty ()); DCP_ASSERT (!parse_state.subtitle_nodes.empty ()); - dcp::Font effective_font (parse_state.font_nodes); - dcp::Text effective_text (*parse_state.text_nodes.back ()); - dcp::Subtitle effective_subtitle (*parse_state.subtitle_nodes.back ()); + dcp::FontNode effective_font (parse_state.font_nodes); + dcp::TextNode effective_text (*parse_state.text_nodes.back ()); + dcp::SubtitleNode effective_subtitle (*parse_state.subtitle_nodes.back ()); _subtitles.push_back ( SubtitleString ( diff --git a/src/subtitle_content.h b/src/subtitle_content.h index 0ef7b19d..ee424916 100644 --- a/src/subtitle_content.h +++ b/src/subtitle_content.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -29,10 +29,10 @@ namespace dcp { class SubtitleString; -class Font; -class Text; -class Subtitle; -class LoadFont; +class FontNode; +class TextNode; +class SubtitleNode; +class LoadFontNode; /** @class SubtitleContent * @brief A parent for classes representing a file containing subtitles. @@ -68,10 +68,10 @@ public: Time latest_subtitle_out () const; - virtual std::list > load_font_nodes () const = 0; + virtual std::list > load_font_nodes () const = 0; protected: - void parse_common (boost::shared_ptr xml, std::list > font_nodes); + void parse_common (boost::shared_ptr xml, std::list > font_nodes); std::string pkl_type (Standard) const { return "text/xml"; @@ -89,22 +89,22 @@ protected: private: struct ParseState { - std::list > font_nodes; - std::list > text_nodes; - std::list > subtitle_nodes; + std::list > font_nodes; + std::list > text_nodes; + std::list > subtitle_nodes; }; void maybe_add_subtitle (std::string text, ParseState const & parse_state); void examine_font_nodes ( boost::shared_ptr xml, - std::list > const & font_nodes, + std::list > const & font_nodes, ParseState& parse_state ); void examine_text_nodes ( boost::shared_ptr xml, - std::list > const & text_nodes, + std::list > const & text_nodes, ParseState& parse_state ); }; diff --git a/src/subtitle_node.cc b/src/subtitle_node.cc new file mode 100644 index 00000000..57476330 --- /dev/null +++ b/src/subtitle_node.cc @@ -0,0 +1,72 @@ +/* + Copyright (C) 2012-2015 Carl Hetherington + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#include "subtitle_node.h" +#include "xml.h" +#include "font_node.h" +#include "text_node.h" +#include +#include + +using std::string; +using std::list; +using boost::optional; +using boost::shared_ptr; +using boost::lexical_cast; +using namespace dcp; + +SubtitleNode::SubtitleNode (boost::shared_ptr node, int tcr) +{ + in = Time (node->string_attribute ("TimeIn"), tcr); + out = Time (node->string_attribute ("TimeOut"), tcr); + + list f = node->node_children ("Font"); + for (list::iterator i = f.begin(); i != f.end(); ++i) { + font_nodes.push_back (shared_ptr (new FontNode (*i, tcr))); + } + + list t = node->node_children ("Text"); + for (list::iterator i = t.begin(); i != t.end(); ++i) { + text_nodes.push_back (shared_ptr (new TextNode (*i, tcr))); + } + + fade_up_time = fade_time (node, "FadeUpTime", tcr); + fade_down_time = fade_time (node, "FadeDownTime", tcr); +} + +Time +SubtitleNode::fade_time (shared_ptr node, string name, int tcr) +{ + string const u = node->optional_string_attribute (name).get_value_or (""); + Time t; + + if (u.empty ()) { + t = Time (0, 0, 0, 20, 250); + } else if (u.find (":") != string::npos) { + t = Time (u, tcr); + } else { + t = Time (0, 0, 0, lexical_cast (u), tcr); + } + + if (t > Time (0, 0, 8, 0, 250)) { + t = Time (0, 0, 8, 0, 250); + } + + return t; +} diff --git a/src/subtitle_node.h b/src/subtitle_node.h new file mode 100644 index 00000000..d615557a --- /dev/null +++ b/src/subtitle_node.h @@ -0,0 +1,56 @@ +/* + Copyright (C) 2012-2015 Carl Hetherington + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#ifndef LIBDCP_SUBTITLE_NODE_H +#define LIBDCP_SUBTITLE_NODE_H + +#include "dcp_time.h" +#include +#include +#include + +namespace cxml { + class Node; +} + +namespace dcp { + +class FontNode; +class TextNode; + +class SubtitleNode +{ +public: + SubtitleNode () {} + SubtitleNode (boost::shared_ptr node, int tcr); + + Time in; + Time out; + Time fade_up_time; + Time fade_down_time; + std::list > font_nodes; + std::list > text_nodes; + +private: + Time fade_time (boost::shared_ptr, std::string name, int tcr); +}; + +} + +#endif diff --git a/src/text.cc b/src/text.cc deleted file mode 100644 index d18066dd..00000000 --- a/src/text.cc +++ /dev/null @@ -1,63 +0,0 @@ -/* - Copyright (C) 2012-2014 Carl Hetherington - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - -/** @file src/text.cc - * @brief Text class for parsing subtitle XML. - */ - -#include "text.h" -#include "xml.h" -#include "font.h" -#include -#include - -using std::string; -using std::list; -using boost::shared_ptr; -using boost::optional; -using namespace dcp; - -/** Read a <Text> node from a subtitle XML file, noting its contents - * in this object's member variables. - * @param node Node to read. - */ -Text::Text (boost::shared_ptr node, int tcr) - : v_align (CENTER) -{ - text = node->content (); - optional x = node->optional_number_attribute ("VPosition"); - if (!x) { - x = node->number_attribute ("Vposition"); - } - v_position = x.get () / 100; - - optional v = node->optional_string_attribute ("VAlign"); - if (!v) { - v = node->optional_string_attribute ("Valign"); - } - - if (v) { - v_align = string_to_valign (v.get ()); - } - - list f = node->node_children ("Font"); - BOOST_FOREACH (cxml::NodePtr& i, f) { - font_nodes.push_back (shared_ptr (new Font (i, tcr))); - } -} diff --git a/src/text.h b/src/text.h deleted file mode 100644 index fe314f76..00000000 --- a/src/text.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - Copyright (C) 2012-2015 Carl Hetherington - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - -/** @file src/text.h - * @brief Text class for parsing subtitle XML. - */ - -#include "types.h" -#include -#include -#include - -namespace cxml { - class Node; -} - -namespace dcp { - -class Font; - -/** @class Text - * @brief Parser for Text nodes from subtitle XML. - */ -class Text -{ -public: - /** Construct a default text node */ - Text () - : v_position (0) - , v_align (TOP) - {} - - Text (boost::shared_ptr node, int tcr); - - float v_position; - VAlign v_align; - std::string text; - std::list > font_nodes; -}; - -} diff --git a/src/text_node.cc b/src/text_node.cc new file mode 100644 index 00000000..834b78b2 --- /dev/null +++ b/src/text_node.cc @@ -0,0 +1,63 @@ +/* + Copyright (C) 2012-2015 Carl Hetherington + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +/** @file src/text.cc + * @brief TextNode class for parsing subtitle XML. + */ + +#include "text_node.h" +#include "xml.h" +#include "font_node.h" +#include +#include + +using std::string; +using std::list; +using boost::shared_ptr; +using boost::optional; +using namespace dcp; + +/** Read a <Text> node from a subtitle XML file, noting its contents + * in this object's member variables. + * @param node Node to read. + */ +TextNode::TextNode (boost::shared_ptr node, int tcr) + : v_align (CENTER) +{ + text = node->content (); + optional x = node->optional_number_attribute ("VPosition"); + if (!x) { + x = node->number_attribute ("Vposition"); + } + v_position = x.get () / 100; + + optional v = node->optional_string_attribute ("VAlign"); + if (!v) { + v = node->optional_string_attribute ("Valign"); + } + + if (v) { + v_align = string_to_valign (v.get ()); + } + + list f = node->node_children ("Font"); + BOOST_FOREACH (cxml::NodePtr& i, f) { + font_nodes.push_back (shared_ptr (new FontNode (i, tcr))); + } +} diff --git a/src/text_node.h b/src/text_node.h new file mode 100644 index 00000000..2e1b9ac4 --- /dev/null +++ b/src/text_node.h @@ -0,0 +1,57 @@ +/* + Copyright (C) 2012-2015 Carl Hetherington + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +/** @file src/text.h + * @brief TextNode class for parsing subtitle XML. + */ + +#include "types.h" +#include +#include +#include + +namespace cxml { + class Node; +} + +namespace dcp { + +class FontNode; + +/** @class TextNode + * @brief Parser for Text nodes from subtitle XML. + */ +class TextNode +{ +public: + /** Construct a default text node */ + TextNode () + : v_position (0) + , v_align (TOP) + {} + + TextNode (boost::shared_ptr node, int tcr); + + float v_position; + VAlign v_align; + std::string text; + std::list > font_nodes; +}; + +} diff --git a/src/wscript b/src/wscript index 1107d8cd..ea062374 100644 --- a/src/wscript +++ b/src/wscript @@ -16,9 +16,9 @@ def build(bld): encrypted_kdm.cc exceptions.cc file.cc - font.cc + font_node.cc gamma_transfer_function.cc - interop_load_font.cc + interop_load_font_node.cc interop_subtitle_content.cc key.cc local_time.cc @@ -42,7 +42,7 @@ def build(bld): reel_subtitle_asset.cc rgb_xyz.cc signer.cc - smpte_load_font.cc + smpte_load_font_node.cc smpte_subtitle_content.cc sound_mxf.cc sound_mxf_writer.cc @@ -50,10 +50,10 @@ def build(bld): stereo_picture_mxf.cc stereo_picture_mxf_writer.cc stereo_picture_frame.cc - subtitle.cc + subtitle_node.cc subtitle_content.cc subtitle_string.cc - text.cc + text_node.cc transfer_function.cc types.cc util.cc -- cgit v1.2.3