diff options
author | James Brown | 2002-04-19 15:02:16 +0000 |
---|---|---|
committer | James Brown | 2002-04-19 15:02:16 +0000 |
commit | 82192a31723097ecf0cc305589605d23d3b01e4c (patch) | |
tree | f7a6d769421927a3fabf818ff66b637dc9212d9d /sound | |
parent | a7becf8ae1c6ff1727f349d114db37a1e9965453 (diff) | |
download | scummvm-rg350-82192a31723097ecf0cc305589605d23d3b01e4c.tar.gz scummvm-rg350-82192a31723097ecf0cc305589605d23d3b01e4c.tar.bz2 scummvm-rg350-82192a31723097ecf0cc305589605d23d3b01e4c.zip |
Fix PocketSCUMM. Palette is wrong tho. BBrox is a genius.
svn-id: r4009
Diffstat (limited to 'sound')
-rw-r--r-- | sound/mixer.cpp | 1 | ||||
-rw-r--r-- | sound/mixer.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/sound/mixer.cpp b/sound/mixer.cpp index 6b1589b002..1a84590f6a 100644 --- a/sound/mixer.cpp +++ b/sound/mixer.cpp @@ -66,6 +66,7 @@ void SoundMixer::on_generate_samples(void *s, byte *samples, int len) { } bool SoundMixer::bind_to_system(OSystem *syst) { + //_volume_table = (int16*)malloc(256 * sizeof(int16)); _volume_table = (int16*)calloc(256*sizeof(int16),1); uint rate = (uint)syst->property(OSystem::PROP_GET_SAMPLE_RATE, 0); diff --git a/sound/mixer.h b/sound/mixer.h index e455e03d0e..df3b0eea64 100644 --- a/sound/mixer.h +++ b/sound/mixer.h @@ -6,7 +6,6 @@ #endif typedef uint32 PlayingSoundHandle; - class SoundMixer { private: class Channel { @@ -190,5 +189,4 @@ struct MixerChannel { /* Mixer Channel */ }; #endif - #endif /* _mixer_h_included */ |