Fix rebase onto 1.0.

[libdcp.git] / test / rewrite_subs.cc

diff --git a/test/rewrite_subs.cc b/test/rewrite_subs.cc
index 3b177b2184588d497715f324a8f970aa2a557e06..e62b9169f9baab3977f6a22b7952e31b16e68779 100644 (file)
--- a/test/rewrite_subs.cc
+++ b/test/rewrite_subs.cc
@@ -21,13 +21,14 @@
 #include "dcp.h"
 #include "cpl.h"
 #include "reel.h"
-#include "subtitle_content.h"
+#include "subtitle_asset.h"
 #include "reel_subtitle_asset.h"
 #include "exceptions.h"
 
 using std::cout;
 using std::cerr;
 using std::list;
+using std::string;
 using boost::shared_ptr;
 using namespace dcp;
 
@@ -41,7 +42,7 @@ main (int argc, char* argv[])
                }
                
                DCP* dcp = new DCP (argv[1]);
-               dcp->read ();
+               dcp->read (true);
                
                list<shared_ptr<CPL> > cpls = dcp->cpls ();
                for (list<boost::shared_ptr<CPL> >::iterator i = cpls.begin(); i != cpls.end(); ++i) {
@@ -50,7 +51,7 @@ main (int argc, char* argv[])
                        for (list<shared_ptr<Reel> >::iterator j = reels.begin(); j != reels.end(); ++j) {
                                
                                if ((*j)->main_subtitle()) {
-                                       (*j)->main_subtitle()->subtitle_content()->write_xml ();
+                                       (*j)->main_subtitle()->subtitle_asset()->write_xml ((*j)->main_subtitle()->subtitle_asset()->file ());
                                }
                        }
                }