aboutsummaryrefslogtreecommitdiff
path: root/engines/teenagent/music.cpp
diff options
context:
space:
mode:
authorMax Horn2009-09-15 08:54:06 +0000
committerMax Horn2009-09-15 08:54:06 +0000
commita8e5df433f5ea5c51c612a8962894add46f239e8 (patch)
treeacd245985f82e1d105f3e1106befbd6af0b0b432 /engines/teenagent/music.cpp
parent9369d6b772f0a97ffca7639ba22fa07eee03549a (diff)
downloadscummvm-rg350-a8e5df433f5ea5c51c612a8962894add46f239e8.tar.gz
scummvm-rg350-a8e5df433f5ea5c51c612a8962894add46f239e8.tar.bz2
scummvm-rg350-a8e5df433f5ea5c51c612a8962894add46f239e8.zip
TEEN: More code formatting & whitespace changes (automatically generated with astyle)
svn-id: r44101
Diffstat (limited to 'engines/teenagent/music.cpp')
-rw-r--r--engines/teenagent/music.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/teenagent/music.cpp b/engines/teenagent/music.cpp
index ad950165fa..b01dd5ac46 100644
--- a/engines/teenagent/music.cpp
+++ b/engines/teenagent/music.cpp
@@ -46,11 +46,11 @@ bool MusicPlayer::load(int id) {
Common::SeekableReadStream *stream = res->mmm.getStream(id);
if (stream == NULL)
return false;
-
+
char header[4];
stream->read(header, 4);
- //check header?
-
+ //check header?
+
memset(_samples, 0, sizeof(_samples));
// Load the samples
@@ -67,14 +67,14 @@ bool MusicPlayer::load(int id) {
debug(0, "currSample = %d, sample = 0x%02x, resource: %d", currSample, sample, sampleResource);
uint32 sampleSize = res->sam_mmm.get_size(sampleResource);
Common::SeekableReadStream *in = res->sam_mmm.getStream(sampleResource);
-
+
if (in == 0) {
warning("load: invalid sample %d (0x%02x)", sample, sample);
_samples[sample].data = NULL;
_samples[sample].size = 0;
continue;
}
-
+
byte *sampleData = new byte[sampleSize];
in->read(sampleData, sampleSize);
@@ -90,7 +90,7 @@ bool MusicPlayer::load(int id) {
// Load the music data
_rows.clear();
-
+
Row row;
row.channels[0].sample = 0;
row.channels[1].sample = 0;
@@ -132,7 +132,7 @@ void MusicPlayer::stop() {
void MusicPlayer::interrupt() {
_currRow %= _rows.size();
-
+
Row *row = &_rows[_currRow];
for (int chn = 0; chn < 3; ++chn) {
setChannelVolume(chn, row->channels[chn].volume);