LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-16 00:02:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused stored extension in Decoder

Browse Source 
As preparation for issue #1487
This commit is contained in:
Bart van Strien
2019-05-04 10:44:41 +02:00
parent 372a55c6ac
commit bf5e3820bd
17 changed files with 37 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/sound/Decoder.cpp
+1 -2
View File
@@ -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)
src/modules/sound/Decoder.h
+1 -4
View File
@@ -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;
src/modules/sound/lullaby/CoreAudioDecoder.cpp
+3 -3
View File
@@ -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()
src/modules/sound/lullaby/CoreAudioDecoder.h
+1 -1
View File
@@ -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);
src/modules/sound/lullaby/FLACDecoder.cpp
+3 -3
View File
@@ -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()
src/modules/sound/lullaby/FLACDecoder.h
+1 -1
View File
@@ -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);
src/modules/sound/lullaby/GmeDecoder.cpp
+3 -3
View File
@@ -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()
src/modules/sound/lullaby/GmeDecoder.h
+1 -1
View File
@@ -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);
src/modules/sound/lullaby/ModPlugDecoder.cpp
+3 -3
View File
@@ -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()
src/modules/sound/lullaby/ModPlugDecoder.h
+1 -1
View File
@@ -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);
src/modules/sound/lullaby/Mpg123Decoder.cpp
+3 -3
View File
@@ -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()
src/modules/sound/lullaby/Mpg123Decoder.h
+1 -1
View File
@@ -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);
src/modules/sound/lullaby/Sound.cpp
+7 -7
View File
@@ -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))
src/modules/sound/lullaby/VorbisDecoder.cpp
+3 -3
View File
@@ -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()
src/modules/sound/lullaby/VorbisDecoder.h
+1 -1
View File
@@ -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);
src/modules/sound/lullaby/WaveDecoder.cpp
+3 -3
View File
@@ -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()
src/modules/sound/lullaby/WaveDecoder.h
+1 -1
View File
@@ -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);