Extend maximum DCP audio channels to 16.

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

diff --git a/src/lib/util.h b/src/lib/util.h
index 9e811f8ad19f2c823cccbb140885497bfd9cce0d..5cfdae5f9b0b2b7fb09046cf79c029f2d6dd05ba 100644 (file)
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -27,9 +27,6 @@
 #include "types.h"
 #include "dcpomatic_time.h"
 #include <dcp/util.h>
-extern "C" {
-#include <libavcodec/avcodec.h>
-}
 #include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
 #include <boost/filesystem.hpp>
@@ -41,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 */
@@ -54,7 +50,6 @@ namespace dcp {
 
 extern std::string program_name;
 
-class Job;
 struct AVSubtitle;
 
 extern std::string seconds_to_hms (int);
@@ -75,24 +70,6 @@ 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);