Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

change background music player from SoundPlayer object to a pointer of SoundPlayer.

This commit is contained in:
natural-law 2010-10-16 08:25:09 +00:00
parent 992ad7e75d
commit 723837d19c
2 changed files with 45 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
CocosDenshion/SimpleAudioEngine/SimpleAudioEngine.cpp
View File

@ -31,12 +31,19 @@ SimpleAudioEngine::SimpleAudioEngine()
, m_pEffects(NULL)
{
m_pEffectPlayers = new PlayerArray();
m_pBackPlayer = new SoundPlayer();
}
SimpleAudioEngine::~SimpleAudioEngine()
{
removeAllEffects();
removeAllEffectPlayers();
if (m_pBackPlayer)
{
delete m_pBackPlayer;
m_pBackPlayer = NULL;
}
}
SimpleAudioEngine* SimpleAudioEngine::getSharedEngine()
@ -54,7 +61,10 @@ void SimpleAudioEngine::playBackgroundMusic(const char* pszFilePath, bool bLoop)
if (FileUtils::isFileExisted(pszFilePath))
{
m_obBackPlayer.PlaySoundFile(pszFilePath, nTimes);
if (m_pBackPlayer)
{
m_pBackPlayer->PlaySoundFile(pszFilePath, nTimes);
}
}
else
{
@ -68,29 +78,44 @@ void SimpleAudioEngine::playBackgroundMusic(const char* pszFilePath, bool bLoop)
const void* pData = s_HSoundRes.LoadConstRawData(iter->second, &nSize);
BREAK_IF(!pData);
m_obBackPlayer.PlaySoundFromMem((unsigned char*)pData, nSize, pszFilePath, nTimes);
if (m_pBackPlayer)
{
m_pBackPlayer->PlaySoundFromMem((unsigned char*)pData, nSize, pszFilePath, nTimes);
}
} while (0);
}
}
void SimpleAudioEngine::stopBackgroundMusic()
{
m_obBackPlayer.Stop();
if (m_pBackPlayer)
{
m_pBackPlayer->Stop();
}
}
void SimpleAudioEngine::pauseBackgroundMusic()
{
m_obBackPlayer.Pause();
if (m_pBackPlayer)
{
m_pBackPlayer->Pause();
}
}
void SimpleAudioEngine::resumeBackgroundMusic()
{
m_obBackPlayer.Resume();
if (m_pBackPlayer)
{
m_pBackPlayer->Resume();
}
}
void SimpleAudioEngine::rewindBackgroundMusic()
{
m_obBackPlayer.Rewind();
if (m_pBackPlayer)
{
m_pBackPlayer->Rewind();
}
}
bool SimpleAudioEngine::willPlayBackgroundMusic()
@ -100,7 +125,14 @@ bool SimpleAudioEngine::willPlayBackgroundMusic()
bool SimpleAudioEngine::isBackgroundMusicPlaying()
{
return m_obBackPlayer.IsPlaying();
bool bRet = false;
if (m_pBackPlayer)
{
bRet = m_pBackPlayer->IsPlaying();
}
return bRet;
}
// properties
@ -111,7 +143,11 @@ int SimpleAudioEngine::GetBackgroundMusicVolume()
void SimpleAudioEngine::SetBackgroundMusicVolume(int volume)
{
m_obBackPlayer.SetVolumeValue(volume);
if (m_pBackPlayer)
{
m_pBackPlayer->SetVolumeValue(volume);
}
m_nBackgroundMusicVolume = volume;
}

2
CocosDenshion/SimpleAudioEngine/SimpleAudioEngine.h
View File

@ -134,7 +134,7 @@ protected:
int m_nEffectsVolume;
bool m_bWillPlayBackgroundMusic;
SoundPlayer m_obBackPlayer;
SoundPlayer* m_pBackPlayer;
PlayerArray* m_pEffectPlayers;
// use hash map to save the effects loaded