projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put xmlns:dsig on Signer and Signature rather than on the whole
[libdcp.git]
/
src
/
atmos_asset.cc
diff --git
a/src/atmos_asset.cc
b/src/atmos_asset.cc
index eac01dcf3525378a35b1b6dd824bad28486674f1..1e4d9c18f7067f71c3cf1010114924cc385da796 100644
(file)
--- a/
src/atmos_asset.cc
+++ b/
src/atmos_asset.cc
@@
-42,7
+42,8
@@
using boost::shared_ptr;
using namespace dcp;
AtmosAsset::AtmosAsset (Fraction edit_rate, int first_frame, int max_channel_count, int max_object_count, string atmos_id, int atmos_version)
using namespace dcp;
AtmosAsset::AtmosAsset (Fraction edit_rate, int first_frame, int max_channel_count, int max_object_count, string atmos_id, int atmos_version)
- : _edit_rate (edit_rate)
+ : MXF (SMPTE)
+ , _edit_rate (edit_rate)
, _intrinsic_duration (0)
, _first_frame (first_frame)
, _max_channel_count (max_channel_count)
, _intrinsic_duration (0)
, _first_frame (first_frame)
, _max_channel_count (max_channel_count)
@@
-55,6
+56,7
@@
AtmosAsset::AtmosAsset (Fraction edit_rate, int first_frame, int max_channel_cou
AtmosAsset::AtmosAsset (boost::filesystem::path file)
: Asset (file)
AtmosAsset::AtmosAsset (boost::filesystem::path file)
: Asset (file)
+ , MXF (SMPTE)
{
ASDCP::ATMOS::MXFReader reader;
Kumu::Result_t r = reader.OpenRead (file.string().c_str());
{
ASDCP::ATMOS::MXFReader reader;
Kumu::Result_t r = reader.OpenRead (file.string().c_str());
@@
-89,7
+91,7
@@
AtmosAsset::pkl_type (Standard) const
shared_ptr<AtmosAssetReader>
AtmosAsset::start_read () const
{
shared_ptr<AtmosAssetReader>
AtmosAsset::start_read () const
{
- return shared_ptr<AtmosAssetReader> (new AtmosAssetReader (this, key
()
));
+ return shared_ptr<AtmosAssetReader> (new AtmosAssetReader (this, key
(), SMPTE
));
}
shared_ptr<AtmosAssetWriter>
}
shared_ptr<AtmosAssetWriter>