summaryrefslogtreecommitdiff
path: root/src/lib/util.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-06-08 14:25:10 +0100
committerCarl Hetherington <cth@carlh.net>2015-06-08 14:25:10 +0100
commitf07623551706b849190c84059bac455088f8eb1e (patch)
tree81360f73c4a52702921270c605087d0c5f03e42e /src/lib/util.cc
parent5665f1503d751391768bd7ed5894f2ecd63ea8fc (diff)
Adapt for changes to libdcp API.
Diffstat (limited to 'src/lib/util.cc')
-rw-r--r--src/lib/util.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/util.cc b/src/lib/util.cc
index dccf32f4d..b662f8679 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -37,9 +37,9 @@
#include "safe_stringstream.h"
#include <dcp/util.h>
#include <dcp/signer.h>
-#include <dcp/picture_mxf.h>
-#include <dcp/sound_mxf.h>
-#include <dcp/subtitle_content.h>
+#include <dcp/picture_asset.h>
+#include <dcp/sound_asset.h>
+#include <dcp/subtitle_asset.h>
#include <glib.h>
#include <pangomm/init.h>
#include <boost/algorithm/string.hpp>
@@ -676,19 +676,19 @@ write_frame_info (FILE* file, int frame, Eyes eyes, dcp::FrameInfo info)
}
string
-video_mxf_filename (shared_ptr<dcp::PictureMXF> mxf)
+video_asset_filename (shared_ptr<dcp::PictureAsset> asset)
{
- return "j2c_" + mxf->id() + ".mxf";
+ return "j2c_" + asset->id() + ".mxf";
}
string
-audio_mxf_filename (shared_ptr<dcp::SoundMXF> mxf)
+audio_asset_filename (shared_ptr<dcp::SoundAsset> asset)
{
- return "pcm_" + mxf->id() + ".mxf";
+ return "pcm_" + asset->id() + ".mxf";
}
string
-subtitle_content_filename (shared_ptr<dcp::SubtitleContent> content)
+subtitle_content_filename (shared_ptr<dcp::SubtitleAsset> asset)
{
- return "sub_" + content->id() + ".xml";
+ return "sub_" + asset->id() + ".xml";
}