*/
+#include "raw_convert.h"
#include "cpl.h"
#include "util.h"
#include "mono_picture_mxf.h"
#include "reel_picture_asset.h"
#include "reel_sound_asset.h"
#include "reel_subtitle_asset.h"
+#include "local_time.h"
#include <libxml/parser.h>
using std::string;
using std::pair;
using std::make_pair;
using boost::shared_ptr;
-using boost::lexical_cast;
using boost::optional;
using namespace dcp;
/* default _content_version_id to and _content_version_label to
a random ID and the current time.
*/
- time_t now = time (0);
- struct tm* tm = localtime (&now);
- _content_version_id = "urn:uuid:" + make_uuid() + tm_to_string (tm);
+ _content_version_id = "urn:uuid:" + make_uuid() + LocalTime().as_string ();
_content_version_label_text = _content_version_id;
}
if (_annotation_text != other._annotation_text && !opt.cpl_annotation_texts_can_differ) {
stringstream s;
s << "annotation texts differ: " << _annotation_text << " vs " << other._annotation_text << "\n";
- note (ERROR, s.str ());
+ note (DCP_ERROR, s.str ());
return false;
}
if (_content_kind != other._content_kind) {
- note (ERROR, "content kinds differ");
+ note (DCP_ERROR, "content kinds differ");
return false;
}
if (_reels.size() != other._reels.size()) {
- note (ERROR, String::compose ("reel counts differ (%1 vs %2)", _reels.size(), other._reels.size()));
+ note (DCP_ERROR, String::compose ("reel counts differ (%1 vs %2)", _reels.size(), other._reels.size()));
return false;
}
* @param kdm KDM.
*/
void
-CPL::add (KDM const & kdm)
+CPL::add (DecryptedKDM const & kdm)
{
for (list<shared_ptr<Reel> >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) {
(*i)->add (kdm);