std::shared_ptr

[libdcp.git] / tools / dcprecover.cc

diff --git a/tools/dcprecover.cc b/tools/dcprecover.cc
index b747a5da728da7c715eee5060962a51ed06043b7..9105f2a7f6d77e15e22f5bc541e6ab8144dcd2bb 100644 (file)
--- a/tools/dcprecover.cc
+++ b/tools/dcprecover.cc
@@ -46,7 +46,7 @@ using std::cerr;
 using std::cout;
 using std::string;
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 
 static void
@@ -65,6 +65,8 @@ void progress (float f)
 int
 main (int argc, char* argv[])
 {
+       dcp::init ();
+
        int option_index = 0;
        optional<boost::filesystem::path> output;
        while (true) {
@@ -100,15 +102,15 @@ main (int argc, char* argv[])
        /* Try to read it and report errors */
 
        dcp::DCP dcp (dcp_dir);
-       dcp::DCP::ReadErrors errors;
+       list<dcp::VerificationNote> notes;
        try {
-               dcp.read (true, &errors, true);
-       } catch (dcp::DCPReadError& e) {
+               dcp.read (&notes, true);
+       } catch (dcp::ReadError& e) {
                cout << "Error:" <<  e.what() << "\n";
        }
 
-       BOOST_FOREACH (shared_ptr<dcp::DCPReadError> i, errors) {
-               cout << "Error: " << i->what() << "\n";
+       BOOST_FOREACH (dcp::VerificationNote i, notes) {
+               cout << "Error: " << dcp::note_to_string(i) << "\n";
        }
 
        /* Look for a CPL */
@@ -118,7 +120,7 @@ main (int argc, char* argv[])
                if (i->path().extension() == ".xml") {
                        try {
                                cpl.reset(new dcp::CPL(i->path()));
-                       } catch (dcp::DCPReadError& e) {
+                       } catch (dcp::ReadError& e) {
                                cout << "Error: " << e.what() << "\n";
                        } catch (xmlpp::parse_error& e) {
                                cout << "Error: " << e.what() << "\n";
@@ -145,7 +147,7 @@ main (int argc, char* argv[])
                                        asset->hash (&progress);
                                        cout << "100%                     \n";
                                        assets.push_back (asset);
-                               } catch (dcp::DCPReadError& e) {
+                               } catch (dcp::ReadError& e) {
                                        cout << "Error: " << e.what() << "\n";
                                }
                        }