Tweak ISO6937 mapping to put $ sign on 0xa4 (164) (from master).

[libsub.git] / src / smpte_dcp_reader.cc

diff --git a/src/smpte_dcp_reader.cc b/src/smpte_dcp_reader.cc
index 606d9e52118125b3164de9bd51ac0ed2086223d9..7a3d94c84d7621bd41b210330fc87a6453ace636 100644 (file)
--- a/src/smpte_dcp_reader.cc
+++ b/src/smpte_dcp_reader.cc
@@ -20,16 +20,15 @@
 #include "smpte_dcp_reader.h"
 #include "exceptions.h"
 #include "xml.h"
-#include "AS_DCP.h"
-#include "KM_util.h"
 #include "dcp/font.h"
 #include "dcp/smpte_load_font.h"
+#include <asdcp/KM_util.h>
+#include <asdcp/AS_DCP.h>
 #include <libcxml/cxml.h>
 #include <boost/foreach.hpp>
 
 using std::string;
 using std::list;
-using std::stringstream;
 using boost::shared_ptr;
 using namespace sub;
 
@@ -46,9 +45,7 @@ SMPTEDCPReader::SMPTEDCPReader (boost::filesystem::path file, bool mxf)
 
                string s;
                reader.ReadTimedTextResource (s, 0, 0);
-               stringstream t;
-               t << s;
-               xml->read_stream (t);
+               xml->read_string (s);
 
                ASDCP::WriterInfo info;
                reader.FillWriterInfo (info);