diff options
| author | Matthew Hoops | 2014-06-09 20:35:40 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2015-08-30 19:53:53 -0400 |
| commit | 030e4d06088cb75e871f1373b662d14262fbfc93 (patch) | |
| tree | 1b2db83cfac8dd00056435058c830afb0ccba468 /audio/audiostream.h | |
| parent | 62973836e1ec7b32a9425fd65e976416d6b5e320 (diff) | |
| download | scummvm-rg350-030e4d06088cb75e871f1373b662d14262fbfc93.tar.gz scummvm-rg350-030e4d06088cb75e871f1373b662d14262fbfc93.tar.bz2 scummvm-rg350-030e4d06088cb75e871f1373b662d14262fbfc93.zip | |
AUDIO: Make Rewindable- and SeekableAudioStream inherit virtually
Diffstat (limited to 'audio/audiostream.h')
| -rw-r--r-- | audio/audiostream.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/audiostream.h b/audio/audiostream.h index 347a37b9dc..840a25abda 100644 --- a/audio/audiostream.h +++ b/audio/audiostream.h @@ -86,7 +86,7 @@ public: * to its initial state. Note that rewinding itself is not required to * be working when the stream is being played by Mixer! */ -class RewindableAudioStream : public AudioStream { +class RewindableAudioStream : public virtual AudioStream { public: /** * Rewinds the stream to its start. @@ -153,7 +153,7 @@ AudioStream *makeLoopingAudioStream(RewindableAudioStream *stream, uint loops); * interface for seeking. The seeking itself is not required to be * working while the stream is being played by Mixer! */ -class SeekableAudioStream : public RewindableAudioStream { +class SeekableAudioStream : public virtual RewindableAudioStream { public: /** * Tries to load a file by trying all available formats. |