diff options
author | dhewg | 2011-03-11 20:53:25 +0100 |
---|---|---|
committer | dhewg | 2011-03-11 20:54:57 +0100 |
commit | 3d576c184a54d9fb1114e0c46ba96c2a86b88b43 (patch) | |
tree | 1532e2d626da1f9972c3b08d1712200c9d851a38 | |
parent | a2a5083dc9bf51d92f7c001d60fc554b901eade0 (diff) | |
download | scummvm-rg350-3d576c184a54d9fb1114e0c46ba96c2a86b88b43.tar.gz scummvm-rg350-3d576c184a54d9fb1114e0c46ba96c2a86b88b43.tar.bz2 scummvm-rg350-3d576c184a54d9fb1114e0c46ba96c2a86b88b43.zip |
AUDIO: Fix some whitespaces
-rw-r--r-- | audio/rate_arm.cpp | 169 |
1 files changed, 86 insertions, 83 deletions
diff --git a/audio/rate_arm.cpp b/audio/rate_arm.cpp index d43a531129..43172f64c8 100644 --- a/audio/rate_arm.cpp +++ b/audio/rate_arm.cpp @@ -60,7 +60,7 @@ namespace Audio { * ARM routine we call doesn't respect those definitions. */ #define FRAC_BITS 16 -#define FRAC_ONE (1<<FRAC_BITS) +#define FRAC_ONE (1 << FRAC_BITS) /** * The size of the intermediate input cache. Bigger values may increase @@ -138,34 +138,33 @@ extern "C" { } extern "C" st_sample_t *ARM_SimpleRate_M( - AudioStream &input, - int (*fn)(Audio::AudioStream&,int16*,int), - SimpleRateDetails *sr, - st_sample_t *obuf, - st_size_t osamp, - st_volume_t vol_l, - st_volume_t vol_r); + AudioStream &input, + int (*fn)(Audio::AudioStream&,int16*,int), + SimpleRateDetails *sr, + st_sample_t *obuf, + st_size_t osamp, + st_volume_t vol_l, + st_volume_t vol_r); extern "C" st_sample_t *ARM_SimpleRate_S( - AudioStream &input, - int (*fn)(Audio::AudioStream&,int16*,int), - SimpleRateDetails *sr, - st_sample_t *obuf, - st_size_t osamp, - st_volume_t vol_l, - st_volume_t vol_r); + AudioStream &input, + int (*fn)(Audio::AudioStream&,int16*,int), + SimpleRateDetails *sr, + st_sample_t *obuf, + st_size_t osamp, + st_volume_t vol_l, + st_volume_t vol_r); extern "C" st_sample_t *ARM_SimpleRate_R( - AudioStream &input, - int (*fn)(Audio::AudioStream&,int16*,int), - SimpleRateDetails *sr, - st_sample_t *obuf, - st_size_t osamp, - st_volume_t vol_l, - st_volume_t vol_r); - -extern "C" int SimpleRate_readFudge(Audio::AudioStream &input, - int16 *a, int b) + AudioStream &input, + int (*fn)(Audio::AudioStream&,int16*,int), + SimpleRateDetails *sr, + st_sample_t *obuf, + st_size_t osamp, + st_volume_t vol_l, + st_volume_t vol_r); + +extern "C" int SimpleRate_readFudge(Audio::AudioStream &input, int16 *a, int b) { #ifdef DEBUG_RATECONV debug("Reading ptr=%x n%d", a, b); @@ -183,21 +182,22 @@ int SimpleRateConverter<stereo, reverseStereo>::flow(AudioStream &input, st_samp if (!stereo) { obuf = ARM_SimpleRate_M(input, - &SimpleRate_readFudge, - &sr, - obuf, osamp, vol_l, vol_r); + &SimpleRate_readFudge, + &sr, + obuf, osamp, vol_l, vol_r); } else if (reverseStereo) { obuf = ARM_SimpleRate_R(input, - &SimpleRate_readFudge, - &sr, - obuf, osamp, vol_l, vol_r); + &SimpleRate_readFudge, + &sr, + obuf, osamp, vol_l, vol_r); } else { obuf = ARM_SimpleRate_S(input, - &SimpleRate_readFudge, - &sr, - obuf, osamp, vol_l, vol_r); + &SimpleRate_readFudge, + &sr, + obuf, osamp, vol_l, vol_r); } - return (obuf-ostart)/2; + + return (obuf - ostart) / 2; } /** @@ -240,31 +240,31 @@ extern "C" { } extern "C" st_sample_t *ARM_LinearRate_M( - AudioStream &input, - int (*fn)(Audio::AudioStream&,int16*,int), - LinearRateDetails *lr, - st_sample_t *obuf, - st_size_t osamp, - st_volume_t vol_l, - st_volume_t vol_r); + AudioStream &input, + int (*fn)(Audio::AudioStream&,int16*,int), + LinearRateDetails *lr, + st_sample_t *obuf, + st_size_t osamp, + st_volume_t vol_l, + st_volume_t vol_r); extern "C" st_sample_t *ARM_LinearRate_S( - AudioStream &input, - int (*fn)(Audio::AudioStream&,int16*,int), - LinearRateDetails *lr, - st_sample_t *obuf, - st_size_t osamp, - st_volume_t vol_l, - st_volume_t vol_r); + AudioStream &input, + int (*fn)(Audio::AudioStream&,int16*,int), + LinearRateDetails *lr, + st_sample_t *obuf, + st_size_t osamp, + st_volume_t vol_l, + st_volume_t vol_r); extern "C" st_sample_t *ARM_LinearRate_R( - AudioStream &input, - int (*fn)(Audio::AudioStream&,int16*,int), - LinearRateDetails *lr, - st_sample_t *obuf, - st_size_t osamp, - st_volume_t vol_l, - st_volume_t vol_r); + AudioStream &input, + int (*fn)(Audio::AudioStream&,int16*,int), + LinearRateDetails *lr, + st_sample_t *obuf, + st_size_t osamp, + st_volume_t vol_l, + st_volume_t vol_r); template<bool stereo, bool reverseStereo> class LinearRateConverter : public RateConverter { @@ -328,21 +328,21 @@ int LinearRateConverter<stereo, reverseStereo>::flow(AudioStream &input, st_samp if (!stereo) { obuf = ARM_LinearRate_M(input, - &SimpleRate_readFudge, - &lr, - obuf, osamp, vol_l, vol_r); + &SimpleRate_readFudge, + &lr, + obuf, osamp, vol_l, vol_r); } else if (reverseStereo) { obuf = ARM_LinearRate_R(input, - &SimpleRate_readFudge, - &lr, - obuf, osamp, vol_l, vol_r); + &SimpleRate_readFudge, + &lr, + obuf, osamp, vol_l, vol_r); } else { obuf = ARM_LinearRate_S(input, - &SimpleRate_readFudge, - &lr, - obuf, osamp, vol_l, vol_r); + &SimpleRate_readFudge, + &lr, + obuf, osamp, vol_l, vol_r); } - return (obuf-ostart)/2; + return (obuf - ostart) / 2; } @@ -361,31 +361,32 @@ extern "C" { } extern "C" st_sample_t *ARM_CopyRate_M( - st_size_t len, - st_sample_t *obuf, - st_volume_t vol_l, - st_volume_t vol_r, - st_sample_t *_buffer); + st_size_t len, + st_sample_t *obuf, + st_volume_t vol_l, + st_volume_t vol_r, + st_sample_t *_buffer); extern "C" st_sample_t *ARM_CopyRate_S( - st_size_t len, - st_sample_t *obuf, - st_volume_t vol_l, - st_volume_t vol_r, - st_sample_t *_buffer); + st_size_t len, + st_sample_t *obuf, + st_volume_t vol_l, + st_volume_t vol_r, + st_sample_t *_buffer); extern "C" st_sample_t *ARM_CopyRate_R( - st_size_t len, - st_sample_t *obuf, - st_volume_t vol_l, - st_volume_t vol_r, - st_sample_t *_buffer); + st_size_t len, + st_sample_t *obuf, + st_volume_t vol_l, + st_volume_t vol_r, + st_sample_t *_buffer); template<bool stereo, bool reverseStereo> class CopyRateConverter : public RateConverter { st_sample_t *_buffer; st_size_t _bufferSize; + public: CopyRateConverter() : _buffer(0), _bufferSize(0) {} ~CopyRateConverter() { @@ -399,7 +400,7 @@ public: debug("Copy st=%d rev=%d", stereo, reverseStereo); #endif st_size_t len; - st_sample_t *ostart = obuf; + st_sample_t *ostart = obuf; if (stereo) osamp *= 2; @@ -424,8 +425,9 @@ public: else obuf = ARM_CopyRate_M(len, obuf, vol_l, vol_r, _buffer); - return (obuf-ostart)/2; + return (obuf - ostart) / 2; } + virtual int drain(st_sample_t *obuf, st_size_t osamp, st_volume_t vol) { return (ST_SUCCESS); } @@ -469,3 +471,4 @@ RateConverter *makeRateConverter(st_rate_t inrate, st_rate_t outrate, bool stere } } // End of namespace Audio + |