X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Futil.h;h=c62b98df65c140cfcedc90d13cbfca36e45dd181;hp=b152b67b514cfb3ba2a9db90d094e8774d7bb190;hb=HEAD;hpb=3c86d70cf46ca11212ae2e2f4d711db0f478c2f5

diff --git a/src/lib/util.h b/src/lib/util.h
index b152b67b5..fd6fd6164 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,54 +18,55 @@
 
 */
 
+
 /** @file src/util.h
  *  @brief Some utility functions and classes.
  */
 
+
 #ifndef DCPOMATIC_UTIL_H
 #define DCPOMATIC_UTIL_H
 
-#include "types.h"
-#include "dcpomatic_time.h"
+
 #include "audio_mapping.h"
+#include "dcpomatic_time.h"
+#include "pixel_quanta.h"
+#include "types.h"
+#include <dcp/atmos_asset.h>
+#include <dcp/decrypted_kdm.h>
 #include <dcp/util.h>
-#include <boost/shared_ptr.hpp>
+#include <dcp/subtitle_image.h>
 #include <boost/optional.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/date_time/gregorian/gregorian.hpp>
 #include <string>
 #include <map>
 #include <vector>
 
 #undef check
 
+
 namespace dcp {
 	class PictureAsset;
 	class SoundAsset;
+	class SubtitleAsset;
 }
 
-/** The maximum number of audio channels that we can have in a DCP */
-#define MAX_DCP_AUDIO_CHANNELS 16
-/** Message broadcast to find possible encoding servers */
-#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")
-#define TEXT_FONT_ID "font"
-/** Largest KDM size (in bytes) that will be accepted */
-#define MAX_KDM_SIZE (256 * 1024)
-
 extern std::string program_name;
+extern bool is_batch_converter;
 
-struct AVSubtitle;
 class AudioBuffers;
+class TextDecoder;
 
 extern std::string seconds_to_hms (int);
+extern std::string time_to_hmsf (dcpomatic::DCPTime time, Frame rate);
 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 digest_head_tail (std::vector<boost::filesystem::path>, boost::uintmax_t size);
+extern std::string simple_digest (std::vector<boost::filesystem::path> paths);
 extern void ensure_ui_thread ();
 extern std::string audio_channel_name (int);
 extern std::string short_audio_channel_name (int);
@@ -77,15 +78,25 @@ 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 stride_round_up (int, int const *, int);
-extern void* wrapped_av_malloc (size_t);
 extern void set_backtrace_file (boost::filesystem::path);
-extern std::map<std::string, std::string> split_get_request (std::string url);
-extern std::string video_asset_filename (boost::shared_ptr<dcp::PictureAsset> asset, int reel_index, int reel_count, boost::optional<std::string> content_summary);
-extern std::string audio_asset_filename (boost::shared_ptr<dcp::SoundAsset> asset, int reel_index, int reel_count, boost::optional<std::string> content_summary);
-extern float relaxed_string_to_float (std::string);
+extern std::string video_asset_filename (std::shared_ptr<dcp::PictureAsset> asset, int reel_index, int reel_count, boost::optional<std::string> content_summary);
+extern std::string audio_asset_filename (std::shared_ptr<dcp::SoundAsset> asset, int reel_index, int reel_count, boost::optional<std::string> content_summary);
+extern std::string subtitle_asset_filename (std::shared_ptr<dcp::SubtitleAsset> asset, int reel_index, int reel_count, boost::optional<std::string> content_summary, std::string extension);
+extern std::string atmos_asset_filename (std::shared_ptr<dcp::AtmosAsset> asset, int reel_index, int reel_count, boost::optional<std::string> content_summary);
 extern std::string careful_string_filter (std::string);
 extern std::pair<int, int> audio_channel_types (std::list<int> mapped, int channels);
-extern boost::shared_ptr<AudioBuffers> remap (boost::shared_ptr<const AudioBuffers> input, int output_channels, AudioMapping map);
+extern std::shared_ptr<AudioBuffers> remap (std::shared_ptr<const AudioBuffers> input, int output_channels, AudioMapping map);
+extern size_t utf8_strlen (std::string s);
+extern void emit_subtitle_image (dcpomatic::ContentTimePeriod period, dcp::SubtitleImage sub, dcp::Size size, std::shared_ptr<TextDecoder> decoder);
+extern void copy_in_bits (boost::filesystem::path from, boost::filesystem::path to, std::function<void (float)>);
+extern dcp::Size scale_for_display (dcp::Size s, dcp::Size display_container, dcp::Size film_container, PixelQuanta quanta);
+extern dcp::DecryptedKDM decrypt_kdm_with_helpful_error (dcp::EncryptedKDM kdm);
+extern boost::filesystem::path default_font_file ();
+extern void start_of_thread (std::string name);
+extern std::string error_details(boost::system::error_code ec);
+extern bool contains_assetmap(boost::filesystem::path dir);
+extern std::string word_wrap(std::string input, int columns);
+extern void capture_ffmpeg_logs();
+extern std::string screen_names_to_string(std::vector<std::string> names);
 
 #endif