From 23dabb17a2a8f4f29175de48251d752a929047d7 Mon Sep 17 00:00:00 2001
From: yjogol <yjogol@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: Mon, 1 Mar 2010 06:19:09 +0000
Subject: [PATCH] zapit, libcoolstream: determine audio mute status

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@439 e54a6e83-5905-42d5-8d5c-058d10e6a962
---
 lib/libcoolstream/audio_cs.h                 |  1 +
 src/zapit/include/zapit/client/msgtypes.h    | 17 +++++++++--------
 src/zapit/include/zapit/client/zapitclient.h |  3 ++-
 src/zapit/lib/zapitclient.cpp                | 10 ++++++++++
 src/zapit/src/zapit.cpp                      |  8 +++++++-
 5 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/lib/libcoolstream/audio_cs.h b/lib/libcoolstream/audio_cs.h
index 0ac17e4a3..a961991b6 100644
--- a/lib/libcoolstream/audio_cs.h
+++ b/lib/libcoolstream/audio_cs.h
@@ -79,6 +79,7 @@ class cAudio
 		/* volume, min = 0, max = 255 */
 		int setVolume(unsigned int left, unsigned int right);
 		int getVolume(void) { return volume;}
+		bool getMuteStatus(void) { return Muted; }
 
 		/* start and stop audio */
 		int Start(void);
diff --git a/src/zapit/include/zapit/client/msgtypes.h b/src/zapit/include/zapit/client/msgtypes.h
index e5e1f6522..64dc14371 100644
--- a/src/zapit/include/zapit/client/msgtypes.h
+++ b/src/zapit/include/zapit/client/msgtypes.h
@@ -123,12 +123,12 @@ class CZapitMessages
 
 			CMD_GET_FE_SIGNAL                  = 71,
 
-                        CMD_SET_AE_IEC_ON                  = 73,
-                        CMD_SET_AE_IEC_OFF                 = 74,
-                        CMD_GET_AE_IEC_STATE               = 75,
-                        CMD_SET_AE_PLAYBACK_SPTS           = 76,
-                        CMD_SET_AE_PLAYBACK_PES            = 77,
-                        CMD_GET_AE_PLAYBACK_STATE          = 78,
+			CMD_SET_AE_IEC_ON                  = 73,
+			CMD_SET_AE_IEC_OFF                 = 74,
+			CMD_GET_AE_IEC_STATE               = 75,
+			CMD_SET_AE_PLAYBACK_SPTS           = 76,
+			CMD_SET_AE_PLAYBACK_PES            = 77,
+			CMD_GET_AE_PLAYBACK_STATE          = 78,
 
 			CMD_SCANSETTYPE                    = 79,
 			CMD_RELOAD_CURRENTSERVICES	   = 80,
@@ -142,8 +142,9 @@ class CZapitMessages
 			CMD_GETCONFIG		  = 97,
 			CMD_SETCONFIG		  = 98,
 			CMD_SCANSTOP                      = 99,
-                        CMD_GET_VOLUME          = 104,
-                        CMD_GET_AUDIO_MODE      = 105
+			CMD_GET_VOLUME          = 104,
+			CMD_GET_AUDIO_MODE      = 105,
+			CMD_GET_MUTE_STATUS				= 106
 
 		};
 
diff --git a/src/zapit/include/zapit/client/zapitclient.h b/src/zapit/include/zapit/client/zapitclient.h
index b6a8d5bda..93d4adce7 100644
--- a/src/zapit/include/zapit/client/zapitclient.h
+++ b/src/zapit/include/zapit/client/zapitclient.h
@@ -1,5 +1,5 @@
 /*
-  Client-Interface für zapit  -   DBoxII-Project
+  Client-Interface f�r zapit  -   DBoxII-Project
 
   License: GPL
 
@@ -353,6 +353,7 @@ class CZapitClient:public CBasicClient
 
 	/* mute audio */
 	void muteAudio(const bool mute);
+	bool getMuteStatus();
 
 	/* set audio volume */
 	void setVolume(const unsigned int left, const unsigned int right);
diff --git a/src/zapit/lib/zapitclient.cpp b/src/zapit/lib/zapitclient.cpp
index 31c2ee752..ad470c84f 100644
--- a/src/zapit/lib/zapitclient.cpp
+++ b/src/zapit/lib/zapitclient.cpp
@@ -467,6 +467,16 @@ void CZapitClient::muteAudio(const bool mute)
 
 	close_connection();
 }
+// Get mute status
+bool CZapitClient::getMuteStatus()
+{
+	CZapitMessages::commandBoolean msg;
+
+	send(CZapitMessages::CMD_GET_MUTE_STATUS, (char*)&msg, sizeof(msg));
+	CBasicClient::receive_data((char*)&msg, sizeof(msg));
+	close_connection();
+	return msg.truefalse;
+}
 
 void CZapitClient::setVolume(const unsigned int left, const unsigned int right)
 {
diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index 5b2ffdc0d..a14724322 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -1508,7 +1508,13 @@ DBG("NVOD insert %llx\n", CREATE_CHANNEL_ID_FROM_SERVICE_ORIGINALNETWORK_TRANSPO
                 CBasicServer::send_data(connfd, &msgVolume, sizeof(msgVolume));
                 break;
         }
-
+	case CZapitMessages::CMD_GET_MUTE_STATUS: {
+		CZapitMessages::commandBoolean msgBoolean;
+		if(audioDecoder)
+			msgBoolean.truefalse = audioDecoder->getMuteStatus();
+		CBasicServer::send_data(connfd, &msgBoolean, sizeof(msgBoolean));
+		break;
+	}
 	case CZapitMessages::CMD_SET_STANDBY: {
 		CZapitMessages::commandBoolean msgBoolean;
 		CBasicServer::receive_data(connfd, &msgBoolean, sizeof(msgBoolean));