浏览代码

Use more lightweight scoped_lock

Ivan Savenko 2 年之前
父节点
当前提交
dfe8ca3d61
共有 1 个文件被更改,包括 4 次插入4 次删除
  1. 4 4
      client/CMusicHandler.cpp

+ 4 - 4
client/CMusicHandler.cpp

@@ -238,7 +238,7 @@ void CSoundHandler::setChannelVolume(int channel, ui32 percent)
 
 
 void CSoundHandler::setCallback(int channel, std::function<void()> function)
 void CSoundHandler::setCallback(int channel, std::function<void()> function)
 {
 {
-	boost::unique_lock lockGuard(mutexCallbacks);
+	boost::mutex::scoped_lock lockGuard(mutexCallbacks);
 
 
 	auto iter = callbacks.find(channel);
 	auto iter = callbacks.find(channel);
 
 
@@ -251,7 +251,7 @@ void CSoundHandler::setCallback(int channel, std::function<void()> function)
 
 
 void CSoundHandler::soundFinishedCallback(int channel)
 void CSoundHandler::soundFinishedCallback(int channel)
 {
 {
-	boost::unique_lock lockGuard(mutexCallbacks);
+	boost::mutex::scoped_lock lockGuard(mutexCallbacks);
 
 
 	if (callbacks.count(channel) == 0)
 	if (callbacks.count(channel) == 0)
 		return;
 		return;
@@ -272,14 +272,14 @@ void CSoundHandler::soundFinishedCallback(int channel)
 
 
 void CSoundHandler::initCallback(int channel)
 void CSoundHandler::initCallback(int channel)
 {
 {
-	boost::unique_lock lockGuard(mutexCallbacks);
+	boost::mutex::scoped_lock lockGuard(mutexCallbacks);
 	assert(callbacks.count(channel) == 0);
 	assert(callbacks.count(channel) == 0);
 	callbacks[channel] = {};
 	callbacks[channel] = {};
 }
 }
 
 
 void CSoundHandler::initCallback(int channel, const std::function<void()> & function)
 void CSoundHandler::initCallback(int channel, const std::function<void()> & function)
 {
 {
-	boost::unique_lock lockGuard(mutexCallbacks);
+	boost::mutex::scoped_lock lockGuard(mutexCallbacks);
 	assert(callbacks.count(channel) == 0);
 	assert(callbacks.count(channel) == 0);
 	callbacks[channel].push_back(function);
 	callbacks[channel].push_back(function);
 }
 }