aboutsummaryrefslogtreecommitdiff
path: root/engines/gob/sound/sounddesc.h
diff options
context:
space:
mode:
Diffstat (limited to 'engines/gob/sound/sounddesc.h')
-rw-r--r--engines/gob/sound/sounddesc.h17
1 files changed, 8 insertions, 9 deletions
diff --git a/engines/gob/sound/sounddesc.h b/engines/gob/sound/sounddesc.h
index 83efd61e6d..9e5d20e138 100644
--- a/engines/gob/sound/sounddesc.h
+++ b/engines/gob/sound/sounddesc.h
@@ -30,18 +30,14 @@
namespace Gob {
+class Resource;
+
enum SoundType {
SOUND_SND,
SOUND_WAV,
SOUND_ADL
};
-enum SoundSource {
- SOUND_FILE,
- SOUND_TOT,
- SOUND_EXT
-};
-
class SoundDesc {
public:
int16 _repCount;
@@ -58,8 +54,11 @@ public:
bool isId(int16 id) const { return _dataPtr && (_id == id); }
- void set(SoundType type, SoundSource src, byte *data, uint32 dSize);
- bool load(SoundType type, SoundSource src, byte *data, uint32 dSize);
+ void set(SoundType type, byte *data, uint32 dSize);
+ void set(SoundType type, Resource *resource);
+ bool load(SoundType type, byte *data, uint32 dSize);
+ bool load(SoundType type, Resource *resource);
+
void free();
void convToSigned();
@@ -71,12 +70,12 @@ public:
~SoundDesc();
private:
+ Resource *_resource;
byte *_data;
byte *_dataPtr;
uint32 _size;
SoundType _type;
- SoundSource _source;
bool loadSND(byte *data, uint32 dSize);
bool loadWAV(byte *data, uint32 dSize);