X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.h;h=95d272979f603e736d631a6b92d432683edb67dc;hb=ab778ced048cad27b7c10808acfa93861ea91fce;hp=5413e4814e372f72fef41b43020330209c2d973e;hpb=5ae794047e5ceee4502e59211f0083a60224f4bd;p=dcpomatic.git

diff --git a/src/lib/util.h b/src/lib/util.h
index 5413e4814..95d272979 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,15 +43,15 @@ 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 */
 #define MAX_DCP_AUDIO_CHANNELS 12
 /** Message broadcast to find possible encoding servers */
-#define DCPOMATIC_HELLO "Boys, you gotta learn not to talk to nuns that way"
+#define DCPOMATIC_HELLO "I mean really, Ray, it's used."
 /** Number of films to keep in history */
 #define HISTORY_SIZE 10
 #define REPORT_PROBLEM _("Please report this problem by using Help -> Report a problem or via email to carl@dcpomatic.com")
@@ -65,6 +65,7 @@ extern std::string seconds_to_hms (int);
 extern std::string seconds_to_approximate_hms (int);
 extern double seconds (struct timeval);
 extern void dcpomatic_setup ();
+extern void dcpomatic_setup_path_encoding ();
 extern void dcpomatic_setup_gettext_i18n (std::string);
 extern std::string md5_digest_head_tail (std::vector<boost::filesystem::path>, boost::uintmax_t size);
 extern void ensure_ui_thread ();
@@ -76,9 +77,7 @@ extern boost::filesystem::path mo_path ();
 #endif
 extern std::string tidy_for_filename (std::string);
 extern dcp::Size fit_ratio_within (float ratio, dcp::Size);
-extern int dcp_audio_frame_rate (int);
 extern int stride_round_up (int, int const *, int);
-extern int round_to (float n, int r);
 extern void* wrapped_av_malloc (size_t);
 
 class FFmpegSubtitlePeriod
@@ -99,13 +98,8 @@ public:
 
 extern FFmpegSubtitlePeriod subtitle_period (AVSubtitle const &);
 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 int64_t video_frames_to_audio_frames (VideoFrame v, float audio_sample_rate, float frames_per_second);
 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
-