From 94c9084a9a1cff60200c6c3053b9850252d713cb Mon Sep 17 00:00:00 2001
From: delmar <>
Date: Tue, 18 Jan 2022 22:35:38 +0000
Subject: [PATCH] 70_DENON_AVR: added soundformat strings. patch by All-Ex

git-svn-id: https://svn.fhem.de/fhem/trunk@25501 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/CHANGED              |   1 +
 fhem/FHEM/70_DENON_AVR.pm | 210 +++++++++++++++++++++-----------------
 2 files changed, 116 insertions(+), 95 deletions(-)

diff --git a/fhem/CHANGED b/fhem/CHANGED
index 65ed40381..af148e21f 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -1,5 +1,6 @@
 # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
 # Do not insert empty lines here, update check depends on it.
+ - change:  70_DENON_AVR: added soundformat strings. patch by All-Ex
  - change:  50_Signalbot: link improved, reply command added, bugfixes
  - change:  93_DbRep: new design of sqlCmdHistory, minor fixes
  - feature: 14_SD_WS07.pm
diff --git a/fhem/FHEM/70_DENON_AVR.pm b/fhem/FHEM/70_DENON_AVR.pm
index edf836f52..7b7bb5dab 100755
--- a/fhem/FHEM/70_DENON_AVR.pm
+++ b/fhem/FHEM/70_DENON_AVR.pm
@@ -183,7 +183,7 @@ my $DENON_db = {
 		'Neural:X'					=> 'NEURAL:X',
 		'Virtual' 					=> 'VIRTUAL',
 		'Left' 						=> 'LEFT',
-		'Right' 						=> 'RIGHT',
+		'Right' 					=> 'RIGHT',
 		'Quick1' 					=> 'QUICK1',
 		'Quick2' 					=> 'QUICK2',
 		'Quick3' 					=> 'QUICK3',
@@ -482,7 +482,7 @@ my $DENON_db = {
 				'SUP05' => 'resolution5',
 			},
 			'MO2' => {
-				'INT'   => 'interface',
+			'INT'   => 'interface',
 				'SUP00' => 'resolution0',
 				'SUP01' => 'resolution1',
 				'SUP02' => 'resolution2',
@@ -498,9 +498,9 @@ my $DENON_db = {
 					'00' => 'na 00',
 					'01' => 'Analog',
 					'02' => 'PCM',
-					'03' => 'Dolby Audio DD',
-					'04' => 'Dolby TrueHD',
-					'05' => 'Dolby Atmos',
+					'03' => 'Dolby Audio - DD',
+					'04' => 'Dolby Audio - DD+',
+					'05' => 'Dolby Audio - TrueHD',
 					'06' => 'DTS',
 					'07' => 'na 07',
 					'08' => 'DTS-HD Hi Res',
@@ -516,6 +516,16 @@ my $DENON_db = {
 					'18' => 'na 18',
 					'19' => 'na 19',
 					'20' => 'na 20',
+					'21' => 'na 21',
+					'22' => 'na 22',
+					'23' => 'Dolby Atmos - TrueHD',
+					'24' => 'Dolby Atmos - DD+',
+					'25' => 'Dolby Atmos',
+					'26' => 'na 26',
+					'27' => 'na 27',
+					'28' => 'na 28',
+					'29' => 'na 29',
+					'30' => 'na 30',				
 				},
 			},
 		},
@@ -650,123 +660,133 @@ my $DENON_db = {
 		'AURO2DSURR'				=> 'Auro-2D',
 	},
 	'SOUND' => {
-		'STEREO' => 'Stereo',
-		'DIRECT' => 'Direct',
-		'DSD DIRECT' => 'DSD Direct',
-		'PURE DIRECT' => 'Pure Direct',
-		'DSD PURE DIRECT' => 'DSD Pure Direct',
-		'PURE DIRECT EXT' => 'Pure Direct Ext',
-		'MCH STEREO' => 'Multichannel Stereo',
+		'7.1IN' => 'Multi Ch In 7.1',
+		'AAC+DOLBY EX' => 'AAC+Dolby EX',
+		'AAC+DS' => 'AAC+DS',
+		'AAC+NEO:X C' => 'AAC+Neo:X C',
+		'AAC+NEO:X G' => 'AAC+Neo:X G',
+		'AAC+NEO:X M' => 'AAC+Neo:X M',
+		'AAC+PL2X C' => 'AAC+PL2X C',
+		'AAC+PL2X M' => 'AAC+PL2X M',
+		'AAC+PL2Z H' => 'AAC++PL2Z H',
 		'ALL ZONE STEREO' => 'All Zone Stereo',
 		'AUDYSSEY DSX' => 'Audyssey DSX',
-		'PL DSX' => 'PL DSX',
-		'PL2 C DSX' => 'PL2 C DSX',
-		'PL2 M DSX' => 'PL2 M DSX',
-		'PL2 G DSX' => 'PL2 G DSX',
-		'PL2X C DSX' => 'PL2X C DSX',
-		'PL2X M DSX' => 'PL2X M DSX',
-		'PL2X G DSX' => 'PL2X G DSX',
-		'DOLBY AUDIO-DSUR' => 'Dolby_Audio_Surround',
-		'DOLBY PL2 C' => 'Dolby PL2 C',
-		'DOLBY PL2 M' => 'Dolby PL2 M',
-		'DOLBY PL2 G' => 'Dolby PL2 G',
-		'DOLBY PRO LOGIC' => 'Dolby Pro Logic',
-		'DOLBY SURROUND' => 'Dolby Surround',
+		'AURO2DSURR' => 'Auro-2D Surround',
+		'AURO3D' => 'Auro-3D',
+		'DIRECT' => 'Direct',
 		'DOLBY ATMOS' => 'Dolby Atmos',
-		'DOLBY AUDIO-DD' => 'Dolby_Audio_Dolby-Digital',
-		'DOLBY AUDIO-DD+DSUR' => 'Dolby_Audio_Digital-Surround',
-		'DOLBY AUDIO-DD+NEURAL:X' => 'Dolby_Audio_Digital-Neural:X',
-		'DOLBY DIGITAL' => 'Dolby Digital',
-		'DOLBY PL2 C' => 'Dolby PL2 C',
-		'DOLBY PL2 M' => 'Dolby PL2 M',
-		'DOLBY PL2 G' => 'Dolby PL2 G',
-		'DOLBY PL2X C' => 'Dolby PL2X C',
-		'DOLBY PL2X M' => 'Dolby PL2X M',
-		'DOLBY PL2X G' => 'Dolby PL2X G',
-		'DOLBY PL2Z H' => 'Dolby PL2Z H',
+		'DOLBY AUDIO-DD' => 'Dolby Audio - Dolby Digital',
+		'DOLBY AUDIO-DD+ +DSUR' => 'Dolby Audio - Dolby Digital Plus + DSur',
+		'DOLBY AUDIO-DD+ +NERUAL:X' => 'Dolby Audio - Dolby Digital Plus + Neural:X',
+		'DOLBY AUDIO-DD+' => 'Dolby Audio - Dolby Digital Plus',
+		'DOLBY AUDIO-DD+DSUR' => 'Dolby Audio - Dolby Digital + DSur',
+		'DOLBY AUDIO-DD+NEURAL:X' => 'Dolby Audio - Dolby Digital + Neural:X',
+		'DOLBY AUDIO-DSUR' => 'Dolby Audio - Dolby Surround',
+		'DOLBY AUDIO-TRUEHD' => 'Dolby Audio - Dolby TrueHD',
+		'DOLBY AUDIO-TRUEHD+DSUR' => 'Dolby Audio - TrueHD + DSur',
+		'DOLBY AUDIO-TRUEHD+NEURAL:X' => 'Dolby Audio - TrueHD + Neural:X',
 		'DOLBY D EX' => 'Dolby Digital EX',
-		'DOLBY D+PL2X C' => 'Dolby Digital+PL2X C',
-		'DOLBY D+PL2X M' => 'Dolby Digital+PL2X M',
-		'DOLBY D+PL2Z H' => 'Dolby Digital+PL2Z H',
-		'DOLBY D+DS' => 'Dolby Digital+DS',
-		'DOLBY D+NEO:X C' => 'Dolby Digital+Neo:X C',
-		'DOLBY D+NEO:X M' => 'Dolby Digital+Neo:X M',
-		'DOLBY D+NEO:X G' => 'Dolby Digital+Neo:X G',
-		'DOLBY D+' => 'Dolby Digital Plus',
+		'DOLBY D+ +DS' => 'Dolby Digital+ +DS',
 		'DOLBY D+ +EX' => 'Dolby Digital Plus+PL2X C',
+		'DOLBY D+ +NEO:X C' => 'Dolby Digital Plus+Neo:X C',
+		'DOLBY D+ +NEO:X G' => 'Dolby Digital Plus+Neo:X G',
+		'DOLBY D+ +NEO:X M' => 'Dolby Digital Plus+Neo:X M',
 		'DOLBY D+ +PL2X C' => 'Dolby Digital Plus+PL2X C',
 		'DOLBY D+ +PL2X M' => 'Dolby Digital Plus+PL2X M',
 		'DOLBY D+ +PL2Z H' => 'Dolby Digital Plus+PL2Z H',
 		'DOLBY D+ +PLZ H' => 'Dolby Digital Plus+PLZ H',
-		'DOLBY D+ +DS' => 'Dolby Digital+ +DS',
-		'DOLBY D+ +NEO:X C' => 'Dolby Digital Plus+Neo:X C',
-		'DOLBY D+ +NEO:X M' => 'Dolby Digital Plus+Neo:X M',
-		'DOLBY D+ +NEO:X G' => 'Dolby Digital Plus+Neo:X G',
+		'DOLBY D+' => 'Dolby Digital Plus',
+		'DOLBY D+DS' => 'Dolby Digital+DS',
+		'DOLBY D+NEO:X C' => 'Dolby Digital+Neo:X C',
+		'DOLBY D+NEO:X G' => 'Dolby Digital+Neo:X G',
+		'DOLBY D+NEO:X M' => 'Dolby Digital+Neo:X M',
+		'DOLBY D+PL2X C' => 'Dolby Digital+PL2X C',
+		'DOLBY D+PL2X M' => 'Dolby Digital+PL2X M',
+		'DOLBY D+PL2Z H' => 'Dolby Digital+PL2Z H',
+		'DOLBY DIGITAL' => 'Dolby Digital',
 		'DOLBY HD' => 'Dolby HD',
+		'DOLBY HD+DS' => 'Dolby HD+DS',
 		'DOLBY HD+EX' => 'Dolby HD+EX',
+		'DOLBY HD+NEO:X C' => 'Dolby HD+Neo:X C',
+		'DOLBY HD+NEO:X G' => 'Dolby HD+Neo:X G',
+		'DOLBY HD+NEO:X M' => 'Dolby HD+Neo:X M',
 		'DOLBY HD+PL2X C' => 'Dolby HD+PL2X C',
 		'DOLBY HD+PL2X M' => 'Dolby HD+PL2X M',
 		'DOLBY HD+PL2Z H' => 'Dolby HD+PL2Z H',
-		'DOLBY HD+DS' => 'Dolby HD+DS',
-		'DOLBY HD+NEO:X C' => 'Dolby HD+Neo:X C',
-		'DOLBY HD+NEO:X M' => 'Dolby HD+Neo:X M',
-		'DOLBY HD+NEO:X G' => 'Dolby HD+Neo:X G',
-		'DTS SURROUND' => 'DTS Surround',
+		'DOLBY PL2 C' => 'Dolby PL2 C',
+		'DOLBY PL2 C' => 'Dolby PL2 C',
+		'DOLBY PL2 G' => 'Dolby PL2 G',
+		'DOLBY PL2 G' => 'Dolby PL2 G',
+		'DOLBY PL2 M' => 'Dolby PL2 M',
+		'DOLBY PL2 M' => 'Dolby PL2 M',
+		'DOLBY PL2X C' => 'Dolby PL2X C',
+		'DOLBY PL2X G' => 'Dolby PL2X G',
+		'DOLBY PL2X M' => 'Dolby PL2X M',
+		'DOLBY PL2Z H' => 'Dolby PL2Z H',
+		'DOLBY PRO LOGIC' => 'Dolby Pro Logic',
+		'DOLBY SURROUND' => 'Dolby Surround',
+		'DSD DIRECT' => 'DSD Direct',
+		'DSD PURE DIRECT' => 'DSD Pure Direct',
+		'DTS + DSur' => 'DTS+DSUR',
+		'DTS ES 8CH DSCRT' => 'DTS ES 8Ch Dscrt',
+		'DTS ES DSCRT+NEURAL:X' => 'DTS ES Dscrt + Neural:X',		
 		'DTS ES DSCRT6.1' => 'DTS ES Dscrt 6.1',
 		'DTS ES MTRX6.1' => 'DTS ES Mtrx 6.1',
-		'DTS+PL2X C' => 'DTS+PL2X C',
-		'DTS+PL2X M' => 'DTS+PL2X M',
-		'DTS+PL2Z H' => 'DTS+PL2Z H',
-		'DTS+DS' => 'DTS+DS',
-		'DTS96/24' => 'DTS 96/24',
-		'DTS96 ES MTRX' => 'DTS 96 ES MTRX',		
-		'DTS+NEO:6' => 'DTS+Neo:6',		
-		'DTS NEO:6 C' => 'DTS Neo:6 C',
-		'DTS NEO:X C' => 'DTS Neo:X C',
-		'DTS+NEO:X C' => 'DTS+Neo:X C',
-		'DTS NEO:6 M' => 'DTS Neo:6 M',		
-		'DTS NEO:X M' => 'DTS Neo:X M',
-		'DTS+NEO:X M' => 'DTS+Neo:X M',		
-		'DTS+NEO:X G' => 'DTS+Neo:X G',
-		'DTS+NEO:X G' => 'DTS+Neo:X G',		
-		'DTS HD' => 'DTS-HD',
-		'DTS HD TR' => 'DTS-HD TR',
+		'DTS EXPRESS' => 'DTS Express',
 		'DTS HD MSTR' => 'DTS-HD Mstr',
+		'DTS HD TR' => 'DTS-HD TR',
+		'DTS HD' => 'DTS-HD',
+		'DTS HD+DS' => 'DTS-HD+DS',
+		'DTS HD+NEO:6' => 'DTS-HD+Neo:6',
+		'DTS HD+NEO:X C' => 'DTS-HD+Neo:X C',
+		'DTS HD+NEO:X G' => 'DTS-HD+Neo:X G',
+		'DTS HD+NEO:X M' => 'DTS-HD+Neo:X M',
 		'DTS HD+PL2X C' => 'DTS-HD+PL2X C',
 		'DTS HD+PL2X M' => 'DTS-HD+PL2X M',
 		'DTS HD+PL2Z H' => 'DTS-HD+PL2Z H',
-		'DTS HD+NEO:6' => 'DTS-HD+Neo:6',
-		'DTS HD+DS' => 'DTS-HD+DS',
-		'DTS HD+NEO:X C' => 'DTS-HD+Neo:X C',
-		'DTS HD+NEO:X M' => 'DTS-HD+Neo:X M',
-		'DTS HD+NEO:X G' => 'DTS-HD+Neo:X G',
-		'DTS EXPRESS' => 'DTS Express',
-		'DTS ES 8CH DSCRT' => 'DTS ES 8Ch Dscrt',
-		'AURO3D' => 'Auro-3D',
-		'AURO2DSURR' => 'Auro-2D Surround',
-		'MPEG2 AAC' => 'MPEG2 AAC',
-		'AAC+DOLBY EX' => 'AAC+Dolby EX',
-		'AAC+PL2X C' => 'AAC+PL2X C',
-		'AAC+PL2X M' => 'AAC+PL2X M',
-		'AAC+PL2Z H' => 'AAC++PL2Z H',
-		'AAC+DS' => 'AAC+DS',
-		'AAC+NEO:X C' => 'AAC+Neo:X C',
-		'AAC+NEO:X M' => 'AAC+Neo:X M',
-		'AAC+NEO:X G' => 'AAC+Neo:X G',
-		'MULTI CH IN' => 'Multi Ch In',
+		'DTS NEO:6 C' => 'DTS Neo:6 C',
+		'DTS NEO:6 M' => 'DTS Neo:6 M',		
+		'DTS NEO:X C' => 'DTS Neo:X C',
+		'DTS NEO:X M' => 'DTS Neo:X M',
+		'DTS SURROUND' => 'DTS Surround',
+		'DTS+DS' => 'DTS+DS',
+		'DTS+DSUR' => 'DTS + DSur',
+		'DTS+NEO:6' => 'DTS+Neo:6',		
+		'DTS+NEO:X C' => 'DTS+Neo:X C',
+		'DTS+NEO:X G' => 'DTS+Neo:X G',
+		'DTS+NEO:X G' => 'DTS+Neo:X G',		
+		'DTS+NEO:X M' => 'DTS+Neo:X M',		
+		'DTS+NEURAL:X' => 'DTS + Neural:X',
+		'DTS+PL2X C' => 'DTS+PL2X C',
+		'DTS+PL2X M' => 'DTS+PL2X M',
+		'DTS+PL2Z H' => 'DTS+PL2Z H',
+		'DTS96 ES MTRX' => 'DTS 96 ES MTRX',		
+		'DTS96/24' => 'DTS 96/24',
 		'M CH IN+DOLBY EX' => 'Multi Ch In',
+		'M CH IN+DS' => 'Multi Ch In+DS',
+		'M CH IN+NEO:X C' => 'Multi Ch In+Neo:X C',
+		'M CH IN+NEO:X G' => 'Multi Ch In+Neo:X G',
+		'M CH IN+NEO:X M' => 'Multi Ch In+Neo:X M',
 		'M CH IN+PL2X C' => 'Multi Ch In+PL2X C',
 		'M CH IN+PL2X M' => 'Multi Ch In+PL2X M',
 		'M CH IN+PL2Z H' => 'Multi Ch In+PL2Z H',
-		'M CH IN+DS' => 'Multi Ch In+DS',
+		'MCH STEREO' => 'Multichannel Stereo',
+		'MPEG2 AAC' => 'MPEG2 AAC',
 		'MULTI CH IN 7.1' => 'Multi Ch In 7.1',
-		'M CH IN+NEO:X C' => 'Multi Ch In+Neo:X C',
-		'M CH IN+NEO:X M' => 'Multi Ch In+Neo:X M',
-		'M CH IN+NEO:X G' => 'Multi Ch In+Neo:X G',
-		'NEURAL:X'	=> 'Neural:X',
+		'MULTI CH IN' => 'Multi Ch In',
 		'NEO:6 C DSX' => 'Neo:6 C DSX',
 		'NEO:6 M DSX' => 'Neo:6 M DSX',
-		'7.1IN' => 'Multi Ch In 7.1',
+		'NEURAL:X'	=> 'DTS Neural:X',
+		'PL DSX' => 'PL DSX',
+		'PL2 C DSX' => 'PL2 C DSX',
+		'PL2 G DSX' => 'PL2 G DSX',
+		'PL2 M DSX' => 'PL2 M DSX',
+		'PL2X C DSX' => 'PL2X C DSX',
+		'PL2X G DSX' => 'PL2X G DSX',
+		'PL2X M DSX' => 'PL2X M DSX',
+		'PURE DIRECT EXT' => 'Pure Direct Ext',
+		'PURE DIRECT' => 'Pure Direct',
+		'STEREO' => 'Stereo',
 		'VIRTUAL' => 'Virtual',
 	},
 	'TF' => {