bitlair/bitvis
8
0
Fork 0
Code Activity Actions

fixed: volume handling

Browse source
This commit is contained in:
Bob van Loosen 2013-02-21 21:33:23 +01:00
parent ffd257f546
commit 267b0d17bf
2 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/bitvis/bitvis.cpp
View file

@ -401,7 +401,7 @@ void CBitVis::SendData(int64_t time)
nrlines = m_nrlines - m_fontdisplay; nrlines = m_nrlines - m_fontdisplay;
} }
if (isplaying && GetTimeUs() - m_volumetime < 1000000 && m_displayvolume > 0) if (isplaying && GetTimeUs() - m_volumetime < 1000000)
{ {
for (int y = 0; y < nrlines; y++) for (int y = 0; y < nrlines; y++)
{ {

27
src/bitvis/mpdclient.cpp
View file

@ -154,7 +154,7 @@ bool CMpdClient::GetPlayStatus()
data.Clear(); data.Clear();
bool isplaying = false; bool isplaying = false;
bool muted = false; int volume = -1;
while(1) while(1)
{ {
if (m_socket.Read(data) != SUCCESS) if (m_socket.Read(data) != SUCCESS)
@ -184,25 +184,15 @@ bool CMpdClient::GetPlayStatus()
} }
else if (word == "volume:") else if (word == "volume:")
{ {
int volume; int parsevolume;
if (GetWord(tmpline, word) && StrToInt(word, volume)) if (GetWord(tmpline, word) && StrToInt(word, parsevolume))
{ volume = parsevolume;
if (volume == 0)
volume = true;
if (volume != m_volume)
{
CLock lock(m_condition);
m_volume = volume;
m_volumechanged = true;
}
}
} }
} }
if (line == "OK") if (line == "OK")
{ {
if (muted) if (volume == 0)
isplaying = false; isplaying = false;
CLock lock(m_condition); CLock lock(m_condition);
@ -210,6 +200,13 @@ bool CMpdClient::GetPlayStatus()
m_playingchanged = true; m_playingchanged = true;
m_isplaying = isplaying; m_isplaying = isplaying;
if (volume != -1 && m_volume != volume)
{
m_volume = volume;
m_volumechanged = true;
}
return true; return true;
} }
} }