[Scummvm-cvs-logs] SF.net SVN: scummvm:[47714] scummvm/trunk/sound/decoders

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Sat Jan 30 16:18:25 CET 2010


Revision: 47714
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47714&view=rev
Author:   lordhoto
Date:     2010-01-30 15:18:25 +0000 (Sat, 30 Jan 2010)

Log Message:
-----------
Add a factory which plays audio from a buffer via RawDiskStream.

Modified Paths:
--------------
    scummvm/trunk/sound/decoders/raw.cpp
    scummvm/trunk/sound/decoders/raw.h

Modified: scummvm/trunk/sound/decoders/raw.cpp
===================================================================
--- scummvm/trunk/sound/decoders/raw.cpp	2010-01-30 15:17:57 UTC (rev 47713)
+++ scummvm/trunk/sound/decoders/raw.cpp	2010-01-30 15:18:25 UTC (rev 47714)
@@ -426,6 +426,12 @@
 	return makeRawStream(stream, blocks, rate, flags, disposeAfterUse);
 }
 
+SeekableAudioStream *makeRawStream(const byte *buffer, uint32 size,
+                                   int rate, byte flags,
+                                   DisposeAfterUse::Flag disposeAfterUse) {
+	return makeRawStream(new Common::MemoryReadStream(buffer, size, disposeAfterUse), rate, flags, DisposeAfterUse::YES);
+}
+
 SeekableAudioStream *makeRawDiskStream_OLD(Common::SeekableReadStream *stream, RawDiskStreamAudioBlock *block, int numBlocks,
                                        int rate, byte flags, DisposeAfterUse::Flag disposeStream) {
 	assert(numBlocks > 0);

Modified: scummvm/trunk/sound/decoders/raw.h
===================================================================
--- scummvm/trunk/sound/decoders/raw.h	2010-01-30 15:17:57 UTC (rev 47713)
+++ scummvm/trunk/sound/decoders/raw.h	2010-01-30 15:18:25 UTC (rev 47714)
@@ -118,10 +118,24 @@
 typedef Common::List<RawDiskStreamAudioBlock> RawStreamBlockList;
 
 /**
+ * Creates an audio stream, which plays from the given buffer.
+ *
+ * @param buffer Buffer to play from.
+ * @param size   Size of the buffer in bytes.
+ * @param rate   Rate of the sound data.
+ * @param flags  Audio flags combination.
+ * @see RawFlags
+ * @param disposeAfterUse Whether to free the buffer after use (with free!).
+ * @return The new SeekableAudioStream (or 0 on failure).
+ */
+SeekableAudioStream *makeRawStream(const byte *buffer, uint32 size,
+                                   int rate, byte flags,
+                                   DisposeAfterUse::Flag disposeAfterUse = DisposeAfterUse::YES);
+
+/**
  * Creates an audio stream, which plays from the given stream.
  *
  * @param stream Stream object to play from.
- * @param size   Size of the buffer.
  * @param rate   Rate of the sound data.
  * @param flags  Audio flags combination.
  * @see RawFlags


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list