[Scummvm-cvs-logs] SF.net SVN: scummvm:[55564] scummvm/trunk/engines/gob/sound

drmccoy at users.sourceforge.net drmccoy at users.sourceforge.net
Thu Jan 27 14:27:29 CET 2011


Revision: 55564
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55564&view=rev
Author:   drmccoy
Date:     2011-01-27 13:27:29 +0000 (Thu, 27 Jan 2011)

Log Message:
-----------
GOB: Add SoundDesc::swap()

Modified Paths:
--------------
    scummvm/trunk/engines/gob/sound/sounddesc.cpp
    scummvm/trunk/engines/gob/sound/sounddesc.h

Modified: scummvm/trunk/engines/gob/sound/sounddesc.cpp
===================================================================
--- scummvm/trunk/engines/gob/sound/sounddesc.cpp	2011-01-27 13:27:04 UTC (rev 55563)
+++ scummvm/trunk/engines/gob/sound/sounddesc.cpp	2011-01-27 13:27:29 UTC (rev 55564)
@@ -53,6 +53,19 @@
 	free();
 }
 
+void SoundDesc::swap(SoundDesc &desc) {
+	SWAP(_repCount  , desc._repCount);
+	SWAP(_frequency , desc._frequency);
+	SWAP(_flag      , desc._flag);
+	SWAP(_id        , desc._id);
+	SWAP(_mixerFlags, desc._mixerFlags);
+	SWAP(_resource  , desc._resource);
+	SWAP(_data      , desc._data);
+	SWAP(_dataPtr   , desc._dataPtr);
+	SWAP(_size      , desc._size);
+	SWAP(_type      , desc._type);
+}
+
 void SoundDesc::set(SoundType type, byte *data, uint32 dSize) {
 	free();
 

Modified: scummvm/trunk/engines/gob/sound/sounddesc.h
===================================================================
--- scummvm/trunk/engines/gob/sound/sounddesc.h	2011-01-27 13:27:04 UTC (rev 55563)
+++ scummvm/trunk/engines/gob/sound/sounddesc.h	2011-01-27 13:27:29 UTC (rev 55564)
@@ -46,6 +46,11 @@
 	int16 _id;
 	byte _mixerFlags;
 
+	SoundDesc();
+	~SoundDesc();
+
+	void swap(SoundDesc &desc);
+
 	byte *getData() { return _dataPtr; }
 
 	uint32    size()         const { return _size;     }
@@ -66,9 +71,6 @@
 	int16 calcFadeOutLength(int16 frequency);
 	uint32 calcLength(int16 repCount, int16 frequency, bool fade);
 
-	SoundDesc();
-	~SoundDesc();
-
 private:
 	Resource *_resource;
 	byte *_data;


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