Reintegrated 2.3 branch into trunk

This commit is contained in:
Birunthan Mohanathas
2012-01-08 17:35:29 +00:00
parent c3335adec5
commit c3ed2e5fa3
87 changed files with 5379 additions and 2732 deletions

View File

@ -110,7 +110,7 @@ void CPlayerSpotify::UpdateData()
if (track != m_Title || artist != m_Artist)
{
m_State = PLAYER_PLAYING;
m_State = STATE_PLAYING;
m_Title = track;
m_Artist = artist;
++m_TrackCount;
@ -125,7 +125,7 @@ void CPlayerSpotify::UpdateData()
}
else if (IsWindow(m_Window))
{
m_State = PLAYER_PAUSED;
m_State = STATE_PAUSED;
}
else
{