X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.h;h=61922325db3ec5070a8e54907fabd2dc984fa308;hb=02b74112721d13a27b0bbaece714d5c8ea743d43;hp=28a6fd6608bb39215da29496a1a198b9c60f655b;hpb=a332bd6be323f03dad5b180fb237afe54f1bf81e;p=dcpomatic.git diff --git a/src/lib/util.h b/src/lib/util.h index 28a6fd660..61922325d 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -18,21 +18,24 @@ */ + /** @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 #include #include #include -#include #include #include #include @@ -42,34 +45,16 @@ #undef check + namespace dcp { class PictureAsset; class SoundAsset; + class SubtitleAsset; } -#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 */ -#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 CLOSED_CAPTION_LINES 3 -/** Maximum line length of closed caption viewers */ -#define CLOSED_CAPTION_LENGTH 30 - extern std::string program_name; extern bool is_batch_converter; -struct AVSubtitle; class AudioBuffers; class TextDecoder; @@ -81,6 +66,7 @@ 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::uintmax_t size); +extern std::string simple_digest (std::vector paths); extern void ensure_ui_thread (); extern std::string audio_channel_name (int); extern std::string short_audio_channel_name (int); @@ -92,52 +78,23 @@ 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 split_get_request (std::string url); -extern std::string video_asset_filename (boost::shared_ptr asset, int reel_index, int reel_count, boost::optional content_summary); -extern std::string audio_asset_filename (boost::shared_ptr asset, int reel_index, int reel_count, boost::optional content_summary); -extern std::string atmos_asset_filename (boost::shared_ptr asset, int reel_index, int reel_count, boost::optional content_summary); -extern float relaxed_string_to_float (std::string); +extern std::string video_asset_filename (std::shared_ptr asset, int reel_index, int reel_count, boost::optional content_summary); +extern std::string audio_asset_filename (std::shared_ptr asset, int reel_index, int reel_count, boost::optional content_summary); +extern std::string subtitle_asset_filename (std::shared_ptr asset, int reel_index, int reel_count, boost::optional content_summary, std::string extension); +extern std::string atmos_asset_filename (std::shared_ptr asset, int reel_index, int reel_count, boost::optional content_summary); extern std::string careful_string_filter (std::string); extern std::pair audio_channel_types (std::list mapped, int channels); -extern boost::shared_ptr remap (boost::shared_ptr 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 std::shared_ptr remap (std::shared_ptr input, int output_channels, AudioMapping map); 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 decoder); -extern bool show_jobs_on_console (bool progress); -extern void copy_in_bits (boost::filesystem::path from, boost::filesystem::path to, boost::function); -extern dcp::Size scale_for_display (dcp::Size s, dcp::Size display_container, dcp::Size film_container); +extern void emit_subtitle_image (dcpomatic::ContentTimePeriod period, dcp::SubtitleImage sub, dcp::Size size, std::shared_ptr decoder); +extern void copy_in_bits (boost::filesystem::path from, boost::filesystem::path to, std::function); +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 (); - -template -std::list -vector_to_list (std::vector v) -{ - std::list l; - BOOST_FOREACH (T& i, v) { - l.push_back (i); - } - return l; -} - -template -std::vector -list_to_vector (std::list v) -{ - std::vector 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); +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); #endif