From 68d7161557e7bb63c40e0b09f7aaa7260c09efb3 Mon Sep 17 00:00:00 2001 From: Barinade Date: Sat, 21 Sep 2019 14:58:22 -0500 Subject: [PATCH] Fix broken OOP things in RageSoundReader_mp3 nice going fission --- src/RageUtil/Sound/RageSoundReader.h | 2 +- src/RageUtil/Sound/RageSoundReader_Extend.cpp | 4 ++-- src/RageUtil/Sound/RageSoundReader_MP3.cpp | 2 +- src/RageUtil/Sound/RageSoundReader_MP3.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/RageUtil/Sound/RageSoundReader.h b/src/RageUtil/Sound/RageSoundReader.h index ba5cdad2c2..6fa82534ab 100644 --- a/src/RageUtil/Sound/RageSoundReader.h +++ b/src/RageUtil/Sound/RageSoundReader.h @@ -14,7 +14,7 @@ class RageSoundReader virtual RageSoundReader* Copy() const = 0; virtual int GetSampleRate() const = 0; virtual unsigned GetNumChannels() const = 0; - virtual bool SetProperty(const RString& /* sProperty */, float /* fValue */) + virtual bool SetProperty(const RString& sProperty, float fValue) { return false; } diff --git a/src/RageUtil/Sound/RageSoundReader_Extend.cpp b/src/RageUtil/Sound/RageSoundReader_Extend.cpp index 68e1095edb..86beea5a5e 100644 --- a/src/RageUtil/Sound/RageSoundReader_Extend.cpp +++ b/src/RageUtil/Sound/RageSoundReader_Extend.cpp @@ -1,4 +1,4 @@ -#include "Etterna/Globals/global.h" +#include "Etterna/Globals/global.h" #include "RageSoundReader_Extend.h" #include "RageSoundUtil.h" #include "RageUtil/Utils/RageUtil.h" @@ -204,5 +204,5 @@ RageSoundReader_Extend::SetProperty(const RString& sProperty, float fValue) return true; } - return false; + return RageSoundReader_Filter::SetProperty(sProperty, fValue); } diff --git a/src/RageUtil/Sound/RageSoundReader_MP3.cpp b/src/RageUtil/Sound/RageSoundReader_MP3.cpp index 90c924bb69..fb9e27cb99 100644 --- a/src/RageUtil/Sound/RageSoundReader_MP3.cpp +++ b/src/RageUtil/Sound/RageSoundReader_MP3.cpp @@ -977,7 +977,7 @@ RageSoundReader_MP3::SetPosition(int iFrame) } bool -RageSoundReader_MP3::SetProperty(const std::string& sProperty, float fValue) +RageSoundReader_MP3::SetProperty(const RString& sProperty, float fValue) { if (sProperty == "AccurateSync") { m_bAccurateSync = (fValue > 0.001f); diff --git a/src/RageUtil/Sound/RageSoundReader_MP3.h b/src/RageUtil/Sound/RageSoundReader_MP3.h index 01ab25708c..68d225018b 100644 --- a/src/RageUtil/Sound/RageSoundReader_MP3.h +++ b/src/RageUtil/Sound/RageSoundReader_MP3.h @@ -27,7 +27,7 @@ class RageSoundReader_MP3 : public RageSoundReader_FileReader unsigned GetNumChannels() const { return Channels; } int GetSampleRate() const { return SampleRate; } int GetNextSourceFrame() const; - bool SetProperty(const std::string& sProperty, float fValue); + bool SetProperty(const RString& sProperty, float fValue) override; RageSoundReader_MP3(); ~RageSoundReader_MP3();