Moved out AudioManager listener type.

afritz1 · Nov 16, 2024 · d036791 · d036791
1 parent 5024e2f
commit d036791
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 29 deletions.
diff --git a/OpenTESArena/src/Audio/AudioManager.cpp b/OpenTESArena/src/Audio/AudioManager.cpp
@@ -313,19 +313,9 @@ class OpenALStream
 	}
 };
 
-AudioManager::ListenerData::ListenerData(const Double3 &position, const Double3 &direction)
+AudioListenerData::AudioListenerData(const Double3 &position, const Double3 &direction)
 	: position(position), direction(direction) { }
 
-const Double3 &AudioManager::ListenerData::getPosition() const
-{
-	return this->position;
-}
-
-const Double3 &AudioManager::ListenerData::getDirection() const
-{
-	return this->direction;
-}
-
 AudioManager::AudioManager()
 {
 	mMusicVolume = 0.0f;
@@ -821,8 +811,8 @@ void AudioManager::updateSources()
 	}
 }
 
-void AudioManager::updateListener(const ListenerData &listenerData)
+void AudioManager::updateListener(const AudioListenerData &listenerData)
 {
-	this->setListenerPosition(listenerData.getPosition());
-	this->setListenerOrientation(listenerData.getDirection());
+	this->setListenerPosition(listenerData.position);
+	this->setListenerOrientation(listenerData.direction);
 }
diff --git a/OpenTESArena/src/Audio/AudioManager.h b/OpenTESArena/src/Audio/AudioManager.h
@@ -19,22 +19,18 @@ class Options;
 
 struct MusicDefinition;
 
+// Contains data for defining the state of an audio listener.
+struct AudioListenerData
+{
+	Double3 position;
+	Double3 direction;
+
+	AudioListenerData(const Double3 &position, const Double3 &direction);
+};
+
 // Manages what sounds and music are played by OpenAL Soft.
 class AudioManager
 {
-public:
-	// Contains data for defining the state of an audio listener.
-	class ListenerData
-	{
-	private:
-		Double3 position;
-		Double3 direction;
-	public:
-		ListenerData(const Double3 &position, const Double3 &direction);
-
-		const Double3 &getPosition() const;
-		const Double3 &getDirection() const;
-	};
 private:
 	static constexpr ALint UNSUPPORTED_EXTENSION = -1;
 
@@ -139,7 +135,7 @@ class AudioManager
 	void updateSources();
 
 	// Updates the position of the 3D listener.
-	void updateListener(const ListenerData &listenerData);
+	void updateListener(const AudioListenerData &listenerData);
 };
 
 #endif
diff --git a/OpenTESArena/src/Game/Game.cpp b/OpenTESArena/src/Game/Game.cpp
@@ -866,7 +866,7 @@ void Game::loop()
 
 				// Update audio listener orientation.
 				const WorldDouble3 newPlayerWorldPos = VoxelUtils::coordToWorldPoint(newPlayerCoord);
-				const AudioManager::ListenerData listenerData(newPlayerWorldPos, newPlayerDirection);
+				const AudioListenerData listenerData(newPlayerWorldPos, newPlayerDirection);
 				this->audioManager.updateListener(listenerData);
 			}