diff options
author | Max Horn | 2010-07-05 20:36:11 +0000 |
---|---|---|
committer | Max Horn | 2010-07-05 20:36:11 +0000 |
commit | 429de8f6efc3d3dcbbdfbc9f7eb53d2d096ca925 (patch) | |
tree | cc94d2427cc629bd6b2047c6289c58b844efb5e9 /backends/platform/ds/arm9/source/cdaudio.cpp | |
parent | cffcc3d9360dbbadec4a3e18c3b6ca64dfc27995 (diff) | |
download | scummvm-rg350-429de8f6efc3d3dcbbdfbc9f7eb53d2d096ca925.tar.gz scummvm-rg350-429de8f6efc3d3dcbbdfbc9f7eb53d2d096ca925.tar.bz2 scummvm-rg350-429de8f6efc3d3dcbbdfbc9f7eb53d2d096ca925.zip |
DS: More formating, made more vars static
svn-id: r50708
Diffstat (limited to 'backends/platform/ds/arm9/source/cdaudio.cpp')
-rw-r--r-- | backends/platform/ds/arm9/source/cdaudio.cpp | 74 |
1 files changed, 29 insertions, 45 deletions
diff --git a/backends/platform/ds/arm9/source/cdaudio.cpp b/backends/platform/ds/arm9/source/cdaudio.cpp index a5d38cb7e4..5860dea4f2 100644 --- a/backends/platform/ds/arm9/source/cdaudio.cpp +++ b/backends/platform/ds/arm9/source/cdaudio.cpp @@ -328,45 +328,30 @@ void decompressBlock() { int offset = 0; switch (7 - (r & 0x0007)) { - case 0: { - offset = (word & 0xF0000000) >> 28; - break; - } - - case 1: { - offset = (word & 0x0F000000) >> 24; - break; - } - - case 2: { - offset = (word & 0x00F00000) >> 20; - break; - } - - case 3: { - offset = (word & 0x000F0000) >> 16; - break; - } - - case 4: { - offset = (word & 0x0000F000) >> 12; - break; - } - - case 5: { - offset = (word & 0x00000F00) >> 8; - break; - } - - case 6: { - offset = (word & 0x000000F0) >> 4; - break; - } - - case 7: { - offset = (word & 0x0000000F); - break; - } + case 0: + offset = (word & 0xF0000000) >> 28; + break; + case 1: + offset = (word & 0x0F000000) >> 24; + break; + case 2: + offset = (word & 0x00F00000) >> 20; + break; + case 3: + offset = (word & 0x000F0000) >> 16; + break; + case 4: + offset = (word & 0x0000F000) >> 12; + break; + case 5: + offset = (word & 0x00000F00) >> 8; + break; + case 6: + offset = (word & 0x000000F0) >> 4; + break; + case 7: + offset = (word & 0x0000000F); + break; } int diff = 0; @@ -409,7 +394,8 @@ void decompressBlock() { } void playNextBlock() { - if (!isPlayingFlag) return; + if (!isPlayingFlag) + return; int lastBlockId = -1; while (IPC->adpcm.semaphore); // Wait for buffer to become free if needed @@ -445,9 +431,6 @@ void playNextBlock() { // DC_FlushAll(); } - - - } @@ -463,7 +446,8 @@ void playNextBlock() { } void stopTrack() { - if (!isPlayingFlag) return; + if (!isPlayingFlag) + return; DS::std_fclose(s_file); @@ -473,7 +457,7 @@ void stopTrack() { audioBuffer[r] = 0; } - for (int r= 0; r < waveHeader.fmtExtra; r++) { + for (int r = 0; r < waveHeader.fmtExtra; r++) { decompressionBuffer[r] = 0; } // DS::stopSound(1); |