Fix failure to parse subrip where there are extra spaces in the time/position line.

[libsub.git] / src / exceptions.h

diff --git a/src/exceptions.h b/src/exceptions.h
index a0ca1b93b073b64f1f00bf30370ee96cfb807124..56b58aaa0a4d2f85c3b2ab0c7001f168ff62fa06 100644 (file)
--- a/src/exceptions.h
+++ b/src/exceptions.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -22,59 +22,79 @@
 
 #include <stdexcept>
 #include <string>
+#include <list>
 
 namespace sub {
 
-class MessageError : public std::exception
-{
-public:
-       MessageError (std::string const & message)
-               : _message (message) {}
-       ~MessageError () throw () {}
-
-       /** @return error message */
-       char const * what () const throw () {
-               return _message.c_str ();
-       }
-
-private:
-       /** error message */
-       std::string _message;
-};
-
 /** @class XMLError
  *  @brief An error raised when reading an XML file.
  */
-class XMLError : public MessageError
+class XMLError : public std::runtime_error
 {
 public:
        XMLError (std::string const & message)
-               : MessageError (message)
+               : std::runtime_error (message)
        {}
 };
 
 /** @class STLError
  *  @brief An error raised when reading a binary STL file.
  */
-class STLError : public MessageError
+class STLError : public std::runtime_error
 {
 public:
        STLError (std::string const & message)
-               : MessageError (message)
+               : std::runtime_error (message)
        {}
 };
 
 /** @class SubripError
  *  @brief An error raised when reading a Subrip file.
  */
-class SubripError : public MessageError
+class SubripError : public std::runtime_error
+{
+public:
+       SubripError (std::string saw, std::string expecting, std::list<std::string> context);
+       ~SubripError () throw () {}
+
+       std::list<std::string> context () const {
+               return _context;
+       }
+
+private:
+       std::list<std::string> _context;
+};
+
+class MXFError : public std::runtime_error
+{
+public:
+       MXFError (std::string const & message)
+               : std::runtime_error (message)
+       {}
+};
+
+class UnknownFrameRateError : public std::runtime_error
 {
 public:
-       SubripError (std::string saw, std::string expecting)
-               : MessageError ("Error in SubRip file: saw " + saw + " while expecting " + expecting)
+       UnknownFrameRateError ()
+               : std::runtime_error ("unknown frame rate")
        {}
 };
 
+class DCPError : public std::runtime_error
+{
+public:
+       DCPError (std::string const & message)
+               : std::runtime_error (message)
+       {}
+};
+
+class ProgrammingError : public std::runtime_error
+{
+public:
+       ProgrammingError (std::string file, int line);
+};
+
 }
 
 #endif