X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fexport_format_specification.h;h=d473d202346b90c216c12b66f53d8b3862097f80;hb=6b5be3d89257fb91a1c8c1b2d166106deb5a6874;hp=dfc846f16a75b46d9686fc83fddcaf76e4e7b495;hpb=f837b66c2026bba2a1815aa1a87c78aa9f751d79;p=ardour.git

diff --git a/libs/ardour/ardour/export_format_specification.h b/libs/ardour/ardour/export_format_specification.h
index dfc846f16a..d473d20234 100644
--- a/libs/ardour/ardour/export_format_specification.h
+++ b/libs/ardour/ardour/export_format_specification.h
@@ -91,7 +91,10 @@ class LIBARDOUR_API ExportFormatSpecification : public ExportFormatBase {
 	void set_trim_beginning (bool value) { _trim_beginning = value; }
 	void set_trim_end (bool value) { _trim_end = value; }
 	void set_normalize (bool value) { _normalize = value; }
-	void set_normalize_target (float value) { _normalize_target = value; }
+	void set_normalize_loudness (bool value) { _normalize_loudness = value; }
+	void set_normalize_dbfs (float value) { _normalize_dbfs = value; }
+	void set_normalize_lufs (float value) { _normalize_lufs = value; }
+	void set_normalize_dbtp (float value) { _normalize_dbtp = value; }
 
 	void set_tag (bool tag_it) { _tag = tag_it; }
 	void set_with_cue (bool yn) { _with_cue = yn; }
@@ -99,6 +102,7 @@ class LIBARDOUR_API ExportFormatSpecification : public ExportFormatBase {
 	void set_with_mp4chaps (bool yn) { _with_mp4chaps = yn; }
 	void set_soundcloud_upload (bool yn) { _soundcloud_upload = yn; }
 	void set_command (std::string command) { _command = command; }
+	void set_analyse (bool yn) { _analyse = yn; }
 
 	void set_silence_beginning (AnyTime const & value) { _silence_beginning = value; }
 	void set_silence_end (AnyTime const & value) { _silence_end = value; }
@@ -114,60 +118,59 @@ class LIBARDOUR_API ExportFormatSpecification : public ExportFormatBase {
 	std::string format_name () const { return _format_name; }
 
 	Type type () const { return _type; }
-	
-    FormatId format_id () const
-    {
-        if (!format_ids.empty() )
-            return *format_ids.begin();
-        else
-            return FormatId(0);
-    }
-    
-	Endianness endianness () const
-    {
-        if (!endiannesses.empty() )
-            return *endiannesses.begin();
-        else
-            return Endianness(0);
-    }
-    
-	SampleFormat sample_format () const
-    {
-        if (!sample_formats.empty() )
-            return *sample_formats.begin();
-        else
-            return SampleFormat(0);
-    }
-    
-	SampleRate sample_rate () const
-    {
-        if (!sample_rates.empty() )
-            return *sample_rates.begin();
-        else
-            return SampleRate(0);
-        
-    }
-    
-	Quality quality () const
-    {
-        if (!qualities.empty() )
-            return *qualities.begin();
-        else
-            return Quality(0);
-    }
+
+	FormatId format_id () const {
+		if (!format_ids.empty() )
+			return *format_ids.begin();
+		else
+			return FormatId(0);
+	}
+
+	Endianness endianness () const {
+		if (!endiannesses.empty() )
+			return *endiannesses.begin();
+		else
+			return Endianness(0);
+	}
+
+	SampleFormat sample_format () const {
+		if (!sample_formats.empty() )
+			return *sample_formats.begin();
+		else
+			return SampleFormat(0);
+	}
+
+	SampleRate sample_rate () const {
+		if (!sample_rates.empty() )
+			return *sample_rates.begin();
+		else
+			return SampleRate(0);
+
+	}
+
+	Quality quality () const {
+		if (!qualities.empty() )
+			return *qualities.begin();
+		else
+			return Quality(0);
+	}
 
 	DitherType dither_type () const { return _dither_type; }
 	SRCQuality src_quality () const { return _src_quality; }
 	bool trim_beginning () const { return _trim_beginning; }
 	bool trim_end () const { return _trim_end; }
 	bool normalize () const { return _normalize; }
-	float normalize_target () const { return _normalize_target; }
+	bool normalize_loudness () const { return _normalize_loudness; }
+	float normalize_dbfs () const { return _normalize_dbfs; }
+	float normalize_lufs () const { return _normalize_lufs; }
+	float normalize_dbtp () const { return _normalize_dbtp; }
 	bool with_toc() const { return _with_toc; }
 	bool with_cue() const { return _with_cue; }
 	bool with_mp4chaps() const { return _with_mp4chaps; }
 
 	bool soundcloud_upload() const { return _soundcloud_upload; }
 	std::string command() const { return _command; }
+	bool analyse() const { return _analyse; }
 
 	bool tag () const { return _tag && supports_tagging; }
 
@@ -214,12 +217,17 @@ class LIBARDOUR_API ExportFormatSpecification : public ExportFormatBase {
 	Time            _silence_end;
 
 	bool            _normalize;
-	float           _normalize_target;
+	bool            _normalize_loudness;
+	float           _normalize_dbfs;
+	float           _normalize_lufs;
+	float           _normalize_dbtp;
 	bool            _with_toc;
 	bool            _with_cue;
 	bool            _with_mp4chaps;
 	bool            _soundcloud_upload;
-	std::string	_command;
+
+	std::string     _command;
+	bool            _analyse;
 
 	/* serialization helpers */