Work around deadlock when destroying J2KEncoder with a full writer queue (#2784).

[dcpomatic.git] / src / lib / util.h

diff --git a/src/lib/util.h b/src/lib/util.h
index acdc861ae1cc0cd125c1fecf2236f2a2202986be..fd6fd61649ac4a896f9f04d40571e3686d429913 100644 (file)
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -52,35 +52,9 @@ namespace dcp {
        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)
-/** Number of lines that closed caption viewers will display */
-#define MAX_CLOSED_CAPTION_LINES 3
-/** Maximum line length of closed caption viewers, according to SMPTE Bv2.1 */
-#define MAX_CLOSED_CAPTION_LENGTH 32
-/** Maximum size of a subtitle / closed caption MXF in bytes, according to SMPTE Bv2.1 */
-#define MAX_TEXT_MXF_SIZE (115 * 1024 * 1024)
-#define MAX_TEXT_MXF_SIZE_TEXT "115MB"
-/** Maximum size of a font file, in bytes */
-#define MAX_FONT_FILE_SIZE (640 * 1024)
-#define MAX_FONT_FILE_SIZE_TEXT "640KB"
-/** Maximum size of the XML part of a closed caption file, according to SMPTE Bv2.1 */
-#define MAX_CLOSED_CAPTION_XML_SIZE (256 * 1024)
-#define MAX_CLOSED_CAPTION_XML_SIZE_TEXT "256KB"
-#define CERTIFICATE_VALIDITY_PERIOD (10 * 365)
-
 extern std::string program_name;
 extern bool is_batch_converter;
 
-struct AVSubtitle;
 class AudioBuffers;
 class TextDecoder;
 
@@ -105,50 +79,24 @@ extern boost::filesystem::path mo_path ();
 extern std::string tidy_for_filename (std::string);
 extern dcp::Size fit_ratio_within (float ratio, dcp::Size);
 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 (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 float relaxed_string_to_float (std::string);
 extern std::string careful_string_filter (std::string);
 extern std::pair<int, int> audio_channel_types (std::list<int> mapped, int channels);
 extern std::shared_ptr<AudioBuffers> remap (std::shared_ptr<const AudioBuffers> input, int output_channels, AudioMapping map);
-extern Eyes increment_eyes (Eyes e);
 extern size_t utf8_strlen (std::string s);
-extern std::string day_of_week_to_string (boost::gregorian::greg_weekday d);
 extern void emit_subtitle_image (dcpomatic::ContentTimePeriod period, dcp::SubtitleImage sub, dcp::Size size, std::shared_ptr<TextDecoder> decoder);
-extern bool show_jobs_on_console (bool progress);
 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 std::string to_upper (std::string s);
 extern void start_of_thread (std::string name);
-extern void capture_asdcp_logs ();
 extern std::string error_details(boost::system::error_code ec);
 extern bool contains_assetmap(boost::filesystem::path dir);
-
-template <class T>
-std::list<T>
-vector_to_list (std::vector<T> v)
-{
-       std::list<T> l;
-       for (auto& i: v) {
-               l.push_back (i);
-       }
-       return l;
-}
-
-template <class T>
-std::vector<T>
-list_to_vector (std::list<T> v)
-{
-       std::vector<T> l;
-       for (auto& i: v) {
-               l.push_back (i);
-       }
-       return l;
-}
+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