X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=7494074036c0fb01772d0c25cb4a0749a1b3ed50;hb=001ba1644fc6aa54f91fcaaa62ae7e5de2313bc1;hp=ff7a0fe396f9af9ac7e91d914d692ab870ff8381;hpb=96f7dd41a2c8627bc1ea0d24d84142eb04b4ffef;p=dcpomatic.git

diff --git a/src/lib/config.h b/src/lib/config.h
index ff7a0fe39..749407403 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -29,6 +29,7 @@
 #include "types.h"
 #include "state.h"
 #include "edid.h"
+#include "audio_mapping.h"
 #include <dcp/name_format.h>
 #include <dcp/certificate_chain.h>
 #include <dcp/encrypted_kdm.h>
@@ -83,6 +84,7 @@ public:
 		PLAYER_DEBUG_LOG,
 		HISTORY,
 		SHOW_EXPERIMENTAL_AUDIO_PROCESSORS,
+		AUDIO_MAPPING,
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 		PLAYER_BACKGROUND_IMAGE,
 #endif
@@ -476,9 +478,9 @@ public:
 	}
 
 	enum PlayerMode {
-		PLAYER_MODE_WINDOW,
-		PLAYER_MODE_FULL,
-		PLAYER_MODE_DUAL
+		PLAYER_MODE_WINDOW, ///< one window containing image and controls
+		PLAYER_MODE_FULL,   ///< just the image filling the screen
+		PLAYER_MODE_DUAL    ///< image on one monitor and extended controls on the other
 	};
 
 	PlayerMode player_mode () const {
@@ -522,6 +524,8 @@ public:
 		return _player_kdm_directory;
 	}
 
+	AudioMapping audio_mapping (int output_channels);
+
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 	boost::optional<boost::filesystem::path> player_background_image () const {
 		return _player_background_image;
@@ -1036,6 +1040,9 @@ public:
 		changed ();
 	}
 
+	void set_audio_mapping (AudioMapping m);
+	void set_audio_mapping_to_default ();
+
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 	void set_player_background_image (boost::filesystem::path p) {
 		maybe_set (_player_background_image, p, PLAYER_BACKGROUND_IMAGE);
@@ -1293,6 +1300,7 @@ private:
 	boost::optional<boost::filesystem::path> _player_content_directory;
 	boost::optional<boost::filesystem::path> _player_playlist_directory;
 	boost::optional<boost::filesystem::path> _player_kdm_directory;
+	boost::optional<AudioMapping> _audio_mapping;
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 	boost::optional<boost::filesystem::path> _player_background_image;
 	std::string _kdm_server_url;