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

@@ -19,102 +19,140 @@
using namespace std;
using namespace Shared::Platform;
namespace Shared{ namespace Sound{
namespace Shared {
namespace Sound {
// =====================================================
// class SoundInfo
// =====================================================
// =====================================================
// class SoundInfo
// =====================================================
class SoundInfo{
private:
uint32 channels;
uint32 samplesPerSecond;
uint32 bitsPerSample;
uint32 size;
uint32 bitRate;
class SoundInfo {
private:
uint32 channels;
uint32 samplesPerSecond;
uint32 bitsPerSample;
uint32 size;
uint32 bitRate;
public:
SoundInfo();
virtual ~SoundInfo(){};
public:
SoundInfo();
virtual ~SoundInfo() {
};
uint32 getChannels() const {return channels;}
uint32 getSamplesPerSecond() const {return samplesPerSecond;}
uint32 getBitsPerSample() const {return bitsPerSample;}
uint32 getSize() const {return size;}
uint32 getBitRate() const {return bitRate;}
uint32 getChannels() const {
return channels;
}
uint32 getSamplesPerSecond() const {
return samplesPerSecond;
}
uint32 getBitsPerSample() const {
return bitsPerSample;
}
uint32 getSize() const {
return size;
}
uint32 getBitRate() const {
return bitRate;
}
void setChannels(uint32 channels) {this->channels= channels;}
void setsamplesPerSecond(uint32 samplesPerSecond) {this->samplesPerSecond= samplesPerSecond;}
void setBitsPerSample(uint32 bitsPerSample) {this->bitsPerSample= bitsPerSample;}
void setSize(uint32 size) {this->size= size;}
void setBitRate(uint32 value) {this->bitRate = value;}
};
void setChannels(uint32 channels) {
this->channels = channels;
}
void setsamplesPerSecond(uint32 samplesPerSecond) {
this->samplesPerSecond = samplesPerSecond;
}
void setBitsPerSample(uint32 bitsPerSample) {
this->bitsPerSample = bitsPerSample;
}
void setSize(uint32 size) {
this->size = size;
}
void setBitRate(uint32 value) {
this->bitRate = value;
}
};
// =====================================================
// class Sound
// =====================================================
// =====================================================
// class Sound
// =====================================================
class Sound {
protected:
SoundFileLoader *soundFileLoader;
SoundInfo info;
float volume;
string fileName;
//static bool masterserverMode;
class Sound {
protected:
SoundFileLoader *soundFileLoader;
SoundInfo info;
float volume;
string fileName;
public:
Sound();
virtual ~Sound(){};
//static bool masterserverMode;
//static void setMasterserverMode(bool value) { masterserverMode=value; }
public:
Sound();
virtual ~Sound() {
};
const SoundInfo *getInfo() const {return &info;}
float getVolume() const {return volume;}
void setVolume(float volume) {this->volume= volume;}
string getFileName() {return fileName; }
};
//static void setMasterserverMode(bool value) { masterserverMode=value; }
// =====================================================
// class StaticSound
// =====================================================
const SoundInfo *getInfo() const {
return &info;
}
float getVolume() const {
return volume;
}
class StaticSound: public Sound{
private:
int8 * samples;
void setVolume(float volume) {
this->volume = volume;
}
string getFileName() {
return fileName;
}
};
public:
StaticSound();
virtual ~StaticSound();
// =====================================================
// class StaticSound
// =====================================================
int8 *getSamples() const {return samples;}
void load(const string &path);
void close();
};
class StaticSound : public Sound {
private:
int8 * samples;
// =====================================================
// class StrSound
// =====================================================
public:
StaticSound();
virtual ~StaticSound();
class StrSound: public Sound{
private:
StrSound *next;
int8 *getSamples() const {
return samples;
}
public:
StrSound();
virtual ~StrSound();
void load(const string &path);
void close();
};
StrSound *getNext() const {return next;}
void setNext(StrSound *next) {this->next= next;}
// =====================================================
// class StrSound
// =====================================================
void open(const string &path);
uint32 read(int8 *samples, uint32 size);
void close();
void restart();
};
class StrSound : public Sound {
private:
StrSound *next;
}}//end namespace
public:
StrSound();
virtual ~StrSound();
StrSound *getNext() const {
return next;
}
void setNext(StrSound *next) {
this->next = next;
}
void open(const string &path);
uint32 read(int8 *samples, uint32 size);
void close();
void restart();
};
}
}//end namespace
#endif