summaryrefslogtreecommitdiff
path: root/src/dcp.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-07-17 20:30:30 +0100
committerCarl Hetherington <cth@carlh.net>2012-07-17 20:30:30 +0100
commit4709b2fe88040f3678560997726f3a209eacc660 (patch)
treedb4c7f923de4bd4e09de6c5237288424f0622a24 /src/dcp.cc
parent43cc9d6e1b1e1957288c545cc55f5a0df8492b55 (diff)
Fix up progress reporting, some better exceptions.
Diffstat (limited to 'src/dcp.cc')
-rw-r--r--src/dcp.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dcp.cc b/src/dcp.cc
index b691d146..9a7c367b 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -58,7 +58,7 @@ DCP::add_sound_asset (list<string> const & files)
filesystem::path p;
p /= _directory;
p /= "audio.mxf";
- _assets.push_back (shared_ptr<SoundAsset> (new SoundAsset (files, p.string(), _fps, _length)));
+ _assets.push_back (shared_ptr<SoundAsset> (new SoundAsset (files, p.string(), &Progress, _fps, _length)));
}
/** Add a picture asset.
@@ -70,7 +70,7 @@ DCP::add_picture_asset (list<string> const & files, int w, int h)
filesystem::path p;
p /= _directory;
p /= "video.mxf";
- _assets.push_back (shared_ptr<PictureAsset> (new PictureAsset (files, p.string(), _fps, _length, w, h)));
+ _assets.push_back (shared_ptr<PictureAsset> (new PictureAsset (files, p.string(), &Progress, _fps, _length, w, h)));
}
/** Write the required XML files to the directory that was
@@ -82,7 +82,7 @@ DCP::write_xml () const
string cpl_uuid = make_uuid ();
string cpl_path = write_cpl (cpl_uuid);
int cpl_length = filesystem::file_size (cpl_path);
- string cpl_digest = make_digest (cpl_path);
+ string cpl_digest = make_digest (cpl_path, 0);
string pkl_uuid = make_uuid ();
string pkl_path = write_pkl (pkl_uuid, cpl_uuid, cpl_digest, cpl_length);