More stringstream removal.

[libdcp.git] / src / interop_subtitle_asset.cc

diff --git a/src/interop_subtitle_asset.cc b/src/interop_subtitle_asset.cc
index 4e66a329605a1a0d1dc488a5fa7fca84a7fd7493..b0b9499540d58f6a62ca4ace99ca7661d05759c7 100644 (file)
--- a/src/interop_subtitle_asset.cc
+++ b/src/interop_subtitle_asset.cc
@@ -16,6 +16,19 @@
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 #include "interop_subtitle_asset.h"
@@ -55,12 +68,12 @@ InteropSubtitleAsset::InteropSubtitleAsset (boost::filesystem::path file)
 
        list<shared_ptr<dcp::FontNode> > font_nodes;
        BOOST_FOREACH (cxml::NodePtr const & i, xml->node_children ("Font")) {
-               font_nodes.push_back (shared_ptr<FontNode> (new FontNode (i, 250, "Id")));
+               font_nodes.push_back (shared_ptr<FontNode> (new FontNode (i, optional<int>(), INTEROP)));
        }
 
        list<shared_ptr<dcp::SubtitleNode> > subtitle_nodes;
        BOOST_FOREACH (cxml::NodePtr const & i, xml->node_children ("Subtitle")) {
-               subtitle_nodes.push_back (shared_ptr<SubtitleNode> (new SubtitleNode (i, 250, "Id")));
+               subtitle_nodes.push_back (shared_ptr<SubtitleNode> (new SubtitleNode (i, optional<int>(), INTEROP)));
        }
 
        parse_subtitles (xml, font_nodes, subtitle_nodes);