diff options
author | Max Horn | 2009-03-04 07:31:31 +0000 |
---|---|---|
committer | Max Horn | 2009-03-04 07:31:31 +0000 |
commit | e783859d5c58546b05649c1eb92c6bdbf66b5bb2 (patch) | |
tree | a626fe0fe27bf2709785d87bb9dbe10d11870a43 /engines/sci/engine/scriptdebug.cpp | |
parent | edc6cc642a92116d3183b072e5a684e1e1410f37 (diff) | |
download | scummvm-rg350-e783859d5c58546b05649c1eb92c6bdbf66b5bb2.tar.gz scummvm-rg350-e783859d5c58546b05649c1eb92c6bdbf66b5bb2.tar.bz2 scummvm-rg350-e783859d5c58546b05649c1eb92c6bdbf66b5bb2.zip |
SCI: Replaced sfx_iterator_make_feed and associated code by Audio::makeLinearInputStream
svn-id: r39115
Diffstat (limited to 'engines/sci/engine/scriptdebug.cpp')
-rw-r--r-- | engines/sci/engine/scriptdebug.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp index 71ed439c07..965712ab68 100644 --- a/engines/sci/engine/scriptdebug.cpp +++ b/engines/sci/engine/scriptdebug.cpp @@ -41,6 +41,8 @@ #include "common/util.h" #include "common/savefile.h" +#include "sound/audiostream.h" + namespace Sci { extern int debug_sleeptime_factor; @@ -2411,7 +2413,7 @@ int c_simkey(EngineState *s) { static int c_is_sample(EngineState *s) { Resource *song = s->resmgr->findResource(kResourceTypeSound, cmd_params[0].val, 0); song_iterator_t *songit; - sfx_pcm_feed_t *data; + Audio::AudioStream *data; if (!song) { sciprintf("Not a sound resource.\n"); @@ -2426,9 +2428,11 @@ static int c_is_sample(EngineState *s) { } if ((data = songit->get_pcm_feed(songit))) { +/* sciprintf("\nIs sample (encoding %dHz/%s/%04x).\n", data->conf.rate, (data->conf.stereo) ? ((data->conf.stereo == SFX_PCM_STEREO_LR) ? "stereo-LR" : "stereo-RL") : "mono", data->conf.format); - data->destroy(data); +*/ + delete data; } else sciprintf("Valid song, but not a sample.\n"); |