Merge master; specify libdcp-1.0.

[dcpomatic.git] / src / lib / exceptions.h

diff --git a/src/lib/exceptions.h b/src/lib/exceptions.h
index c1240538f3de2e2a10b6dfb052e17d2bbbbffc9e..213be6186d523a713a0a3f167f77127e0047164e 100644 (file)
--- a/src/lib/exceptions.h
+++ b/src/lib/exceptions.h
@@ -230,6 +230,13 @@ public:
        PixelFormatError (std::string o, AVPixelFormat f);
 };
 
+/** An error that occurs while parsing a SubRip file */
+class SubRipError : public FileError
+{
+public:
+       SubRipError (std::string, std::string, boost::filesystem::path);
+};
+
 /** A parent class for classes which have a need to catch and
  *  re-throw exceptions.  This is intended for classes
  *  which run their own thread; they should do something like
@@ -253,6 +260,7 @@ public:
                boost::mutex::scoped_lock lm (_mutex);
                if (_exception) {
                        boost::rethrow_exception (_exception);
+                       _exception = boost::exception_ptr ();
                }
        }