From e91e63521255df11352e7b83075bb2f0ea3de72e Mon Sep 17 00:00:00 2001
From: ikseong <ikseong@vuplus>
Date: Thu, 1 Jul 2010 15:57:12 +0900
Subject: [PATCH] change from AC3 to Dolby Digital.

On AV setting menu, Infobar, Audio select menu change AC3 to Dolby Digital.
---
 data/setup.xml                                       | 6 +++---
 lib/python/Components/Converter/ServiceInfo.py       | 2 +-
 lib/python/Plugins/SystemPlugins/Videomode/plugin.py | 6 +++---
 lib/python/Screens/AudioSelection.py                 | 2 +-
 lib/service/servicedvb.cpp                           | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/data/setup.xml b/data/setup.xml
index f5dea73..34e41f4 100755
--- a/data/setup.xml
+++ b/data/setup.xml
@@ -12,10 +12,10 @@
 			<item level="0" text="Aspect Ratio">config.av.aspectratio</item>
 			<item level="0" text="TV System">config.av.tvsystem</item>
 			<item level="1" text="WSS on 4:3">config.av.wss</item>
-			<item level="1" text="AC3 default">config.av.defaultac3</item>
-			<item level="1" text="General AC3 delay (ms)">config.av.generalAC3delay</item>
+			<item level="1" text="Dolby Digital default">config.av.defaultac3</item>
+			<item level="1" text="General Dolby Digital delay (ms)">config.av.generalAC3delay</item>
 			<item level="1" text="General PCM delay (ms)">config.av.generalPCMdelay</item>
-			<item level="1" text="AC3 downmix" requires="CanDownmixAC3">config.av.downmix_ac3</item>
+			<item level="1" text="Dolby Digital downmix" requires="CanDownmixAC3">config.av.downmix_ac3</item>
 			<item level="1" text="Auto scart switching" requires="ScartSwitch">config.av.vcrswitch</item>
 		</setup>
 		<setup key="usage" title="Customize">
diff --git a/lib/python/Components/Converter/ServiceInfo.py b/lib/python/Components/Converter/ServiceInfo.py
index fa3518c..e2fa12c 100644
--- a/lib/python/Components/Converter/ServiceInfo.py
+++ b/lib/python/Components/Converter/ServiceInfo.py
@@ -71,7 +71,7 @@ class ServiceInfo(Converter, object):
 				while idx < n:
 					i = audio.getTrackInfo(idx)
 					description = i.getDescription();
-					if "AC3" in description or "DTS" in description:
+					if "AC3" in description or "DTS" in description or "Dolby Digital" in description:
 						return True
 					idx += 1
 			return False
diff --git a/lib/python/Plugins/SystemPlugins/Videomode/plugin.py b/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
index 39c1131..085f2e6 100755
--- a/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
@@ -95,11 +95,11 @@ class VideoSetup(Screen, ConfigListScreen):
 					self.list.append(getConfigListEntry(_("Auto scart switching"), config.av.vcrswitch))
 
 		if level >= 1:
-			self.list.append(getConfigListEntry(_("AC3 default"), config.av.defaultac3))
+			self.list.append(getConfigListEntry(_("Dolby Digital default"), config.av.defaultac3))
 			if SystemInfo["CanDownmixAC3"]:
-				self.list.append(getConfigListEntry(_("AC3 downmix"), config.av.downmix_ac3))
+				self.list.append(getConfigListEntry(_("Dolby Digital downmix"), config.av.downmix_ac3))
 			self.list.extend((
-				getConfigListEntry(_("General AC3 Delay"), config.av.generalAC3delay),
+				getConfigListEntry(_("General Dolby Digital Delay"), config.av.generalAC3delay),
 				getConfigListEntry(_("General PCM Delay"), config.av.generalPCMdelay)
 			))
 
diff --git a/lib/python/Screens/AudioSelection.py b/lib/python/Screens/AudioSelection.py
index a0bfcab..e7adf24 100644
--- a/lib/python/Screens/AudioSelection.py
+++ b/lib/python/Screens/AudioSelection.py
@@ -72,7 +72,7 @@ class AudioSelection(Screen, ConfigListScreen):
 			if SystemInfo["CanDownmixAC3"]:
 				self.settings.downmix = ConfigOnOff(default=config.av.downmix_ac3.value)
 				self.settings.downmix.addNotifier(self.changeAC3Downmix, initial_call = False)
-				conflist.append(getConfigListEntry(_("AC3 downmix"), self.settings.downmix))
+				conflist.append(getConfigListEntry(_("Dolby Digital downmix"), self.settings.downmix))
 				self["key_red"].setBoolean(True)
 
 			if n > 0:
diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index e498dd4..b658981 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -1786,7 +1786,7 @@ RESULT eDVBServicePlay::getTrackInfo(struct iAudioTrackInfo &info, unsigned int
 	if (program.audioStreams[i].type == eDVBServicePMTHandler::audioStream::atMPEG)
 		info.m_description = "MPEG";
 	else if (program.audioStreams[i].type == eDVBServicePMTHandler::audioStream::atAC3)
-		info.m_description = "AC3";
+		info.m_description = "Dolby Digital";
 	else if (program.audioStreams[i].type == eDVBServicePMTHandler::audioStream::atAAC)
 		info.m_description = "AAC";
 	else if (program.audioStreams[i].type == eDVBServicePMTHandler::audioStream::atAACHE)
-- 
2.7.4