aboutsummaryrefslogtreecommitdiff
path: root/engines/saga/sndres.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2010-01-27 08:40:48 +0000
committerFilippos Karapetis2010-01-27 08:40:48 +0000
commit8606982590bb3c124cc4d17fbe15aa722803201e (patch)
treee2d16e15b45418b5c898ac586da9cac2e2f05f58 /engines/saga/sndres.cpp
parent812603e29eef2bd0c224a9b3b4c2bf29b2d3b653 (diff)
downloadscummvm-rg350-8606982590bb3c124cc4d17fbe15aa722803201e.tar.gz
scummvm-rg350-8606982590bb3c124cc4d17fbe15aa722803201e.tar.bz2
scummvm-rg350-8606982590bb3c124cc4d17fbe15aa722803201e.zip
Moved the Shorten decoder inside the SAGA engine, as it's the only one using it (and it's still unfinished, too)
svn-id: r47592
Diffstat (limited to 'engines/saga/sndres.cpp')
-rw-r--r--engines/saga/sndres.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/saga/sndres.cpp b/engines/saga/sndres.cpp
index c4852f31c3..be65312963 100644
--- a/engines/saga/sndres.cpp
+++ b/engines/saga/sndres.cpp
@@ -37,12 +37,12 @@
#include "sound/audiostream.h"
#include "sound/decoders/adpcm.h"
#include "sound/decoders/aiff.h"
-#ifdef ENABLE_SAGA2
-#include "sound/decoders/shorten.h"
-#endif
#include "sound/decoders/raw.h"
#include "sound/decoders/voc.h"
#include "sound/decoders/wave.h"
+#ifdef ENABLE_SAGA2
+#include "saga/shorten.h"
+#endif
namespace Saga {
@@ -323,7 +323,7 @@ bool SndRes::load(ResourceContext *context, uint32 resourceId, SoundBuffer &buff
result = Audio::loadAIFFFromStream(readS, size, rate, buffer.flags);
#ifdef ENABLE_SAGA2
} else if (resourceType == kSoundShorten) {
- result = Audio::loadShortenFromStream(readS, size, rate, buffer.flags);
+ result = loadShortenFromStream(readS, size, rate, buffer.flags);
#endif
} else if (resourceType == kSoundVOC) {
data = Audio::loadVOCFromStream(readS, size, rate);