X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.h;h=f908d4fedf3332dc84d8f6e4c3e2b35086022690;hb=72434826a794899941325e18a937571b0be21b1c;hp=51770c288695fd064d9d4fc73574664fe7146fb7;hpb=f188128e2577942f030374631d3cf1324a00624a;p=dcpomatic.git

diff --git a/src/lib/util.h b/src/lib/util.h
index 51770c288..f908d4fed 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,8 @@ 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);
 
 #endif