Assorted test fixes.

[libdcp.git] / src / dcp.cc

diff --git a/src/dcp.cc b/src/dcp.cc
index c0d148c5a8596b3a5b92c78298327291357df233..044e1f537840638d85e4040b7db8a57373fecca7 100644 (file)
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -69,17 +69,19 @@ DCP::DCP (boost::filesystem::path directory)
 }
 
 template<class T> void
-survivable_error (bool keep_going, list<string>* errors, T const & e)
+survivable_error (bool keep_going, dcp::DCP::ReadErrors* errors, T const & e)
 {
-       if (keep_going && errors) {
-               errors->push_back (e.what ());
+       if (keep_going) {
+               if (errors) {
+                       errors->push_back (shared_ptr<T> (new T (e)));
+               }
        } else {
                throw e;
        }
 }
 
 void
-DCP::read (bool keep_going, list<string>* errors)
+DCP::read (bool keep_going, ReadErrors* errors)
 {
        /* Read the ASSETMAP */
        
@@ -112,7 +114,7 @@ DCP::read (bool keep_going, list<string>* errors)
                boost::filesystem::path path = _directory / i->second;
 
                if (!boost::filesystem::exists (path)) {
-                       survivable_error (keep_going, errors, FileError ("file not found", path, -1));
+                       survivable_error (keep_going, errors, MissingAssetError (path));
                        continue;
                }