Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-10-20 06:23:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Use boost::thread instead of std::thread"

Browse Source 
This reverts commit 71b5c5f2e4.
This commit is contained in:
Eduardo Bart
2013-03-05 01:47:23 -03:00
parent 8c016b143a
commit 1dd558d57e
8 changed files with 23 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/framework/sound/soundmanager.cpp
View File

@@ -96,9 +96,9 @@ void SoundManager::poll()
for(auto it = m_streamFiles.begin(); it != m_streamFiles.end();) {
StreamSoundSourcePtr source = it->first;
stdext::future<SoundFilePtr>& future = it->second;
std::future<SoundFilePtr>& future = it->second;
if(stdext::is_ready(future)) {
if(std::is_ready(future)) {
SoundFilePtr sound = future.get();
if(sound)
source->setSoundFile(sound);
@@ -264,7 +264,7 @@ SoundSourcePtr SoundManager::createSoundSource(const std::string& filename)
source = combinedSource;
#else
StreamSoundSourcePtr streamSource(new StreamSoundSource);
m_streamFiles[streamSource] = g_asyncDispatcher.schedule([=]() -> SoundFilePtr {
m_streamFiles[streamSource] = m_loadJobs [=]() -> SoundFilePtr {
try {
return SoundFile::loadSoundFile(filename);
} catch(std::exception& e) {

3
src/framework/sound/soundmanager.h
View File

@@ -25,7 +25,6 @@
#include "declarations.h"
#include "soundchannel.h"
#include <framework/stdext/thread.h>
//@bindsingleton g_sounds
class SoundManager
@@ -58,7 +57,7 @@ private:
ALCdevice *m_device;
ALCcontext *m_context;
std::map<StreamSoundSourcePtr, stdext::future<SoundFilePtr>> m_streamFiles;
std::map<StreamSoundSourcePtr, std::future<SoundFilePtr>> m_streamFiles;
std::unordered_map<std::string, SoundBufferPtr> m_buffers;
std::vector<SoundSourcePtr> m_sources;
stdext::boolean<true> m_audioEnabled;