diff options
| author | Norbert Lange | 2009-07-17 21:23:54 +0000 | 
|---|---|---|
| committer | Norbert Lange | 2009-07-17 21:23:54 +0000 | 
| commit | bb64bf008d03e01760a468d0df8cacb164725d41 (patch) | |
| tree | d73710df5b07f3fa1ca30e719c1c1f58ebe0b107 /sound/shorten.cpp | |
| parent | 81ac29ebca30c352646a5b21de512087cb96a672 (diff) | |
| parent | 53756ef1d022a959b24c041e18f55eef34e60dd3 (diff) | |
| download | scummvm-rg350-bb64bf008d03e01760a468d0df8cacb164725d41.tar.gz scummvm-rg350-bb64bf008d03e01760a468d0df8cacb164725d41.tar.bz2 scummvm-rg350-bb64bf008d03e01760a468d0df8cacb164725d41.zip | |
merge with trunk
svn-id: r42574
Diffstat (limited to 'sound/shorten.cpp')
| -rw-r--r-- | sound/shorten.cpp | 8 | 
1 files changed, 7 insertions, 1 deletions
| diff --git a/sound/shorten.cpp b/sound/shorten.cpp index b550a5afec..e8066a49be 100644 --- a/sound/shorten.cpp +++ b/sound/shorten.cpp @@ -23,6 +23,10 @@   *   */ +#include "sound/shorten.h" + +#ifdef SOUND_SHORTEN_H +  // Based on etree's Shorten tool, version 3.6.1  // http://etree.org/shnutils/shorten/ @@ -32,7 +36,6 @@  #include "common/util.h"  #include "common/stream.h" -#include "sound/shorten.h"  #include "sound/audiostream.h"  #include "sound/mixer.h" @@ -526,3 +529,6 @@ AudioStream *makeShortenStream(Common::SeekableReadStream &stream) {  }  } // End of namespace Audio + +#endif // defined(SOUND_SHORTEN_H) + | 
