No-op; fix GPL address and use the explicit-program-name version.

[dcpomatic.git] / test / xml_subtitle_test.cc

diff --git a/test/xml_subtitle_test.cc b/test/xml_subtitle_test.cc
index 8b051d0d1d90be944ccc20d28c899fa2f764cc3c..678f2b8d097cc08c5cb4688759521ae3c6621523 100644 (file)
--- a/test/xml_subtitle_test.cc
+++ b/test/xml_subtitle_test.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic 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.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic 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
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -41,8 +42,8 @@ BOOST_AUTO_TEST_CASE (xml_subtitle_test)
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
        film->set_name ("frobozz");
        shared_ptr<TextSubtitleContent> content (new TextSubtitleContent (film, "test/data/subrip2.srt"));
-       content->subtitle->set_use_subtitles (true);
-       content->subtitle->set_burn_subtitles (false);
+       content->subtitle->set_use (true);
+       content->subtitle->set_burn (false);
        film->examine_and_add_content (content);
        wait_for_jobs ();
        film->make_dcp ();
@@ -62,8 +63,8 @@ BOOST_AUTO_TEST_CASE (xml_subtitle_test2)
        film->set_interop (true);
        film->set_sequence (false);
        shared_ptr<TextSubtitleContent> content (new TextSubtitleContent (film, "test/data/subrip2.srt"));
-       content->subtitle->set_use_subtitles (true);
-       content->subtitle->set_burn_subtitles (false);
+       content->subtitle->set_use (true);
+       content->subtitle->set_burn (false);
        film->examine_and_add_content (content);
        film->examine_and_add_content (content);
        wait_for_jobs ();