Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/exceptions.h b/src/lib/exceptions.h
index 950c2f381aae0da529fc0403c75fbfa3412637a6..6939f81a34765b68366d5b958019299e4a3f3ab8 100644 (file)
--- a/src/lib/exceptions.h
+++ b/src/lib/exceptions.h
@@ -24,11 +24,9 @@
 #ifndef DCPOMATIC_EXCEPTIONS_H
 #define DCPOMATIC_EXCEPTIONS_H
 
-#include <boost/thread.hpp>
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
-#include <boost/exception/all.hpp>
 #include <boost/filesystem.hpp>
 #include <stdexcept>
 #include <cstring>
@@ -40,9 +38,9 @@ class StringError : public std::exception
 {
 public:
        /** @param w Error message */
-       StringError (std::string w) {
-               _what = w;
-       }
+       StringError (std::string w)
+               : _what (w)
+       {}
 
        virtual ~StringError () throw () {}
 
@@ -265,47 +263,12 @@ public:
        ProgrammingError (std::string file, int line);
 };
 
-/** @class ExceptionStore
- *  @brief 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
- *
- *  void my_thread ()
- *  try {
- *    // do things which might throw exceptions
- *  } catch (...) {
- *    store_current ();
- *  }
- *
- *  and then in another thread call rethrow().  If any
- *  exception was thrown by my_thread it will be stored by
- *  store_current() and then rethrow() will re-throw it where
- *  it can be handled.
- */
-class ExceptionStore
+class TextEncodingError : public StringError
 {
 public:
-       void rethrow () {
-               boost::mutex::scoped_lock lm (_mutex);
-               if (_exception) {
-                       boost::exception_ptr tmp = _exception;
-                       _exception = boost::exception_ptr ();
-                       boost::rethrow_exception (tmp);
-               }
-       }
-
-protected:     
-       
-       void store_current () {
-               boost::mutex::scoped_lock lm (_mutex);
-               _exception = boost::current_exception ();
-       }
-
-private:
-       boost::exception_ptr _exception;
-       mutable boost::mutex _mutex;
+       TextEncodingError (std::string s)
+               : StringError (s)
+       {}
 };
 
 #endif