Still more licence fixups.

[libdcp.git] / src / exceptions.cc

diff --git a/src/exceptions.cc b/src/exceptions.cc
index c588696e22968d0cf3e138543b97afb5a7b769fc..4bffd95774267912da7d292cc2ec227c9a1dc8d7 100644 (file)
--- a/src/exceptions.cc
+++ b/src/exceptions.cc
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 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.
 
-    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/>.
 */
 
 /** @file  src/exceptions.cc
@@ -50,10 +50,10 @@ TimeFormatError::TimeFormatError (string bad_time)
 
 MissingAssetError::MissingAssetError (boost::filesystem::path path, AssetType type)
        : DCPReadError (
-               type == MAIN_PICTURE    ? String::compose ("missing asset %1 for main picture", path.string()) :
-               (type == MAIN_SOUND     ? String::compose ("missing asset %1 for main sound", path.string()) :
-                (type == MAIN_SUBTITLE ? String::compose ("missing asset %1 for main subtitle", path.string()) :
-                 String::compose ("missing asset %1", path.string()))))
+               type == MAIN_PICTURE    ? String::compose ("Missing asset %1 for main picture", path.string()) :
+               (type == MAIN_SOUND     ? String::compose ("Missing asset %1 for main sound", path.string()) :
+                (type == MAIN_SUBTITLE ? String::compose ("Missing asset %1 for main subtitle", path.string()) :
+                 String::compose ("Missing asset %1", path.string()))))
 {
 
 }
@@ -70,3 +70,9 @@ ProgrammingError::ProgrammingError (string file, int line)
 {
 
 }
+
+MismatchedStandardError::MismatchedStandardError ()
+       : DCPReadError ("DCP contains both Interop and SMPTE parts")
+{
+
+}