*/
-#include "reel_sound_asset.h"
#include "dcp_assert.h"
+#include "reel_sound_asset.h"
+#include "warnings.h"
#include <libcxml/cxml.h>
+LIBDCP_DISABLE_WARNINGS
#include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
using std::string;
using std::shared_ptr;
+using boost::optional;
using namespace dcp;
ReelSoundAsset::ReelSoundAsset (shared_ptr<SoundAsset> asset, int64_t entry_point)
- : ReelAsset (asset->id(), asset->edit_rate(), asset->intrinsic_duration(), entry_point)
- , ReelEncryptableAsset (asset, asset->key_id())
+ : ReelFileAsset (asset, asset->key_id(), asset->id(), asset->edit_rate(), asset->intrinsic_duration(), entry_point)
{
}
ReelSoundAsset::ReelSoundAsset (shared_ptr<const cxml::Node> node)
- : ReelAsset (node)
- , ReelEncryptableAsset (node)
+ : ReelFileAsset (node)
{
node->ignore_child ("Language");
node->done ();
}
-string
+optional<string>
ReelSoundAsset::key_type () const
{
- return "MDAK";
-}
-
-
-xmlpp::Node *
-ReelSoundAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
-{
- auto asset = write_to_cpl_asset (node, standard, hash());
- write_to_cpl_mxf (asset);
- return asset;
+ return string("MDAK");
}
if (!asset_equals (other, opt, note)) {
return false;
}
- if (!mxf_equals (other, opt, note)) {
+ if (!file_asset_equals (other, opt, note)) {
return false;
}