From bf5e3820bd44e1be94daf433972aed4c11d06e18 Mon Sep 17 00:00:00 2001
From: Bart van Strien <bart.bes+projects@gmail.com>
Date: Sat, 4 May 2019 10:44:41 +0200
Subject: [PATCH] Remove unused stored extension in Decoder

As preparation for issue #1487
---
 src/modules/sound/Decoder.cpp                  |  3 +--
 src/modules/sound/Decoder.h                    |  5 +----
 src/modules/sound/lullaby/CoreAudioDecoder.cpp |  6 +++---
 src/modules/sound/lullaby/CoreAudioDecoder.h   |  2 +-
 src/modules/sound/lullaby/FLACDecoder.cpp      |  6 +++---
 src/modules/sound/lullaby/FLACDecoder.h        |  2 +-
 src/modules/sound/lullaby/GmeDecoder.cpp       |  6 +++---
 src/modules/sound/lullaby/GmeDecoder.h         |  2 +-
 src/modules/sound/lullaby/ModPlugDecoder.cpp   |  6 +++---
 src/modules/sound/lullaby/ModPlugDecoder.h     |  2 +-
 src/modules/sound/lullaby/Mpg123Decoder.cpp    |  6 +++---
 src/modules/sound/lullaby/Mpg123Decoder.h      |  2 +-
 src/modules/sound/lullaby/Sound.cpp            | 14 +++++++-------
 src/modules/sound/lullaby/VorbisDecoder.cpp    |  6 +++---
 src/modules/sound/lullaby/VorbisDecoder.h      |  2 +-
 src/modules/sound/lullaby/WaveDecoder.cpp      |  6 +++---
 src/modules/sound/lullaby/WaveDecoder.h        |  2 +-
 17 files changed, 37 insertions(+), 41 deletions(-)

diff --git a/src/modules/sound/Decoder.cpp b/src/modules/sound/Decoder.cpp
index 027c899e4..5337aa53d 100644
--- a/src/modules/sound/Decoder.cpp
+++ b/src/modules/sound/Decoder.cpp
@@ -29,9 +29,8 @@ namespace sound
 
 love::Type Decoder::type("Decoder", &Object::type);
 
-Decoder::Decoder(Data *data, const std::string &ext, int bufferSize)
+Decoder::Decoder(Data *data, int bufferSize)
 	: data(data)
-	, ext(ext)
 	, bufferSize(bufferSize)
 	, sampleRate(DEFAULT_SAMPLE_RATE)
 	, buffer(0)
diff --git a/src/modules/sound/Decoder.h b/src/modules/sound/Decoder.h
index 94f19ffbc..89f6c79e2 100644
--- a/src/modules/sound/Decoder.h
+++ b/src/modules/sound/Decoder.h
@@ -41,7 +41,7 @@ public:
 
 	static love::Type type;
 
-	Decoder(Data *data, const std::string &ext, int bufferSize);
+	Decoder(Data *data, int bufferSize);
 	virtual ~Decoder();
 
 	/**
@@ -149,9 +149,6 @@ protected:
 	// reads in the future.
 	StrongRef<Data> data;
 
-	// File extension.
-	std::string ext;
-
 	// When the decoder decodes data incrementally, it writes
 	// this many bytes at a time (at most).
 	int bufferSize;
diff --git a/src/modules/sound/lullaby/CoreAudioDecoder.cpp b/src/modules/sound/lullaby/CoreAudioDecoder.cpp
index 6c675dfd5..e358c6a3b 100644
--- a/src/modules/sound/lullaby/CoreAudioDecoder.cpp
+++ b/src/modules/sound/lullaby/CoreAudioDecoder.cpp
@@ -63,8 +63,8 @@ SInt64 getSizeFunc(void *inClientData)
 }
 } // anonymous namespace
 
-CoreAudioDecoder::CoreAudioDecoder(Data *data, const std::string &ext, int bufferSize)
-	: Decoder(data, ext, bufferSize)
+CoreAudioDecoder::CoreAudioDecoder(Data *data, int bufferSize)
+	: Decoder(data, bufferSize)
 	, audioFile(nullptr)
 	, extAudioFile(nullptr)
 	, inputInfo()
@@ -195,7 +195,7 @@ bool CoreAudioDecoder::accepts(const std::string &ext)
 
 love::sound::Decoder *CoreAudioDecoder::clone()
 {
-	return new CoreAudioDecoder(data.get(), ext, bufferSize);
+	return new CoreAudioDecoder(data.get(), bufferSize);
 }
 
 int CoreAudioDecoder::decode()
diff --git a/src/modules/sound/lullaby/CoreAudioDecoder.h b/src/modules/sound/lullaby/CoreAudioDecoder.h
index 72ca24d07..1939602d6 100644
--- a/src/modules/sound/lullaby/CoreAudioDecoder.h
+++ b/src/modules/sound/lullaby/CoreAudioDecoder.h
@@ -47,7 +47,7 @@ class CoreAudioDecoder : public Decoder
 {
 public:
 
-	CoreAudioDecoder(Data *data, const std::string &ext, int bufferSize);
+	CoreAudioDecoder(Data *data, int bufferSize);
 	virtual ~CoreAudioDecoder();
 
 	static bool accepts(const std::string &ext);
diff --git a/src/modules/sound/lullaby/FLACDecoder.cpp b/src/modules/sound/lullaby/FLACDecoder.cpp
index 7d27b53c8..5849103f0 100644
--- a/src/modules/sound/lullaby/FLACDecoder.cpp
+++ b/src/modules/sound/lullaby/FLACDecoder.cpp
@@ -32,8 +32,8 @@ namespace sound
 namespace lullaby
 {
 
-FLACDecoder::FLACDecoder(Data *data, const std::string &ext, int nbufferSize)
-	: Decoder(data, ext, nbufferSize)
+FLACDecoder::FLACDecoder(Data *data, int nbufferSize)
+	: Decoder(data, nbufferSize)
 	, pos(0)
 {
 	init();
@@ -69,7 +69,7 @@ bool FLACDecoder::accepts(const std::string &ext)
 
 love::sound::Decoder *FLACDecoder::clone()
 {
-	return new FLACDecoder(data.get(), ext, bufferSize);
+	return new FLACDecoder(data.get(), bufferSize);
 }
 
 int FLACDecoder::decode()
diff --git a/src/modules/sound/lullaby/FLACDecoder.h b/src/modules/sound/lullaby/FLACDecoder.h
index 6e554b4b5..aac85c343 100644
--- a/src/modules/sound/lullaby/FLACDecoder.h
+++ b/src/modules/sound/lullaby/FLACDecoder.h
@@ -40,7 +40,7 @@ namespace lullaby
 class FLACDecoder : public Decoder, public FLAC::Decoder::Stream
 {
 public:
-	FLACDecoder(Data *data, const std::string &ext, int bufferSize);
+	FLACDecoder(Data *data, int bufferSize);
 	~FLACDecoder();
 
 	static bool accepts(const std::string &ext);
diff --git a/src/modules/sound/lullaby/GmeDecoder.cpp b/src/modules/sound/lullaby/GmeDecoder.cpp
index bc76294b7..f1251ee5e 100644
--- a/src/modules/sound/lullaby/GmeDecoder.cpp
+++ b/src/modules/sound/lullaby/GmeDecoder.cpp
@@ -32,8 +32,8 @@ namespace sound
 namespace lullaby
 {
 
-GmeDecoder::GmeDecoder(Data *data, const std::string &ext, int bufferSize)
-	: Decoder(data, ext, bufferSize)
+GmeDecoder::GmeDecoder(Data *data, int bufferSize)
+	: Decoder(data, bufferSize)
 	, emu(0)
 	, num_tracks(0)
 	, cur_track(0)
@@ -86,7 +86,7 @@ bool GmeDecoder::accepts(const std::string &ext)
 
 love::sound::Decoder *GmeDecoder::clone()
 {
-	return new GmeDecoder(data.get(), ext, bufferSize);
+	return new GmeDecoder(data.get(), bufferSize);
 }
 
 int GmeDecoder::decode()
diff --git a/src/modules/sound/lullaby/GmeDecoder.h b/src/modules/sound/lullaby/GmeDecoder.h
index e5fcb16cd..f5c093fa2 100644
--- a/src/modules/sound/lullaby/GmeDecoder.h
+++ b/src/modules/sound/lullaby/GmeDecoder.h
@@ -44,7 +44,7 @@ class GmeDecoder : public Decoder
 {
 public:
 
-	GmeDecoder(Data *data, const std::string &ext, int bufferSize);
+	GmeDecoder(Data *data, int bufferSize);
 	virtual ~GmeDecoder();
 
 	static bool accepts(const std::string &ext);
diff --git a/src/modules/sound/lullaby/ModPlugDecoder.cpp b/src/modules/sound/lullaby/ModPlugDecoder.cpp
index faadf3ed3..4c3790f3a 100644
--- a/src/modules/sound/lullaby/ModPlugDecoder.cpp
+++ b/src/modules/sound/lullaby/ModPlugDecoder.cpp
@@ -31,8 +31,8 @@ namespace sound
 namespace lullaby
 {
 
-ModPlugDecoder::ModPlugDecoder(Data *data, const std::string &ext, int bufferSize)
-	: Decoder(data, ext, bufferSize)
+ModPlugDecoder::ModPlugDecoder(Data *data, int bufferSize)
+	: Decoder(data, bufferSize)
 	, plug(0)
 	, duration(-2.0)
 {
@@ -98,7 +98,7 @@ bool ModPlugDecoder::accepts(const std::string &ext)
 
 love::sound::Decoder *ModPlugDecoder::clone()
 {
-	return new ModPlugDecoder(data.get(), ext, bufferSize);
+	return new ModPlugDecoder(data.get(), bufferSize);
 }
 
 int ModPlugDecoder::decode()
diff --git a/src/modules/sound/lullaby/ModPlugDecoder.h b/src/modules/sound/lullaby/ModPlugDecoder.h
index b0d59f080..5c9be7f7c 100644
--- a/src/modules/sound/lullaby/ModPlugDecoder.h
+++ b/src/modules/sound/lullaby/ModPlugDecoder.h
@@ -47,7 +47,7 @@ class ModPlugDecoder : public Decoder
 {
 public:
 
-	ModPlugDecoder(Data *data, const std::string &ext, int bufferSize);
+	ModPlugDecoder(Data *data, int bufferSize);
 	virtual ~ModPlugDecoder();
 
 	static bool accepts(const std::string &ext);
diff --git a/src/modules/sound/lullaby/Mpg123Decoder.cpp b/src/modules/sound/lullaby/Mpg123Decoder.cpp
index e7394f1eb..986939799 100644
--- a/src/modules/sound/lullaby/Mpg123Decoder.cpp
+++ b/src/modules/sound/lullaby/Mpg123Decoder.cpp
@@ -107,8 +107,8 @@ static void cleanup_callback(void *)
 
 bool Mpg123Decoder::inited = false;
 
-Mpg123Decoder::Mpg123Decoder(Data *data, const std::string &ext, int bufferSize)
-	: Decoder(data, ext, bufferSize)
+Mpg123Decoder::Mpg123Decoder(Data *data, int bufferSize)
+	: Decoder(data, bufferSize)
 	, decoder_file(data)
 	, handle(0)
 	, channels(MPG123_STEREO)
@@ -196,7 +196,7 @@ void Mpg123Decoder::quit()
 
 love::sound::Decoder *Mpg123Decoder::clone()
 {
-	return new Mpg123Decoder(data.get(), ext, bufferSize);
+	return new Mpg123Decoder(data.get(), bufferSize);
 }
 
 int Mpg123Decoder::decode()
diff --git a/src/modules/sound/lullaby/Mpg123Decoder.h b/src/modules/sound/lullaby/Mpg123Decoder.h
index ac1e23ba8..afa17eea7 100644
--- a/src/modules/sound/lullaby/Mpg123Decoder.h
+++ b/src/modules/sound/lullaby/Mpg123Decoder.h
@@ -58,7 +58,7 @@ class Mpg123Decoder : public Decoder
 {
 public:
 
-	Mpg123Decoder(Data *data, const std::string &ext, int bufferSize);
+	Mpg123Decoder(Data *data, int bufferSize);
 	virtual ~Mpg123Decoder();
 
 	static bool accepts(const std::string &ext);
diff --git a/src/modules/sound/lullaby/Sound.cpp b/src/modules/sound/lullaby/Sound.cpp
index 3c3025ac0..2c77165a1 100644
--- a/src/modules/sound/lullaby/Sound.cpp
+++ b/src/modules/sound/lullaby/Sound.cpp
@@ -73,26 +73,26 @@ sound::Decoder *Sound::newDecoder(love::filesystem::FileData *data, int bufferSi
 		/* nothing */;
 #ifndef LOVE_NO_MODPLUG
 	else if (ModPlugDecoder::accepts(ext))
-		decoder = new ModPlugDecoder(data, ext, bufferSize);
+		decoder = new ModPlugDecoder(data, bufferSize);
 #endif // LOVE_NO_MODPLUG
 #ifndef LOVE_NOMPG123
 	else if (Mpg123Decoder::accepts(ext))
-		decoder = new Mpg123Decoder(data, ext, bufferSize);
+		decoder = new Mpg123Decoder(data, bufferSize);
 #endif // LOVE_NOMPG123
 	else if (VorbisDecoder::accepts(ext))
-		decoder = new VorbisDecoder(data, ext, bufferSize);
+		decoder = new VorbisDecoder(data, bufferSize);
 #ifdef LOVE_SUPPORT_GME
 	else if (GmeDecoder::accepts(ext))
-		decoder = new GmeDecoder(data, ext, bufferSize);
+		decoder = new GmeDecoder(data, bufferSize);
 #endif // LOVE_SUPPORT_GME
 #ifdef LOVE_SUPPORT_COREAUDIO
 	else if (CoreAudioDecoder::accepts(ext))
-		decoder = new CoreAudioDecoder(data, ext, bufferSize);
+		decoder = new CoreAudioDecoder(data, bufferSize);
 #endif
 	else if (WaveDecoder::accepts(ext))
-		decoder = new WaveDecoder(data, ext, bufferSize);
+		decoder = new WaveDecoder(data, bufferSize);
 	/*else if (FLACDecoder::accepts(ext))
-		decoder = new FLACDecoder(data, ext, bufferSize);*/
+		decoder = new FLACDecoder(data, bufferSize);*/
 
 	// else if (OtherDecoder::accept(ext))
 
diff --git a/src/modules/sound/lullaby/VorbisDecoder.cpp b/src/modules/sound/lullaby/VorbisDecoder.cpp
index f368bfafd..c9b1d9251 100644
--- a/src/modules/sound/lullaby/VorbisDecoder.cpp
+++ b/src/modules/sound/lullaby/VorbisDecoder.cpp
@@ -128,8 +128,8 @@ static long vorbisTell(void *datasource	/* ptr to the data that the vorbis files
  * END CALLBACK FUNCTIONS
  **/
 
-VorbisDecoder::VorbisDecoder(Data *data, const std::string &ext, int bufferSize)
-	: Decoder(data, ext, bufferSize)
+VorbisDecoder::VorbisDecoder(Data *data, int bufferSize)
+	: Decoder(data, bufferSize)
 	, duration(-2.0)
 {
 	// Initialize callbacks
@@ -182,7 +182,7 @@ bool VorbisDecoder::accepts(const std::string &ext)
 
 love::sound::Decoder *VorbisDecoder::clone()
 {
-	return new VorbisDecoder(data.get(), ext, bufferSize);
+	return new VorbisDecoder(data.get(), bufferSize);
 }
 
 int VorbisDecoder::decode()
diff --git a/src/modules/sound/lullaby/VorbisDecoder.h b/src/modules/sound/lullaby/VorbisDecoder.h
index 1c8fc53b2..969afc28d 100644
--- a/src/modules/sound/lullaby/VorbisDecoder.h
+++ b/src/modules/sound/lullaby/VorbisDecoder.h
@@ -50,7 +50,7 @@ class VorbisDecoder : public Decoder
 {
 public:
 
-	VorbisDecoder(Data *data, const std::string &ext, int bufferSize);
+	VorbisDecoder(Data *data, int bufferSize);
 	virtual ~VorbisDecoder();
 
 	static bool accepts(const std::string &ext);
diff --git a/src/modules/sound/lullaby/WaveDecoder.cpp b/src/modules/sound/lullaby/WaveDecoder.cpp
index 6e6bd9ac5..d7dab175e 100644
--- a/src/modules/sound/lullaby/WaveDecoder.cpp
+++ b/src/modules/sound/lullaby/WaveDecoder.cpp
@@ -60,8 +60,8 @@ static wuff_sint32 tell_callback(void *userdata, wuff_uint64 *offset)
 wuff_callback WaveDecoderCallbacks = {read_callback, seek_callback, tell_callback};
 
 
-WaveDecoder::WaveDecoder(Data *data, const std::string &ext, int bufferSize)
-	: Decoder(data, ext, bufferSize)
+WaveDecoder::WaveDecoder(Data *data, int bufferSize)
+	: Decoder(data, bufferSize)
 {
 	dataFile.data = (char *) data->getData();
 	dataFile.size = data->getSize();
@@ -117,7 +117,7 @@ bool WaveDecoder::accepts(const std::string &ext)
 
 love::sound::Decoder *WaveDecoder::clone()
 {
-	return new WaveDecoder(data.get(), ext, bufferSize);
+	return new WaveDecoder(data.get(), bufferSize);
 }
 
 int WaveDecoder::decode()
diff --git a/src/modules/sound/lullaby/WaveDecoder.h b/src/modules/sound/lullaby/WaveDecoder.h
index 9cfa44786..05a97cfb6 100644
--- a/src/modules/sound/lullaby/WaveDecoder.h
+++ b/src/modules/sound/lullaby/WaveDecoder.h
@@ -46,7 +46,7 @@ class WaveDecoder : public Decoder
 {
 public:
 
-	WaveDecoder(Data *data, const std::string &ext, int bufferSize);
+	WaveDecoder(Data *data, int bufferSize);
 	virtual ~WaveDecoder();
 
 	static bool accepts(const std::string &ext);