X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_content.h;h=3753740a2728af929ff17572ffa5c4b2930ce3f7;hb=4401895dfbb25834d4385621824e72ae19c8962c;hp=1b73e8fc71740c698aac7374b6f264388801636f;hpb=8b9888ed8247109dc3c09492302e865fa4731460;p=dcpomatic.git

diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index 1b73e8fc7..3753740a2 100644
--- a/src/lib/dcp_content.h
+++ b/src/lib/dcp_content.h
@@ -29,8 +29,11 @@
 
 
 #include "content.h"
+#include "enum_indexed_vector.h"
 #include "font.h"
+#include "resolution.h"
 #include <libcxml/cxml.h>
+#include <dcp/content_kind.h>
 #include <dcp/encrypted_kdm.h>
 #include <dcp/rating.h>
 
@@ -122,7 +125,7 @@ public:
 	 */
 	bool reference_text (TextType type) const {
 		boost::mutex::scoped_lock lm (_mutex);
-		return _reference_text[static_cast<int>(type)];
+		return _reference_text[type];
 	}
 
 	bool can_reference_text (std::shared_ptr<const Film> film, TextType type, std::string &) const;
@@ -171,6 +174,8 @@ public:
 		return _content_versions;
 	}
 
+	int active_audio_channels() const;
+
 	void check_font_ids();
 
 private:
@@ -208,7 +213,7 @@ private:
 	 *  rather than by rewrapping.  The types here are the original text types,
 	 *  not what they are being used for.
 	 */
-	bool _reference_text[static_cast<int>(TextType::COUNT)];
+	EnumIndexedVector<bool, TextType> _reference_text;
 
 	boost::optional<dcp::Standard> _standard;
 	boost::optional<dcp::ContentKind> _content_kind;
@@ -222,12 +227,9 @@ private:
 	std::map<dcp::Marker, dcpomatic::ContentTime> _markers;
 	std::vector<dcp::Rating> _ratings;
 	std::vector<std::string> _content_versions;
-};
-
-
-extern std::string id_for_font_in_reel(std::string id, int reel);
-extern void add_fonts_from_examiner(std::shared_ptr<TextContent> text, std::vector<std::vector<std::shared_ptr<dcpomatic::Font>>> const& fonts);
 
+	boost::optional<int> _active_audio_channels;
+};
 
 
 #endif