Include tidying.

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

diff --git a/src/lib/util.h b/src/lib/util.h
index da6f660a7f559ec0f61aa34cde3fb49627e6ed9e..9e811f8ad19f2c823cccbb140885497bfd9cce0d 100644 (file)
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -24,15 +24,11 @@
 #ifndef DCPOMATIC_UTIL_H
 #define DCPOMATIC_UTIL_H
 
-#include "compose.hpp"
 #include "types.h"
-#include "exceptions.h"
 #include "dcpomatic_time.h"
 #include <dcp/util.h>
-#include <dcp/picture_asset_writer.h>
 extern "C" {
 #include <libavcodec/avcodec.h>
-#include <libavfilter/avfilter.h>
 }
 #include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
@@ -51,7 +47,7 @@ namespace dcp {
 /** 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 +61,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 +73,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
@@ -104,4 +99,3 @@ extern std::string video_asset_filename (boost::shared_ptr<dcp::PictureAsset> as
 extern std::string audio_asset_filename (boost::shared_ptr<dcp::SoundAsset> asset);
 
 #endif
-