projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New test data.
[libdcp.git]
/
test
/
rewrite_subs.cc
diff --git
a/test/rewrite_subs.cc
b/test/rewrite_subs.cc
index 6aa259a9989fb86b0115a3b9bc5fd169b432e42c..2f3cea545edcb7ad5355617ecd1a0f5647e69332 100644
(file)
--- a/
test/rewrite_subs.cc
+++ b/
test/rewrite_subs.cc
@@
-1,20
+1,20
@@
/*
Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of libdcp.
+
+ libdcp is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
libdcp
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+ along with libdcp. If not, see <http://www.gnu.org/licenses/>.
*/
#include <iostream>
*/
#include <iostream>
@@
-41,18
+41,18
@@
main (int argc, char* argv[])
cerr << "Syntax: " << argv[0] << " <dcp>\n";
exit (EXIT_FAILURE);
}
cerr << "Syntax: " << argv[0] << " <dcp>\n";
exit (EXIT_FAILURE);
}
-
+
DCP* dcp = new DCP (argv[1]);
dcp->read (true);
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<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) {
list<shared_ptr<Reel> > reels = (*i)->reels ();
for (list<shared_ptr<Reel> >::iterator j = reels.begin(); j != reels.end(); ++j) {
-
+
if ((*j)->main_subtitle()) {
if ((*j)->main_subtitle()) {
- (*j)->main_subtitle()->
subtitle_asset()->write ((*j)->main_subtitle()->subtitle_asset()->file
());
+ (*j)->main_subtitle()->
asset()->write ((*j)->main_subtitle()->asset()->file().get
());
}
}
}
}
}
}
@@
-68,6
+68,6
@@
main (int argc, char* argv[])
cerr << e.what() << " when reading " << argv[1] << "\n";
exit (EXIT_FAILURE);
}
cerr << e.what() << " when reading " << argv[1] << "\n";
exit (EXIT_FAILURE);
}
-
+
return 0;
}
return 0;
}