Still more licence fixups.

[libdcp.git] / src / exceptions.cc

diff --git a/src/exceptions.cc b/src/exceptions.cc
index 4045021c953680b1f896e6814432be1c449a83fa..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
@@ -25,10 +25,11 @@
 #include "compose.hpp"
 
 using std::string;
+using std::runtime_error;
 using namespace dcp;
 
 FileError::FileError (string message, boost::filesystem::path filename, int number)
-       : StringError (String::compose ("%1 (%2) (error %3)", message, filename.string(), number))
+       : runtime_error (String::compose ("%1 (%2) (error %3)", message, filename.string(), number))
        , _filename (filename)
        , _number (number)
 {
@@ -36,48 +37,42 @@ FileError::FileError (string message, boost::filesystem::path filename, int numb
 }
 
 UnresolvedRefError::UnresolvedRefError (string id)
-       : StringError (String::compose ("Unresolved reference to asset id %1", id))
+       : runtime_error (String::compose ("Unresolved reference to asset id %1", id))
 {
 
 }
 
 TimeFormatError::TimeFormatError (string bad_time)
-       : StringError (String::compose ("Bad time string %1", bad_time))
+       : runtime_error (String::compose ("Bad time string %1", bad_time))
 {
 
 }
 
 MissingAssetError::MissingAssetError (boost::filesystem::path path, AssetType type)
-       : _path (path)
-       , _type (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()))))
 {
-       string type_name;
-       switch (_type) {
-       case MAIN_PICTURE:
-               type_name = " for main picture";
-               break;
-       case MAIN_SOUND:
-               type_name = " for main sound";
-               break;
-       case MAIN_SUBTITLE:
-               type_name = " for main subtitle";
-               break;
-       case UNKNOWN:
-               break;
-       }
-       
-       _message = String::compose ("Missing asset %1%2", path.string(), type_name);
+
 }
 
 NotEncryptedError::NotEncryptedError (string const & what)
-       : StringError (String::compose ("%1 is not encrypted", what))
+       : runtime_error (String::compose ("%1 is not encrypted", what))
 {
 
 }
 
 
 ProgrammingError::ProgrammingError (string file, int line)
-       : StringError (String::compose ("Programming error at %1:%2", file, line))
+       : runtime_error (String::compose ("Programming error at %1:%2", file, line))
+{
+
+}
+
+MismatchedStandardError::MismatchedStandardError ()
+       : DCPReadError ("DCP contains both Interop and SMPTE parts")
 {
 
 }