From 9d8874c7072709c3739efdad317454cdccf82683 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Sun, 24 Apr 2011 23:14:14 -0400
Subject: AUDIO: Cleanup MS IMA handling

- Split The Last Express' ADPCM to the engine. Using the MS IMA routine was really a hack.
- Fixed stereo MS IMA ADPCM, the old routine was completely wrong.
---
 audio/decoders/adpcm.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'audio/decoders/adpcm.h')

diff --git a/audio/decoders/adpcm.h b/audio/decoders/adpcm.h
index 7202d6bc9c..f6b424c463 100644
--- a/audio/decoders/adpcm.h
+++ b/audio/decoders/adpcm.h
@@ -56,7 +56,6 @@ class RewindableAudioStream;
 enum typesADPCM {
 	kADPCMOki,                 // Dialogic/Oki ADPCM (aka VOX)
 	kADPCMMSIma,               // Microsoft IMA ADPCM
-	kADPCMMSImaLastExpress,    // Microsoft IMA ADPCM (with inverted samples)
 	kADPCMMS,                  // Microsoft ADPCM
 	kADPCMDVI,                 // Intel DVI IMA ADPCM
 	kADPCMApple,               // Apple QuickTime IMA ADPCM
-- 
cgit v1.2.3


From cd6ee0589d0556d3d9e81d835c8b900636083de5 Mon Sep 17 00:00:00 2001
From: Ori Avtalion
Date: Mon, 25 Apr 2011 22:29:26 +0300
Subject: JANITORIAL: Format forward declarations to follow convention

---
 audio/decoders/adpcm.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'audio/decoders/adpcm.h')

diff --git a/audio/decoders/adpcm.h b/audio/decoders/adpcm.h
index f6b424c463..b0f0e9ee60 100644
--- a/audio/decoders/adpcm.h
+++ b/audio/decoders/adpcm.h
@@ -40,7 +40,9 @@
 #include "common/scummsys.h"
 #include "common/types.h"
 
-namespace Common { class SeekableReadStream; }
+namespace Common {
+class SeekableReadStream;
+}
 
 
 namespace Audio {
-- 
cgit v1.2.3


From 9414d7a6e287ff8abfb5746b564e92c8f0e6de58 Mon Sep 17 00:00:00 2001
From: Ori Avtalion
Date: Sun, 24 Apr 2011 11:34:27 +0300
Subject: JANITORIAL: Reduce header dependencies in shared code

Some backends may break as I only compiled SDL
---
 audio/decoders/adpcm.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'audio/decoders/adpcm.h')

diff --git a/audio/decoders/adpcm.h b/audio/decoders/adpcm.h
index b0f0e9ee60..10344101e2 100644
--- a/audio/decoders/adpcm.h
+++ b/audio/decoders/adpcm.h
@@ -47,7 +47,6 @@ class SeekableReadStream;
 
 namespace Audio {
 
-class AudioStream;
 class RewindableAudioStream;
 
 // There are several types of ADPCM encoding, only some are supported here
-- 
cgit v1.2.3