mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 23:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

zapit, libcoolstream: determine audio mute status

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@439 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
yjogol
2010-03-01 06:19:09 +00:00
parent a899d6b3c8
commit 23dabb17a2
5 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/libcoolstream/audio_cs.h
View File

@@ -79,6 +79,7 @@ class cAudio
/* volume, min = 0, max = 255 */ /* volume, min = 0, max = 255 */
int setVolume(unsigned int left, unsigned int right); int setVolume(unsigned int left, unsigned int right);
int getVolume(void) { return volume;} int getVolume(void) { return volume;}
bool getMuteStatus(void) { return Muted; }
/* start and stop audio */ /* start and stop audio */
int Start(void); int Start(void);

17
src/zapit/include/zapit/client/msgtypes.h
View File

@@ -123,12 +123,12 @@ class CZapitMessages
CMD_GET_FE_SIGNAL = 71, CMD_GET_FE_SIGNAL = 71,
CMD_SET_AE_IEC_ON = 73, CMD_SET_AE_IEC_ON = 73,
CMD_SET_AE_IEC_OFF = 74, CMD_SET_AE_IEC_OFF = 74,
CMD_GET_AE_IEC_STATE = 75, CMD_GET_AE_IEC_STATE = 75,
CMD_SET_AE_PLAYBACK_SPTS = 76, CMD_SET_AE_PLAYBACK_SPTS = 76,
CMD_SET_AE_PLAYBACK_PES = 77, CMD_SET_AE_PLAYBACK_PES = 77,
CMD_GET_AE_PLAYBACK_STATE = 78, CMD_GET_AE_PLAYBACK_STATE = 78,
CMD_SCANSETTYPE = 79, CMD_SCANSETTYPE = 79,
CMD_RELOAD_CURRENTSERVICES = 80, CMD_RELOAD_CURRENTSERVICES = 80,
@@ -142,8 +142,9 @@ class CZapitMessages
CMD_GETCONFIG = 97, CMD_GETCONFIG = 97,
CMD_SETCONFIG = 98, CMD_SETCONFIG = 98,
CMD_SCANSTOP = 99, CMD_SCANSTOP = 99,
CMD_GET_VOLUME = 104, CMD_GET_VOLUME = 104,
CMD_GET_AUDIO_MODE = 105 CMD_GET_AUDIO_MODE = 105,
CMD_GET_MUTE_STATUS = 106
}; };

3
src/zapit/include/zapit/client/zapitclient.h
View File

@@ -1,5 +1,5 @@
/* /*
Client-Interface f<>r zapit - DBoxII-Project Client-Interface f<>r zapit - DBoxII-Project
License: GPL License: GPL
@@ -353,6 +353,7 @@ class CZapitClient:public CBasicClient
/* mute audio */ /* mute audio */
void muteAudio(const bool mute); void muteAudio(const bool mute);
bool getMuteStatus();
/* set audio volume */ /* set audio volume */
void setVolume(const unsigned int left, const unsigned int right); void setVolume(const unsigned int left, const unsigned int right);

10
src/zapit/lib/zapitclient.cpp
View File

@@ -467,6 +467,16 @@ void CZapitClient::muteAudio(const bool mute)
close_connection(); 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) void CZapitClient::setVolume(const unsigned int left, const unsigned int right)
{ {

8
src/zapit/src/zapit.cpp
View File

@@ -1508,7 +1508,13 @@ DBG("NVOD insert %llx\n", CREATE_CHANNEL_ID_FROM_SERVICE_ORIGINALNETWORK_TRANSPO
CBasicServer::send_data(connfd, &msgVolume, sizeof(msgVolume)); CBasicServer::send_data(connfd, &msgVolume, sizeof(msgVolume));
break; 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: { case CZapitMessages::CMD_SET_STANDBY: {
CZapitMessages::commandBoolean msgBoolean; CZapitMessages::commandBoolean msgBoolean;
CBasicServer::receive_data(connfd, &msgBoolean, sizeof(msgBoolean)); CBasicServer::receive_data(connfd, &msgBoolean, sizeof(msgBoolean));