Fixed the god-awful indentation

This commit is contained in:
mathusummut
2018-05-06 00:01:36 +02:00
parent 643e3820f5
commit 35b7b1f1a6
459 changed files with 204893 additions and 217545 deletions

View File

@@ -23,87 +23,94 @@ struct OggVorbis_File;
using std::string;
using std::ifstream;
namespace Shared{ namespace Sound{
namespace Shared {
namespace Sound {
using Platform::uint32;
using Platform::int8;
using Util::MultiFactory;
using Platform::uint32;
using Platform::int8;
using Util::MultiFactory;
class SoundInfo;
class SoundInfo;
// =====================================================
// class SoundFileLoader
//
/// Interface that all SoundFileLoaders will implement
// =====================================================
// =====================================================
// class SoundFileLoader
//
/// Interface that all SoundFileLoaders will implement
// =====================================================
class SoundFileLoader{
public:
virtual ~SoundFileLoader(){}
class SoundFileLoader {
public:
virtual ~SoundFileLoader() {
}
virtual void open(const string &path, SoundInfo *soundInfo)= 0;
virtual uint32 read(int8 *samples, uint32 size)= 0;
virtual void close()= 0;
virtual void restart()= 0;
virtual string getFileName() = 0;
};
virtual void open(const string &path, SoundInfo *soundInfo) = 0;
virtual uint32 read(int8 *samples, uint32 size) = 0;
virtual void close() = 0;
virtual void restart() = 0;
virtual string getFileName() = 0;
};
// =====================================================
// class WavSoundFileLoader
//
/// Wave file loader
// =====================================================
// =====================================================
// class WavSoundFileLoader
//
/// Wave file loader
// =====================================================
class WavSoundFileLoader: public SoundFileLoader{
private:
static const int maxDataRetryCount= 10;
string fileName;
private:
uint32 dataOffset;
uint32 dataSize;
uint32 bytesPerSecond;
ifstream f;
class WavSoundFileLoader : public SoundFileLoader {
private:
static const int maxDataRetryCount = 10;
string fileName;
private:
uint32 dataOffset;
uint32 dataSize;
uint32 bytesPerSecond;
ifstream f;
public:
virtual void open(const string &path, SoundInfo *soundInfo);
virtual uint32 read(int8 *samples, uint32 size);
virtual void close();
virtual void restart();
virtual string getFileName() { return fileName; }
};
public:
virtual void open(const string &path, SoundInfo *soundInfo);
virtual uint32 read(int8 *samples, uint32 size);
virtual void close();
virtual void restart();
virtual string getFileName() {
return fileName;
}
};
// =====================================================
// class OggSoundFileLoader
//
/// OGG sound file loader, uses ogg-vorbis library
// =====================================================
// =====================================================
// class OggSoundFileLoader
//
/// OGG sound file loader, uses ogg-vorbis library
// =====================================================
class OggSoundFileLoader: public SoundFileLoader{
private:
OggVorbis_File *vf;
FILE *f;
string fileName;
class OggSoundFileLoader : public SoundFileLoader {
private:
OggVorbis_File *vf;
FILE *f;
string fileName;
public:
OggSoundFileLoader();
virtual void open(const string &path, SoundInfo *soundInfo);
virtual uint32 read(int8 *samples, uint32 size);
virtual void close();
virtual void restart();
virtual string getFileName() { return fileName; }
};
public:
OggSoundFileLoader();
virtual void open(const string &path, SoundInfo *soundInfo);
virtual uint32 read(int8 *samples, uint32 size);
virtual void close();
virtual void restart();
virtual string getFileName() {
return fileName;
}
};
// =====================================================
// class SoundFileLoaderFactory
// =====================================================
// =====================================================
// class SoundFileLoaderFactory
// =====================================================
class SoundFileLoaderFactory: public MultiFactory<SoundFileLoader>{
private:
SoundFileLoaderFactory();
public:
static SoundFileLoaderFactory * getInstance();
};
class SoundFileLoaderFactory : public MultiFactory<SoundFileLoader> {
private:
SoundFileLoaderFactory();
public:
static SoundFileLoaderFactory * getInstance();
};
}}//end namespace
}
}//end namespace
#endif