Put audio language back in the Film.

It feels neat to have audio language in the audio tab, to match
the subtitle language in the subtitle tab.  It also avoids the potential
confusion of there being an audio language setting in the DCP metadata
but no subtitle language setting.  However:

- I am yet to find a need to describe multiple audio languages in the
same DCP (all previous users of Film::audio_languages() were just taking
the first language off the list).

- As Carsten points out it's fiddly to have to set the audio language
for 5 separate-channel WAV files, for example (you wouldn't actually
have had to do this, but it would have felt like you did).

I think subtitle language remains neater where it is (per-content)
as there is this additional subtitle language metadata and it makes
much more sense (and is much more likely) that there are multiple
subtitle languages in a DCP than it does multiple audio languages.

1 files changed, 0 insertions, 9 deletions

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index adb5c9556..67183d0a4 100644
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -31,7 +31,6 @@
 #include "content_part.h"
 #include "audio_stream.h"
 #include "audio_mapping.h"
-#include <dcp/language_tag.h>
 
 
 /** @class AudioContentProperty
@@ -43,7 +42,6 @@ public:
 	static int const STREAMS;
 	static int const GAIN;
 	static int const DELAY;
-	static int const LANGUAGE;
 };
 
 
@@ -65,7 +63,6 @@ public:
 
 	void set_gain (double);
 	void set_delay (int);
-	void set_language (boost::optional<dcp::LanguageTag> langauge);
 
 	double gain () const {
 		boost::mutex::scoped_lock lm (_mutex);
@@ -77,11 +74,6 @@ public:
 		return _delay;
 	}
 
-	boost::optional<dcp::LanguageTag> language () const {
-		boost::mutex::scoped_lock lm (_mutex);
-		return _language;
-	}
-
 	std::string processing_description (std::shared_ptr<const Film> film) const;
 
 	std::vector<AudioStreamPtr> streams () const {
@@ -108,7 +100,6 @@ private:
 	/** Delay to apply to audio (positive moves audio later) in milliseconds */
 	int _delay = 0;
 	std::vector<AudioStreamPtr> _streams;
-	boost::optional<dcp::LanguageTag> _language;
 };
 
 #endif