From b5a3b6f97604040b4b9aa8dcdac52dbe7f870fe1 Mon Sep 17 00:00:00 2001
From: scop <scop>
Date: Sat, 18 Feb 2006 19:04:44 +0000
Subject: Be less noisy about audio mode (non-)changes.

---
 HISTORY         | 1 +
 dxr3device.c    | 3 ---
 dxr3interface.c | 6 ++++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/HISTORY b/HISTORY
index 62ba613..cb509f2 100644
--- a/HISTORY
+++ b/HISTORY
@@ -312,3 +312,4 @@ NOTE: I havent found time to include all of the languages, will be done in pre2
 - clean up leftovers from the image grab code removal in 0.2.5 (Ville Skyttä)
 - add Czech i18n placeholders (Ville Skyttä)
 - adapt to VDR 1.3.42 (Ville Skyttä)
+- be less noisy about audio mode (non-)changes (Ville Skyttä)
diff --git a/dxr3device.c b/dxr3device.c
index 42243ad..6bb906e 100644
--- a/dxr3device.c
+++ b/dxr3device.c
@@ -110,19 +110,16 @@ bool cDxr3Device::SetPlayMode(ePlayMode PlayMode)
     {
 	if (cDxr3ConfigData::Instance().GetAc3OutPut() && m_CalledBySet)
 	{
-	    isyslog("dxr3: Setting AC3 audio mode");
 	    cDxr3Interface::Instance().SetAudioDigitalAC3(); // !!! FIXME
 	}
 	else
 	{
-	    isyslog("dxr3: Setting digital PCM audio mode");
 	    cDxr3Interface::Instance().SetAudioDigitalPCM();
 	    cDxr3ConfigData::Instance().SetAc3OutPut(0);
 	}
     }
     else
     {
-	isyslog("dxr3: Setting analog audio mode");
 	cDxr3Interface::Instance().SetAudioAnalog();
     }
 
diff --git a/dxr3interface.c b/dxr3interface.c
index 59e2fa4..61f5c83 100644
--- a/dxr3interface.c
+++ b/dxr3interface.c
@@ -96,11 +96,12 @@ void cDxr3Interface::SetAudioAnalog()
     {
 	int prevMode = m_audioMode;
 	m_audioMode = ioval = EM8300_AUDIOMODE_ANALOG;
+	isyslog("dxr3: setting analog audio mode");
 	if (ioctl(m_fdControl, EM8300_IOCTL_SET_AUDIOMODE, &ioval) < 0)
 	{
 	    esyslog("dxr3: unable to set analog audio mode: %m");
 	}
-	if (prevMode ==	 EM8300_AUDIOMODE_DIGITALAC3)
+	if (prevMode ==	EM8300_AUDIOMODE_DIGITALAC3)
 	{
 	    ReOpenAudio();
 	}
@@ -120,7 +121,7 @@ void cDxr3Interface::SetAudioDigitalPCM()
     {
 	int prevMode = m_audioMode;
 	m_audioMode = ioval = EM8300_AUDIOMODE_DIGITALPCM;
-
+	isyslog("dxr3: setting digital PCM audio mode");
 	if (ioctl(m_fdControl, EM8300_IOCTL_SET_AUDIOMODE, &ioval) < 0)
 	{
 	    esyslog("dxr3: unable to set digital PCM audio mode: %m");
@@ -146,6 +147,7 @@ void cDxr3Interface::SetAudioDigitalAC3()
 	if (!m_ExternalReleased && m_audioMode != EM8300_AUDIOMODE_DIGITALAC3)
 	{
 	    m_audioMode = ioval = EM8300_AUDIOMODE_DIGITALAC3;
+	    isyslog("dxr3: setting digital AC3 audio mode");
 	    if (ioctl(m_fdControl, EM8300_IOCTL_SET_AUDIOMODE, &ioval) < 0)
 	    {
 		esyslog("dxr3: unable to set AC3 audio mode: %m");
-- 
cgit v1.2.3