mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-30 03:09:49 +02:00
Code Issues Projects Releases Wiki Activity

- added a new check to faction validator to report on sound files with a bitrate > 200K

Browse Source
This commit is contained in:
Mark Vejvoda
2011-04-09 03:14:05 +00:00
parent 5d96e8f3ab
commit c71480739b
5 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/shared_lib/include/sound/sound.h
View File

@@ -31,6 +31,7 @@ private:
uint32 samplesPerSecond;
uint32 bitsPerSample;
uint32 size;
uint32 bitRate;
public:
SoundInfo();
@@ -40,11 +41,13 @@ public:
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;}
};
// =====================================================

1
source/shared_lib/sources/sound/sound.cpp
View File

@@ -26,6 +26,7 @@ SoundInfo::SoundInfo(){
samplesPerSecond= 0;
bitsPerSample= 0;
size= 0;
bitRate=0;
}
// =====================================================

3
source/shared_lib/sources/sound/sound_file_loader.cpp
View File

@@ -91,6 +91,8 @@ void WavSoundFileLoader::open(const string &path, SoundInfo *soundInfo){
f.read((char*) &size16, 2);
soundInfo->setBitsPerSample(size16);
soundInfo->setBitRate(soundInfo->getSamplesPerSecond() * soundInfo->getChannels() * soundInfo->getBitsPerSample() / 8);
if (soundInfo->getBitsPerSample() != 8 && soundInfo->getBitsPerSample()!=16){
throw runtime_error("Bits per sample must be 8 or 16: " + path);
}
@@ -167,6 +169,7 @@ void OggSoundFileLoader::open(const string &path, SoundInfo *soundInfo){
soundInfo->setsamplesPerSecond(vi->rate);
soundInfo->setBitsPerSample(16);
soundInfo->setSize(samples * 2 * vi->channels);
soundInfo->setBitRate(vi->bitrate_nominal);
}
uint32 OggSoundFileLoader::read(int8 *samples, uint32 size){