From 81a3f2f76cc8642fd4240bb90e4abffce1d4a3c0 Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 25 Jan 2017 00:41:32 +0100 Subject: [PATCH] Remove unneded data form rfx file --- tools/rFXGen/rfxgen.c | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/tools/rFXGen/rfxgen.c b/tools/rFXGen/rfxgen.c index 6754287..fdd7f80 100644 --- a/tools/rFXGen/rfxgen.c +++ b/tools/rFXGen/rfxgen.c @@ -185,9 +185,8 @@ int main(int argc, char *argv[]) params = LoadSoundParams(argv[i]); Wave wave = GenerateWave(params); - // Format wave data to desired sampleSize and channels - // NOTE: wavSampleRate and wavSampleSize are loaded from rfx or default values are used - WaveFormat(&wave, wavSampleRate, wavSampleSize, 1); + // TODO: Format wave data to desired sampleRate, sampleSize and channels + //WaveFormat(&wave, sampleRate, sampleSize, channels); argv[i][strlen(argv[i]) - 3] = 'w'; argv[i][strlen(argv[i]) - 2] = 'a'; @@ -1040,14 +1039,8 @@ static WaveParams LoadSoundParams(const char *fileName) { int version; fread(&version, 1, sizeof(int), rfxFile); - - fread(&wavSampleRate, 1, sizeof(int), rfxFile); - fread(&wavSampleSize, 1, sizeof(int), rfxFile); - - int channels; - fread(&channels, 1, sizeof(int), rfxFile); - // Read wave parameters struct + // Load wave generation parameters fread(¶ms, 1, sizeof(WaveParams), rfxFile); } else printf("[%s] Not a valid rFX file\n", fileName); @@ -1118,19 +1111,10 @@ static void SaveSoundParams(const char *fileName, WaveParams params) unsigned char signature[4] = "rFX "; fwrite(signature, 4, sizeof(unsigned char), rfxFile); - int version = 100; // File version + int version = 100; fwrite(&version, 1, sizeof(int), rfxFile); - - // NOTE: Sound config shouldn't depend on Wave parameters - // Wave params are used to generate a 44100Hz - 32bit float data - - // TODO: review this info - fwrite(&wavSampleRate, 1, sizeof(int), rfxFile); - fwrite(&wavSampleSize, 1, sizeof(int), rfxFile); - - int channels = 1; - fwrite(&channels, 1, sizeof(int), rfxFile); + // Save wave generation parameters fwrite(¶ms, 1, sizeof(WaveParams), rfxFile); fclose(rfxFile);