aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorNicola Mettifogo2007-10-15 20:20:50 +0000
committerNicola Mettifogo2007-10-15 20:20:50 +0000
commit485b70b2b004d2683e31920b8f33053b46fb811d (patch)
treeffe1833ff839d3a43dcefcec931e39ec15ec7ced /sound
parentdb19310ad106db774f752383fea54c8c3af26ebb (diff)
downloadscummvm-rg350-485b70b2b004d2683e31920b8f33053b46fb811d.tar.gz
scummvm-rg350-485b70b2b004d2683e31920b8f33053b46fb811d.tar.bz2
scummvm-rg350-485b70b2b004d2683e31920b8f33053b46fb811d.zip
* Changed IFF/8SVX audio to use signed data (int8), and modified Parallaction accordingly.
* Implemented proper beep in Parallaction for Amiga. svn-id: r29226
Diffstat (limited to 'sound')
-rw-r--r--sound/iff.cpp4
-rw-r--r--sound/iff.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/sound/iff.cpp b/sound/iff.cpp
index 7b6b38acb7..de380276bb 100644
--- a/sound/iff.cpp
+++ b/sound/iff.cpp
@@ -45,7 +45,7 @@ void A8SVXDecoder::readBODY(Common::IFFChunk &chunk) {
switch (_header.compression) {
case 0:
_dataSize = chunk.size;
- _data = (byte*)malloc(_dataSize);
+ _data = (int8*)malloc(_dataSize);
chunk.read(_data, _dataSize);
break;
@@ -57,7 +57,7 @@ void A8SVXDecoder::readBODY(Common::IFFChunk &chunk) {
}
-A8SVXDecoder::A8SVXDecoder(Common::ReadStream &input, Voice8Header &header, byte *&data, uint32 &dataSize) :
+A8SVXDecoder::A8SVXDecoder(Common::ReadStream &input, Voice8Header &header, int8 *&data, uint32 &dataSize) :
IFFParser(input), _header(header), _data(data), _dataSize(dataSize) {
if (_typeId != ID_8SVX)
error("unknown audio format");
diff --git a/sound/iff.h b/sound/iff.h
index 44831fe863..539064162d 100644
--- a/sound/iff.h
+++ b/sound/iff.h
@@ -54,7 +54,7 @@ class A8SVXDecoder : public Common::IFFParser {
protected:
Voice8Header &_header;
- byte* &_data;
+ int8* &_data;
uint32 &_dataSize;
protected:
@@ -62,7 +62,7 @@ protected:
void readBODY(Common::IFFChunk &chunk);
public:
- A8SVXDecoder(Common::ReadStream &input, Voice8Header &header, byte *&data, uint32 &dataSize);
+ A8SVXDecoder(Common::ReadStream &input, Voice8Header &header, int8 *&data, uint32 &dataSize);
void decode();
};