X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Futil.h;h=f7b4704ace52caa583c2d09fb85926ba4a050aa7;hp=f9b4d0e0541a250dc7f8afba456e5aa0c022bd22;hb=6ef1fc5f40567650ca9ef2b7644e4fdd97640ae6;hpb=54038beb4437c027e584fc95110f6fd4dbf2207d

diff --git a/src/lib/util.h b/src/lib/util.h
index f9b4d0e05..f7b4704ac 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.
 
@@ -27,10 +27,13 @@
 
 #include "types.h"
 #include "dcpomatic_time.h"
+#include "audio_mapping.h"
 #include <dcp/util.h>
+#include <dcp/subtitle_image.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/date_time/gregorian/gregorian.hpp>
 #include <string>
 #include <map>
 #include <vector>
@@ -42,6 +45,10 @@ namespace dcp {
 	class SoundAsset;
 }
 
+#ifndef M_PI
+#define M_PI (3.14159265358979323846)
+#endif
+
 /** 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 */
@@ -50,12 +57,26 @@ namespace dcp {
 #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 CLOSED_CAPTION_LINES 3
+/** Maximum line length of closed caption viewers */
+#define CLOSED_CAPTION_LENGTH 30
+/* We are mis-using genre here, as only some metadata tags are written/read.
+   I tried the use_metadata_tags option but it didn't seem to make any difference.
+*/
+#define SWAROOP_ID_TAG "genre"
 
 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 ();
@@ -66,6 +87,7 @@ extern void ensure_ui_thread ();
 extern std::string audio_channel_name (int);
 extern std::string short_audio_channel_name (int);
 extern bool valid_image_file (boost::filesystem::path);
+extern bool valid_sound_file (boost::filesystem::path);
 extern bool valid_j2k_file (boost::filesystem::path);
 #ifdef DCPOMATIC_WINDOWS
 extern boost::filesystem::path mo_path ();
@@ -79,6 +101,46 @@ 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 bool string_not_empty (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 boost::shared_ptr<AudioBuffers> remap (boost::shared_ptr<const AudioBuffers> input, int output_channels, AudioMapping map);
+extern Eyes increment_eyes (Eyes e);
+extern void checked_fread (void* ptr, size_t size, FILE* stream, boost::filesystem::path path);
+extern void checked_fwrite (void const * ptr, size_t size, FILE* stream, boost::filesystem::path path);
+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, boost::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, boost::function<void (float)>);
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+extern boost::shared_ptr<dcp::CertificateChain> read_swaroop_chain (boost::filesystem::path path);
+extern void write_swaroop_chain (boost::shared_ptr<const dcp::CertificateChain> chain, boost::filesystem::path output);
+#endif
+extern dcp::Size scale_for_display (dcp::Size s, dcp::Size display_container, dcp::Size film_container);
+
+template <class T>
+std::list<T>
+vector_to_list (std::vector<T> v)
+{
+	std::list<T> l;
+	BOOST_FOREACH (T& 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;
+	BOOST_FOREACH (T& i, v) {
+		l.push_back (i);
+	}
+	return l;
+}
+
+extern double db_to_linear (double db);
+extern double linear_to_db (double linear);
 
 #endif