[Scummvm-cvs-logs] scummvm master -> 72101c66fac7f3d313e8a5702ba61fd5f47acc0b

[clone2727]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c38beb0ced AUDIO: Remove default makeADPCMStream rate/channels values
72101c66fa AUDIO: Cleanup naming


Commit: c38beb0cedbad38773ffcdd75a382efe1633ed0b
    https://github.com/scummvm/scummvm/commit/c38beb0cedbad38773ffcdd75a382efe1633ed0b
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2013-04-20T11:54:41-07:00

Commit Message:
AUDIO: Remove default makeADPCMStream rate/channels values

Changed paths:
    audio/decoders/adpcm.h



diff --git a/audio/decoders/adpcm.h b/audio/decoders/adpcm.h
index ac8d529..2880262 100644
--- a/audio/decoders/adpcm.h
+++ b/audio/decoders/adpcm.h
@@ -77,8 +77,8 @@ RewindableAudioStream *makeADPCMStream(
     Common::SeekableReadStream *stream,
     DisposeAfterUse::Flag disposeAfterUse,
     uint32 size, typesADPCM type,
-    int rate = 22050,
-    int channels = 2,
+    int rate,
+    int channels,
     uint32 blockAlign = 0);
 
 } // End of namespace Audio


Commit: 72101c66fac7f3d313e8a5702ba61fd5f47acc0b
    https://github.com/scummvm/scummvm/commit/72101c66fac7f3d313e8a5702ba61fd5f47acc0b
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2013-04-20T12:18:09-07:00

Commit Message:
AUDIO: Cleanup naming

Changed paths:
    audio/decoders/adpcm.cpp
    audio/decoders/adpcm.h



diff --git a/audio/decoders/adpcm.cpp b/audio/decoders/adpcm.cpp
index f069ee3..61b0aba 100644
--- a/audio/decoders/adpcm.cpp
+++ b/audio/decoders/adpcm.cpp
@@ -433,7 +433,7 @@ int16 Ima_ADPCMStream::decodeIMA(byte code, int channel) {
 	return samp;
 }
 
-RewindableAudioStream *makeADPCMStream(Common::SeekableReadStream *stream, DisposeAfterUse::Flag disposeAfterUse, uint32 size, typesADPCM type, int rate, int channels, uint32 blockAlign) {
+RewindableAudioStream *makeADPCMStream(Common::SeekableReadStream *stream, DisposeAfterUse::Flag disposeAfterUse, uint32 size, ADPCMType type, int rate, int channels, uint32 blockAlign) {
 	// If size is 0, report the entire size of the stream
 	if (!size)
 		size = stream->size();
diff --git a/audio/decoders/adpcm.h b/audio/decoders/adpcm.h
index 2880262..d3c4657 100644
--- a/audio/decoders/adpcm.h
+++ b/audio/decoders/adpcm.h
@@ -51,7 +51,7 @@ class RewindableAudioStream;
 // http://wiki.multimedia.cx/index.php?title=Category:ADPCM_Audio_Codecs
 // Usually, if the audio stream we're trying to play has the FourCC header
 // string intact, it's easy to discern which encoding is used
-enum typesADPCM {
+enum ADPCMType {
 	kADPCMOki,                 // Dialogic/Oki ADPCM (aka VOX)
 	kADPCMMSIma,               // Microsoft IMA ADPCM
 	kADPCMMS,                  // Microsoft ADPCM
@@ -76,7 +76,7 @@ enum typesADPCM {
 RewindableAudioStream *makeADPCMStream(
     Common::SeekableReadStream *stream,
     DisposeAfterUse::Flag disposeAfterUse,
-    uint32 size, typesADPCM type,
+    uint32 size, ADPCMType type,
     int rate,
     int channels,
     uint32 blockAlign = 0);