Traktor: Removed lock from BankBuffer.

apistol78 · Apr 29, 2024 · 775f841 · 775f841
1 parent 4c76c33
commit 775f841
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 27 deletions.
diff --git a/code/Sound/Resound/BankBuffer.cpp b/code/Sound/Resound/BankBuffer.cpp
@@ -1,22 +1,19 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
-#include "Core/Thread/Acquire.h"
 #include "Sound/Sound.h"
 #include "Sound/Resound/BankBuffer.h"
 #include "Sound/Resound/IGrain.h"
 
-namespace traktor
+namespace traktor::sound
 {
-	namespace sound
+	namespace
 	{
-		namespace
-		{
 
 struct BankBufferCursor : public RefCountImpl< IAudioBufferCursor >
 {
@@ -43,7 +40,7 @@ struct BankBufferCursor : public RefCountImpl< IAudioBufferCursor >
 	}
 };
 
-		}
+	}
 
 T_IMPLEMENT_RTTI_CLASS(L"traktor.sound.BankBuffer", BankBuffer, IAudioBuffer)
 
@@ -54,23 +51,20 @@ BankBuffer::BankBuffer(const RefArray< IGrain >& grains)
 
 void BankBuffer::updateCursor(IAudioBufferCursor* cursor) const
 {
-	T_ANONYMOUS_VAR(Acquire< Semaphore >)(m_lock);
 	BankBufferCursor* bankCursor = static_cast< BankBufferCursor* >(cursor);
 	const IGrain* currentGrain = m_grains[bankCursor->m_grainIndex];
 	currentGrain->updateCursor(bankCursor->m_grainCursor);
 }
 
 const IGrain* BankBuffer::getCurrentGrain(const IAudioBufferCursor* cursor) const
 {
-	T_ANONYMOUS_VAR(Acquire< Semaphore >)(m_lock);
 	const BankBufferCursor* bankCursor = static_cast< const BankBufferCursor* >(cursor);
 	const IGrain* currentGrain = m_grains[bankCursor->m_grainIndex];
 	return currentGrain->getCurrentGrain(bankCursor->m_grainCursor);
 }
 
 void BankBuffer::getActiveGrains(const IAudioBufferCursor* cursor, RefArray< const IGrain >& outActiveGrains) const
 {
-	T_ANONYMOUS_VAR(Acquire< Semaphore >)(m_lock);
 	const BankBufferCursor* bankCursor = static_cast< const BankBufferCursor* >(cursor);
 	if (bankCursor && bankCursor->m_grainCursor)
 	{
@@ -82,28 +76,25 @@ void BankBuffer::getActiveGrains(const IAudioBufferCursor* cursor, RefArray< con
 Ref< IAudioBufferCursor > BankBuffer::createCursor() const
 {
 	if (m_grains.empty())
-		return 0;
+		return nullptr;
 
 	Ref< BankBufferCursor > bankCursor = new BankBufferCursor();
 
 	bankCursor->m_grainIndex = 0;
 	bankCursor->m_grainCursor = m_grains[0]->createCursor();
 
-	return bankCursor->m_grainCursor ? bankCursor : 0;
+	return bankCursor->m_grainCursor ? bankCursor : nullptr;
 }
 
 bool BankBuffer::getBlock(IAudioBufferCursor* cursor, const IAudioMixer* mixer, AudioBlock& outBlock) const
 {
-	T_ANONYMOUS_VAR(Acquire< Semaphore >)(m_lock);
-
 	BankBufferCursor* bankCursor = static_cast< BankBufferCursor* >(cursor);
 
-	int32_t ngrains = int32_t(m_grains.size());
+	const int32_t ngrains = int32_t(m_grains.size());
 	if (bankCursor->m_grainIndex >= ngrains)
 		return false;
 
 	Ref< IGrain > grain = m_grains[bankCursor->m_grainIndex];
-
 	for (;;)
 	{
 		if (grain->getBlock(
@@ -117,12 +108,10 @@ bool BankBuffer::getBlock(IAudioBufferCursor* cursor, const IAudioMixer* mixer,
 			return false;
 
 		grain = m_grains[bankCursor->m_grainIndex];
-
 		bankCursor->m_grainCursor = grain->createCursor();
 	}
 
 	return true;
 }
 
-	}
 }
diff --git a/code/Sound/Resound/BankBuffer.h b/code/Sound/Resound/BankBuffer.h
@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2024 Anders Pistol.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -9,7 +9,6 @@
 #pragma once
 
 #include "Core/RefArray.h"
-#include "Core/Thread/Semaphore.h"
 #include "Sound/IAudioBuffer.h"
 
 // import/export mechanism.
@@ -20,10 +19,8 @@
 #	define T_DLLCLASS T_DLLIMPORT
 #endif
 
-namespace traktor
+namespace traktor::sound
 {
-	namespace sound
-	{
 
 class IGrain;
 
@@ -32,7 +29,7 @@ class T_DLLCLASS BankBuffer : public IAudioBuffer
 	T_RTTI_CLASS;
 
 public:
-	BankBuffer(const RefArray< IGrain >& grains);
+	explicit BankBuffer(const RefArray< IGrain >& grains);
 
 	void updateCursor(IAudioBufferCursor* cursor) const;
 
@@ -46,9 +43,6 @@ class T_DLLCLASS BankBuffer : public IAudioBuffer
 
 private:
 	RefArray< IGrain > m_grains;
-	mutable Semaphore m_lock;
 };
 
-	}
 }
-