X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsmpte_subtitle_asset.cc;h=0c0181f42d5c1604252d55d37b4e9b40129fc71b;hb=e4d5298e7a179d4103581cba05cbc516f94acf60;hp=647e6cd12fa26a9bf37a220e34de29e781800f35;hpb=a641fdc912a3f0749015decdf9e23ff15186ef78;p=libdcp.git

diff --git a/src/smpte_subtitle_asset.cc b/src/smpte_subtitle_asset.cc
index 647e6cd1..0c0181f4 100644
--- a/src/smpte_subtitle_asset.cc
+++ b/src/smpte_subtitle_asset.cc
@@ -15,6 +15,20 @@
 
     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.
 */
 
 /** @file  src/smpte_subtitle_asset.cc
@@ -29,17 +43,15 @@
 #include "raw_convert.h"
 #include "dcp_assert.h"
 #include "util.h"
-#include "AS_DCP.h"
-#include "KM_util.h"
 #include "compose.hpp"
+#include <asdcp/AS_DCP.h>
+#include <asdcp/KM_util.h>
 #include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
 
 using std::string;
 using std::list;
-using std::stringstream;
-using std::cout;
 using std::vector;
 using std::map;
 using boost::shared_ptr;
@@ -71,9 +83,7 @@ SMPTESubtitleAsset::SMPTESubtitleAsset (boost::filesystem::path file)
 	if (!ASDCP_FAILURE (r)) {
 		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);
 		_id = read_writer_info (info);
@@ -85,7 +95,7 @@ SMPTESubtitleAsset::SMPTESubtitleAsset (boost::filesystem::path file)
 		} catch (cxml::Error& e) {
 			boost::throw_exception (
 				DCPReadError (
-					String::compose ("could not read subtitles from %1; MXF failed with %2, XML failed with %3", file, static_cast<int> (r), e.what ())
+					String::compose ("MXF failed with %1, XML failed with %2", file, static_cast<int> (r), e.what ())
 					)
 				);
 		}
@@ -120,12 +130,12 @@ SMPTESubtitleAsset::SMPTESubtitleAsset (boost::filesystem::path file)
 
 	list<shared_ptr<dcp::FontNode> > font_nodes;
 	BOOST_FOREACH (cxml::NodePtr const & i, subtitle_list->node_children ("Font")) {
-		font_nodes.push_back (shared_ptr<FontNode> (new FontNode (i, _time_code_rate, "ID")));
+		font_nodes.push_back (shared_ptr<FontNode> (new FontNode (i, _time_code_rate, SMPTE)));
 	}
 
 	list<shared_ptr<dcp::SubtitleNode> > subtitle_nodes;
 	BOOST_FOREACH (cxml::NodePtr const & i, subtitle_list->node_children ("Subtitle")) {
-		subtitle_nodes.push_back (shared_ptr<SubtitleNode> (new SubtitleNode (i, _time_code_rate, "ID")));
+		subtitle_nodes.push_back (shared_ptr<SubtitleNode> (new SubtitleNode (i, _time_code_rate, SMPTE)));
 	}
 
 	parse_subtitles (xml, font_nodes, subtitle_nodes);