X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.h;h=142b21e963938c182e030f3f51647d39a2f0e2aa;hb=692f9e2951a8bf600f95bb0b76c18df71c881504;hp=95d272979f603e736d631a6b92d432683edb67dc;hpb=ab778ced048cad27b7c10808acfa93861ea91fce;p=dcpomatic.git

diff --git a/src/lib/util.h b/src/lib/util.h
index 95d272979..142b21e96 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -24,16 +24,9 @@
 #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>
 #include <boost/filesystem.hpp>
@@ -45,11 +38,10 @@ extern "C" {
 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 12
+#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 */
@@ -58,7 +50,6 @@ namespace dcp {
 
 extern std::string program_name;
 
-class Job;
 struct AVSubtitle;
 
 extern std::string seconds_to_hms (int);
@@ -79,27 +70,11 @@ 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);
-
-class FFmpegSubtitlePeriod
-{
-public:
-	FFmpegSubtitlePeriod (ContentTime f)
-		: from (f)
-	{}
-
-	FFmpegSubtitlePeriod (ContentTime f, ContentTime t)
-		: from (f)
-		, to (t)
-	{}
-
-	ContentTime from;
-	boost::optional<ContentTime> to;
-};
-
-extern FFmpegSubtitlePeriod subtitle_period (AVSubtitle const &);
 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);
 extern std::string audio_asset_filename (boost::shared_ptr<dcp::SoundAsset> asset);
+extern float relaxed_string_to_float (std::string);
+extern bool string_not_empty (std::string);
 
 #endif