Remove picture_asset.h; some better error messages.

diff --git a/.gitignore b/.gitignore
index 2170048b4af63cdfc2fc3f50e3636643a0fe293b..4c1bc112d3d27bf89b55e475460c2e2eb6fba014 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ GPATH
 GRTAGS
 GSYMS
 GTAGS
+.*.swp

diff --git a/src/dcp.cc b/src/dcp.cc
index 817cf36e14c24f80c7b6317c5f39247752a8894c..d383eeac013e4167bff0da1109be503e721cb60b 100644 (file)
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -54,6 +54,7 @@ using std::stringstream;
 using std::ostream;
 using std::make_pair;
 using std::map;
+using std::cout;
 using boost::shared_ptr;
 using boost::lexical_cast;
 using namespace dcp;
@@ -76,7 +77,7 @@ DCP::read ()
        } else if (boost::filesystem::exists (_directory / "ASSETMAP.xml")) {
                asset_map_file = _directory / "ASSETMAP.xml";
        } else {
-               boost::throw_exception (DCPReadError ("could not find AssetMap file"));
+               boost::throw_exception (DCPReadError (String::compose ("could not find AssetMap file `%1'", asset_map_file.string())));
        }
 
        cxml::Document asset_map ("AssetMap");
@@ -94,7 +95,6 @@ DCP::read ()
        }
 
        /* Read all the assets from the asset map */
-       
        for (map<string, boost::filesystem::path>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
                boost::filesystem::path path = _directory / i->second;
                if (boost::algorithm::ends_with (path.string(), ".xml")) {
@@ -149,7 +149,7 @@ bool
 DCP::equals (DCP const & other, EqualityOptions opt, boost::function<void (NoteType, string)> note) const
 {
        if (_assets.size() != other._assets.size()) {
-               note (ERROR, "Asset counts differ");
+               note (ERROR, String::compose ("Asset counts differ: %1 vs %2", _assets.size(), other._assets.size()));
                return false;
        }
 

diff --git a/src/picture_asset.h b/src/picture_asset.h
deleted file mode 100644 (file)
index b404abd..0000000
--- a/src/picture_asset.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-    Copyright (C) 2012 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#ifndef LIBDCP_PICTURE_ASSET_H
-#define LIBDCP_PICTURE_ASSET_H
-
-/** @file  src/picture_asset.h
- *  @brief An asset made up of JPEG2000 data
- */
-
-#include <openjpeg.h>
-#include "mxf_asset.h"
-#include "util.h"
-#include "metadata.h"
-
-namespace ASDCP {
-       namespace JP2K {
-               struct PictureDescriptor;
-       }
-}
-
-namespace libdcp
-{
-
-class MonoPictureFrame;        
-class StereoPictureFrame;
-class PictureAssetWriter;
-
-/** @brief An asset made up of JPEG2000 data */
-class PictureAsset : public MXFAsset
-{
-public:
-       /** Construct a PictureAsset.
-        *  
-        *  @param directory Directory where MXF file is.
-        *  @param mxf_name Name of MXF file.
-        */
-       PictureAsset (boost::filesystem::path directory, boost::filesystem::path mxf_name);
-
-       /** Start a progressive write to this asset.
-        *  The following parameters must be set up (if required) before calling this:
-        *      Interop mode (set_interop)
-        *      Edit rate    (set_edit_rate)
-        *      MXF Metadata (set_metadata)
-        *      
-        *  @param overwrite true to overwrite an existing MXF file; in this mode, writing can be resumed to a partially-written MXF; false if the
-        *  MXF file does not exist.
-        */
-       virtual boost::shared_ptr<PictureAssetWriter> start_write (bool overwrite) = 0;
-
-       virtual void read () = 0;
-       virtual void create (std::vector<boost::filesystem::path> const &) {}
-       virtual void create (boost::function<boost::filesystem::path (int)>) {}
-       
-       Size size () const {
-               return _size;
-       }
-
-       void set_size (Size s) {
-               _size = s;
-       }
-
-       void write_to_cpl (xmlpp::Element *) const;
-
-protected:
-
-       std::string asdcp_kind () const {
-               return "Picture";
-       }
-
-       bool frame_buffer_equals (
-               int frame, EqualityOptions opt, boost::function<void (NoteType, std::string)> note,
-               uint8_t const * data_A, unsigned int size_A, uint8_t const * data_B, unsigned int size_B
-               ) const;
-
-       bool descriptor_equals (
-               ASDCP::JP2K::PictureDescriptor const & a, ASDCP::JP2K::PictureDescriptor const & b, boost::function<void (NoteType, std::string)>
-               ) const;
-
-       /** picture size in pixels */
-       Size _size;
-
-private:
-       std::string key_type () const;
-       virtual int edit_rate_factor () const = 0;
-};
-       
-
-}
-
-#endif

diff --git a/tools/dcpdiff.cc b/tools/dcpdiff.cc
index dda7c3c30a03f1d88deea73c9450aba1bd942a67..ba42b61e4571376f9905366b51b5d0c5b67b275e 100644 (file)
--- a/tools/dcpdiff.cc
+++ b/tools/dcpdiff.cc
@@ -96,6 +96,7 @@ main (int argc, char* argv[])
                exit (EXIT_FAILURE);
        }
 
+       cout << "reading A.\n";
        DCP* a = 0;
        try {
                a = new DCP (argv[optind]);
@@ -105,6 +106,7 @@ main (int argc, char* argv[])
                exit (EXIT_FAILURE);
        }
 
+       cout << "reading B.\n";
        DCP* b = 0;
        try {
                b = new DCP (argv[optind + 1]);