Still more licence fixups.

[libdcp.git] / test / subs_in_out.cc

diff --git a/test/subs_in_out.cc b/test/subs_in_out.cc
index fce0bfec0ad869e8e1e27c1bacd709c74e38988b..d3ba7e4311675720a5f98079a82ddd904ca347d5 100644 (file)
--- a/test/subs_in_out.cc
+++ b/test/subs_in_out.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2012-2015 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.
 
-    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
-    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 "interop_subtitle_asset.h"
@@ -38,7 +38,7 @@ main (int argc, char* argv[])
                cerr << "Could not load as interop: " << e.what() << "\n";
                try {
                        dcp::SMPTESubtitleAsset sc (argv[1]);
-                       cout << sc.xml_as_string().raw ();
+                       cout << sc.xml_as_string();
                } catch (exception& e) {
                        cerr << "Could not load as SMPTE (" << e.what() << ")\n";
                }