Make specific DCP CPL class.

1 files changed, 7 insertions, 10 deletions

diff --git a/test/rewrite_subs.cc b/test/rewrite_subs.cc
index 73e2776d..6875be0a 100644
--- a/test/rewrite_subs.cc
+++ b/test/rewrite_subs.cc
@@ -17,13 +17,14 @@
 
 */
 
-#include <iostream>
 #include "dcp.h"
-#include "cpl.h"
+#include "dcp_cpl.h"
 #include "reel.h"
 #include "subtitle_asset.h"
 #include "reel_subtitle_asset.h"
 #include "exceptions.h"
+#include <boost/foreach.hpp>
+#include <iostream>
 
 using std::cout;
 using std::cerr;
@@ -45,14 +46,10 @@ main (int argc, char* argv[])
 		DCP* dcp = new DCP (argv[1]);
 		dcp->read (true);
 
-		list<shared_ptr<CPL> > cpls = dcp->cpls ();
-		for (list<boost::shared_ptr<CPL> >::iterator i = cpls.begin(); i != cpls.end(); ++i) {
-
-			list<shared_ptr<Reel> > reels = (*i)->reels ();
-			for (list<shared_ptr<Reel> >::iterator j = reels.begin(); j != reels.end(); ++j) {
-
-				if ((*j)->main_subtitle()) {
-					(*j)->main_subtitle()->asset()->write ((*j)->main_subtitle()->asset()->file ());
+		BOOST_FOREACH (shared_ptr<DCPCPL> i, dcp->cpls()) {
+			BOOST_FOREACH (shared_ptr<Reel> j, i->reels()) {
+				if (j->main_subtitle()) {
+					j->main_subtitle()->asset()->write (j->main_subtitle()->asset()->file ());
 				}
 			}
 		}