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

@ -162,7 +162,7 @@ void CPlayer::FindLyrics()
}
else
{
LSLog(LOG_DEBUG, NULL, L"NowPlaying.dll: Failed to start lyrics thread");
RmLog(LOG_DEBUG, L"NowPlaying.dll: Failed to start lyrics thread");
}
}
}
@ -214,7 +214,7 @@ unsigned __stdcall CPlayer::LyricsThreadProc(void* pParam)
*/
void CPlayer::ClearData()
{
m_State = PLAYER_STOPPED;
m_State = STATE_STOPPED;
m_Artist.clear();
m_Album.clear();
m_Title.clear();