aboutsummaryrefslogtreecommitdiff
path: root/sound/audiostream.h
diff options
context:
space:
mode:
authorNicola Mettifogo2007-09-19 08:40:12 +0000
committerNicola Mettifogo2007-09-19 08:40:12 +0000
commit258901bab96f0050385a9912c8ea0fe2a41b2d6f (patch)
treea3ae8675b679c9f3b58ac8d97c79369502ea23c1 /sound/audiostream.h
parenta89694c0d61a75a960f5bec6c498659c988401cc (diff)
downloadscummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.tar.gz
scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.tar.bz2
scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.zip
Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.
svn-id: r28966
Diffstat (limited to 'sound/audiostream.h')
-rw-r--r--sound/audiostream.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/audiostream.h b/sound/audiostream.h
index f3791500f4..05c7257a21 100644
--- a/sound/audiostream.h
+++ b/sound/audiostream.h
@@ -26,7 +26,6 @@
#ifndef SOUND_AUDIOSTREAM_H
#define SOUND_AUDIOSTREAM_H
-#include "common/stdafx.h"
#include "common/util.h"
#include "common/scummsys.h"
@@ -87,7 +86,7 @@ public:
* In case of an error, the file handle will be closed, but deleting
* it is still the responsibilty of the caller.
* @param basename a filename without an extension
- * @param startTime the (optional) time offset in milliseconds from which to start playback
+ * @param startTime the (optional) time offset in milliseconds from which to start playback
* @param duration the (optional) time in milliseconds specifying how long to play
* @param numLoops how often the data shall be looped (0 = infinite)
* @return an Audiostream ready to use in case of success;
@@ -111,7 +110,7 @@ AudioStream *makeLinearInputStream(const byte *ptr, uint32 len, int rate, byte f
*/
class AppendableAudioStream : public Audio::AudioStream {
public:
-
+
/**
* Queue another audio data buffer for playback. The stream
* will playback all queued buffers, in the order they were
@@ -120,7 +119,7 @@ public:
* with new[], not with malloc).
*/
virtual void queueBuffer(byte *data, uint32 size) = 0;
-
+
/**
* Mark the stream as finished, that is, signal that no further data
* will be appended to it. Only after this has been done can the