salmon-engine-core/engine
6
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ios stuff

Browse Source
This commit is contained in:
Vladislav Khorev 2013-01-31 20:00:38 +00:00
parent 6a1b50a29f
commit a8e01ed69d
3 changed files with 55 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
iOS/Salmon Engine/Salmon Engine.xcodeproj/project.pbxproj
View File

@ -306,6 +306,7 @@
4C8CE91215B0A0FB00078175 /* src */ = { 4C8CE91215B0A0FB00078175 /* src */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
4C8CE94015B0A57F00078175 /* Console */,
4CF8747416B65183009B1214 /* GUIManager */, 4CF8747416B65183009B1214 /* GUIManager */,
4CF8747316B65173009B1214 /* HalibutAnimation */, 4CF8747316B65173009B1214 /* HalibutAnimation */,
4CF8747116B6514F009B1214 /* PhysicsManager */, 4CF8747116B6514F009B1214 /* PhysicsManager */,
@ -387,7 +388,6 @@
4C8CE96B15B0B31F00078175 /* PngHelper.h */, 4C8CE96B15B0B31F00078175 /* PngHelper.h */,
4C8CE94B15B0AA8000078175 /* Utils.h */, 4C8CE94B15B0AA8000078175 /* Utils.h */,
4C8CE94D15B0AA9600078175 /* SerializeInterface */, 4C8CE94D15B0AA9600078175 /* SerializeInterface */,
4C8CE94015B0A57F00078175 /* Console */,
4C8CE94215B0A57F00078175 /* ErrorTypes */, 4C8CE94215B0A57F00078175 /* ErrorTypes */,
4C8CE94415B0A57F00078175 /* FileUtils */, 4C8CE94415B0A57F00078175 /* FileUtils */,
4C8CE91415B0A11A00078175 /* DataTypes */, 4C8CE91415B0A11A00078175 /* DataTypes */,

5
include/SoundManager/SoundManagerIos.h
View File

@ -30,6 +30,11 @@ public:
virtual void PlayMusicLooped(const std::string& musicName); virtual void PlayMusicLooped(const std::string& musicName);
virtual void StopMusic(const std::string& musicName); virtual void StopMusic(const std::string& musicName);
virtual void StopAllMusic();
virtual void TryStopAndPlayMusicLooped(const std::string& musicName);
}; };

49
src/SoundManager/SoundManagerIos.mm
View File

@ -104,6 +104,8 @@ void TSoundManagerIos::PlayMusic(const std::string& musicName)
AudioSourceMap[musicName].looped = false; AudioSourceMap[musicName].looped = false;
[AudioSourceMap[musicName] playAtListenerPosition]; [AudioSourceMap[musicName] playAtListenerPosition];
//AudioSourceMap[musicName].isPlaying = true;
} }
void TSoundManagerIos::PlayMusicLooped(const std::string& musicName) void TSoundManagerIos::PlayMusicLooped(const std::string& musicName)
@ -116,6 +118,8 @@ void TSoundManagerIos::PlayMusicLooped(const std::string& musicName)
AudioSourceMap[musicName].looped = true; AudioSourceMap[musicName].looped = true;
[AudioSourceMap[musicName] playAtListenerPosition]; [AudioSourceMap[musicName] playAtListenerPosition];
//AudioSourceMap[musicName].isPlaying = true;
} }
void TSoundManagerIos::StopMusic(const std::string& musicName) void TSoundManagerIos::StopMusic(const std::string& musicName)
@ -126,7 +130,52 @@ void TSoundManagerIos::StopMusic(const std::string& musicName)
} }
[AudioSourceMap[musicName] stop]; [AudioSourceMap[musicName] stop];
//AudioSourceMap[musicName].isPlaying = false;
} }
void TSoundManagerIos::StopAllMusic()
{
for (auto i = AudioSourceMap.begin(); i != AudioSourceMap.end(); ++i)
{
PASoundSource* s = i->second;
if (s.isPlaying)
{
[s stop];
//s.isPlaying = false;
}
}
}
void TSoundManagerIos::TryStopAndPlayMusicLooped(const std::string& musicName)
{
if (AudioSourceMap.count(musicName) == 0)
{
throw ErrorToLog("Sound or music not exists: "+musicName);
}
for (auto i = AudioSourceMap.begin(); i != AudioSourceMap.end(); ++i)
{
if (i->first != musicName)
{
PASoundSource* s = i->second;
if (s.isPlaying)
{
[s stop];
//s.isPlaying = false;
}
}
}
PASoundSource* s = AudioSourceMap[musicName];
if (!s.isPlaying)
{
AudioSourceMap[musicName].looped = true;
//AudioSourceMap[musicName].isPlaying = true;
[AudioSourceMap[musicName] playAtListenerPosition];
}
}
} //namespace SE } //namespace SE