diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-08 14:25:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-08 14:25:10 +0100 |
| commit | f07623551706b849190c84059bac455088f8eb1e (patch) | |
| tree | 81360f73c4a52702921270c605087d0c5f03e42e /src/lib/util.h | |
| parent | 5665f1503d751391768bd7ed5894f2ecd63ea8fc (diff) | |
Adapt for changes to libdcp API.
Diffstat (limited to 'src/lib/util.h')
| -rw-r--r-- | src/lib/util.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/util.h b/src/lib/util.h index 51770c288..957453fb7 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -29,7 +29,7 @@ #include "exceptions.h" #include "dcpomatic_time.h" #include <dcp/util.h> -#include <dcp/picture_mxf_writer.h> +#include <dcp/picture_asset_writer.h> extern "C" { #include <libavcodec/avcodec.h> #include <libavfilter/avfilter.h> @@ -43,9 +43,9 @@ extern "C" { #undef check namespace dcp { - class PictureMXF; - class SoundMXF; - class SubtitleContent; + class PictureAsset; + class SoundAsset; + class SubtitleAsset; } /** The maximum number of audio channels that we can have in a DCP */ @@ -102,9 +102,9 @@ extern void set_backtrace_file (boost::filesystem::path); extern dcp::FrameInfo read_frame_info (FILE* file, int frame, Eyes eyes); extern void write_frame_info (FILE* file, int frame, Eyes eyes, dcp::FrameInfo info); extern std::map<std::string, std::string> split_get_request (std::string url); -extern std::string video_mxf_filename (boost::shared_ptr<dcp::PictureMXF> mxf); -extern std::string audio_mxf_filename (boost::shared_ptr<dcp::SoundMXF> mxf); -extern std::string subtitle_content_filename (boost::shared_ptr<dcp::SubtitleContent> content); +extern std::string video_asset_filename (boost::shared_ptr<dcp::PictureAsset> asset); +extern std::string audio_asset_filename (boost::shared_ptr<dcp::SoundAsset> asset); +extern std::string subtitle_content_filename (boost::shared_ptr<dcp::SubtitleAsset> content); #endif |