summaryrefslogtreecommitdiff
path: root/apps/codecs
diff options
context:
space:
mode:
authorAndree Buschmann <AndreeBuschmann@t-online.de>2010-02-07 18:38:47 +0000
committerAndree Buschmann <AndreeBuschmann@t-online.de>2010-02-07 18:38:47 +0000
commit4d5e88245a3aa6ff80df63c5a145b2b41495cbb2 (patch)
tree787e6cc5223ae0df55ecde940debc173cde2d12c /apps/codecs
parentbd0b7363ca28d3202338bb5f434b89f8d08a5e2b (diff)
Remove more tabs
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24550 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs')
-rw-r--r--apps/codecs/adx.c92
-rw-r--r--apps/codecs/mpa.c4
-rw-r--r--apps/codecs/sid.c26
-rw-r--r--apps/codecs/vorbis.c6
4 files changed, 64 insertions, 64 deletions
diff --git a/apps/codecs/adx.c b/apps/codecs/adx.c
index 0e50054753..fe32653b18 100644
--- a/apps/codecs/adx.c
+++ b/apps/codecs/adx.c
@@ -147,45 +147,45 @@ next_track:
/* Soul Calibur 2 style (type 03) */
DEBUGF("ADX: type 03 found\n");
/* check if header is too small for loop data */
- if (chanstart-6 < 0x2c) looping=0;
- else {
- looping = (buf[0x18]) ||
- (buf[0x19]) ||
- (buf[0x1a]) ||
- (buf[0x1b]);
- end_adr = (buf[0x28]<<24) |
- (buf[0x29]<<16) |
- (buf[0x2a]<<8) |
- (buf[0x2b]);
-
- start_adr = (
- (buf[0x1c]<<24) |
- (buf[0x1d]<<16) |
- (buf[0x1e]<<8) |
- (buf[0x1f])
- )/32*channels*18+chanstart;
- }
+ if (chanstart-6 < 0x2c) looping=0;
+ else {
+ looping = (buf[0x18]) ||
+ (buf[0x19]) ||
+ (buf[0x1a]) ||
+ (buf[0x1b]);
+ end_adr = (buf[0x28]<<24) |
+ (buf[0x29]<<16) |
+ (buf[0x2a]<<8) |
+ (buf[0x2b]);
+
+ start_adr = (
+ (buf[0x1c]<<24) |
+ (buf[0x1d]<<16) |
+ (buf[0x1e]<<8) |
+ (buf[0x1f])
+ )/32*channels*18+chanstart;
+ }
} else if (!memcmp(buf+0x10,"\x01\xF4\x04\x00",4)) {
/* Standard (type 04) */
DEBUGF("ADX: type 04 found\n");
/* check if header is too small for loop data */
if (chanstart-6 < 0x38) looping=0;
- else {
- looping = (buf[0x24]) ||
- (buf[0x25]) ||
- (buf[0x26]) ||
- (buf[0x27]);
- end_adr = (buf[0x34]<<24) |
- (buf[0x35]<<16) |
- (buf[0x36]<<8) |
- buf[0x37];
- start_adr = (
- (buf[0x28]<<24) |
- (buf[0x29]<<16) |
- (buf[0x2a]<<8) |
- (buf[0x2b])
- )/32*channels*18+chanstart;
- }
+ else {
+ looping = (buf[0x24]) ||
+ (buf[0x25]) ||
+ (buf[0x26]) ||
+ (buf[0x27]);
+ end_adr = (buf[0x34]<<24) |
+ (buf[0x35]<<16) |
+ (buf[0x36]<<8) |
+ buf[0x37];
+ start_adr = (
+ (buf[0x28]<<24) |
+ (buf[0x29]<<16) |
+ (buf[0x2a]<<8) |
+ (buf[0x2b])
+ )/32*channels*18+chanstart;
+ }
} else {
DEBUGF("ADX: error, couldn't determine ADX type\n");
return CODEC_ERROR;
@@ -305,10 +305,10 @@ next_track:
d = (buf[i] >> 4) & 15;
if (d & 8) d-= 16;
ch1_0 = d*scale + ((coef1*ch1_1 + coef2*ch1_2) >> 12);
- if (ch1_0 > 32767) ch1_0 = 32767;
+ if (ch1_0 > 32767) ch1_0 = 32767;
else if (ch1_0 < -32768) ch1_0 = -32768;
- samples[sampleswritten] = ch1_0;
- sampleswritten+=channels;
+ samples[sampleswritten] = ch1_0;
+ sampleswritten+=channels;
ch1_2 = ch1_1; ch1_1 = ch1_0;
d = buf[i] & 15;
@@ -316,9 +316,9 @@ next_track:
ch1_0 = d*scale + ((coef1*ch1_1 + coef2*ch1_2) >> 12);
if (ch1_0 > 32767) ch1_0 = 32767;
else if (ch1_0 < -32768) ch1_0 = -32768;
- samples[sampleswritten] = ch1_0;
- sampleswritten+=channels;
- ch1_2 = ch1_1; ch1_1 = ch1_0;
+ samples[sampleswritten] = ch1_0;
+ sampleswritten+=channels;
+ ch1_2 = ch1_1; ch1_1 = ch1_0;
}
bufoff+=18;
ci->advance_buffer(18);
@@ -345,10 +345,10 @@ next_track:
d = (buf[i] >> 4) & 15;
if (d & 8) d-= 16;
ch2_0 = d*scale + ((coef1*ch2_1 + coef2*ch2_2) >> 12);
- if (ch2_0 > 32767) ch2_0 = 32767;
+ if (ch2_0 > 32767) ch2_0 = 32767;
else if (ch2_0 < -32768) ch2_0 = -32768;
- samples[sampleswritten] = ch2_0;
- sampleswritten+=2;
+ samples[sampleswritten] = ch2_0;
+ sampleswritten+=2;
ch2_2 = ch2_1; ch2_1 = ch2_0;
d = buf[i] & 15;
@@ -356,9 +356,9 @@ next_track:
ch2_0 = d*scale + ((coef1*ch2_1 + coef2*ch2_2) >> 12);
if (ch2_0 > 32767) ch2_0 = 32767;
else if (ch2_0 < -32768) ch2_0 = -32768;
- samples[sampleswritten] = ch2_0;
- sampleswritten+=2;
- ch2_2 = ch2_1; ch2_1 = ch2_0;
+ samples[sampleswritten] = ch2_0;
+ sampleswritten+=2;
+ ch2_2 = ch2_1; ch2_1 = ch2_0;
}
bufoff+=18;
ci->advance_buffer(18);
diff --git a/apps/codecs/mpa.c b/apps/codecs/mpa.c
index f248744c50..2fa7d02bbd 100644
--- a/apps/codecs/mpa.c
+++ b/apps/codecs/mpa.c
@@ -278,12 +278,12 @@ static void mad_synth_thread_quit(void)
#else
static inline void mad_synth_thread_ready(void)
{
- mad_synth_frame(&synth, &frame);
+ mad_synth_frame(&synth, &frame);
}
static inline bool mad_synth_thread_create(void)
{
- return true;
+ return true;
}
static inline void mad_synth_thread_quit(void)
diff --git a/apps/codecs/sid.c b/apps/codecs/sid.c
index c00aa22142..318cd1b4c8 100644
--- a/apps/codecs/sid.c
+++ b/apps/codecs/sid.c
@@ -179,7 +179,7 @@ unsigned char memory[65536];
/* ----------------------------------------- Variables for sample stuff */
static int sample_active IDATA_ATTR;
static int sample_position, sample_start, sample_end, sample_repeat_start IDATA_ATTR;
-static int fracPos IDATA_ATTR; /* Fractal position of sample */
+static int fracPos IDATA_ATTR; /* Fractal position of sample */
static int sample_period IDATA_ATTR;
static int sample_repeats IDATA_ATTR;
static int sample_order IDATA_ATTR;
@@ -278,18 +278,18 @@ static inline int GenerateDigi(int sIn)
if ((sample_position < sample_end) && (sample_position >= sample_start))
{
sIn += sample;
-
+
fracPos += 985248/sample_period;
-
+
if (fracPos > mixing_frequency)
{
fracPos%=mixing_frequency;
- last_sample = sample;
-
- // N�hstes Samples holen
+ last_sample = sample;
+
+ // N�hstes Samples holen
if (sample_order == 0) {
- sample_nibble++; // Nähstes Sample-Nibble
+ sample_nibble++; // Nähstes Sample-Nibble
if (sample_nibble==2) {
sample_nibble = 0;
sample_position++;
@@ -301,24 +301,24 @@ static inline int GenerateDigi(int sIn)
sample_nibble=1;
sample_position++;
}
- }
+ }
if (sample_repeats)
{
if (sample_position > sample_end)
{
sample_repeats--;
sample_position = sample_repeat_start;
- }
+ }
else sample_active = 0;
}
-
+
sample = memory[sample_position&0xffff];
- if (sample_nibble==1) // Hi-Nibble holen?
+ if (sample_nibble==1) // Hi-Nibble holen?
sample = (sample & 0xf0)>>4;
else sample = sample & 0x0f;
sample -= 7;
- sample <<= 10;
+ sample <<= 10;
}
}
@@ -1282,7 +1282,7 @@ next_track:
/* Find out if cia timing is used and how many samples
have to be calculated for each cpujsr */
- int nRefreshCIA = (int)(20000*(memory[0xdc04]|(memory[0xdc05]<<8))/0x4c00);
+ int nRefreshCIA = (int)(20000*(memory[0xdc04]|(memory[0xdc05]<<8))/0x4c00);
if ((nRefreshCIA==0) || (song_speed == 0))
nRefreshCIA = 20000;
nSamplesPerCall = mixing_frequency*nRefreshCIA/1000000;
diff --git a/apps/codecs/vorbis.c b/apps/codecs/vorbis.c
index 7e078139ce..831021fe70 100644
--- a/apps/codecs/vorbis.c
+++ b/apps/codecs/vorbis.c
@@ -163,9 +163,9 @@ next_track:
* get here.
*/
if (!error) {
- ogg_free(vf.offsets);
- ogg_free(vf.dataoffsets);
- ogg_free(vf.serialnos);
+ ogg_free(vf.offsets);
+ ogg_free(vf.dataoffsets);
+ ogg_free(vf.serialnos);
vf.offsets = vf_offsets;
vf.dataoffsets = &vf_dataoffsets;