#5977: Fix ISoundShader implementation, remove redundant class members

codereader · Jul 7, 2022 · d90cd7b · d90cd7b
1 parent c4f19c8
commit d90cd7b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 15 deletions.
diff --git a/plugins/sound/SoundShader.cpp b/plugins/sound/SoundShader.cpp
@@ -34,7 +34,7 @@ void SoundShader::parseDefinition() const
 	_contents = std::make_unique<ParsedContents>();
 
 	// Get a new tokeniser and parse the block
-	parser::BasicDefTokeniser<std::string> tok(_declBlock.contents);
+	parser::BasicDefTokeniser<std::string> tok(getBlockSyntax().contents);
 
 	while (tok.hasMoreTokens())
     {
@@ -89,19 +89,16 @@ const std::string& SoundShader::getDisplayFolder() const
 
 std::string SoundShader::getShaderFilePath() const
 {
-	return _fileInfo.fullPath();
+	return getBlockSyntax().fileInfo.fullPath();
 }
 
 std::string SoundShader::getDefinition() const
 {
-	return _declBlock.contents;
+	return getBlockSyntax().contents;
 }
 
 void SoundShader::onSyntaxBlockAssigned(const decl::DeclarationBlockSyntax& block)
 {
-    _fileInfo = block.fileInfo;
-    _modName = block.getModName();
-
     // Reset any contents, we reparse as soon as any property is accessed
     _contents.reset();
 }

diff --git a/plugins/sound/SoundShader.h b/plugins/sound/SoundShader.h
@@ -16,18 +16,10 @@ class SoundShader final :
 	// Name of the shader
 	std::string _name;
 
-	// The raw unparsed definition block
-    decl::DeclarationBlockSyntax _declBlock;
-
     // Information we have parsed on demand
     struct ParsedContents;
     mutable std::unique_ptr<ParsedContents> _contents;
 
-	vfs::FileInfo _fileInfo;
-
-	// The modname (ModResource implementation)
-	std::string _modName;
-
 private:
 	// Parses the definition block
 	void parseDefinition() const;
@@ -44,7 +36,7 @@ class SoundShader final :
 	const std::string& getDeclName() const override { return _name; }
 	decl::Type getDeclType() const override { return decl::Type::SoundShader; }
 	SoundFileList getSoundFileList() const override;
-	std::string getModName() const override { return _modName; }
+	std::string getModName() const override { return getBlockSyntax().getModName(); }
 	const std::string& getDisplayFolder() const override;
 	std::string getShaderFilePath() const override;
 	std::string getDefinition() const override;