From 030e4d06088cb75e871f1373b662d14262fbfc93 Mon Sep 17 00:00:00 2001 From: Matthew Hoops Date: Mon, 9 Jun 2014 20:35:40 -0400 Subject: AUDIO: Make Rewindable- and SeekableAudioStream inherit virtually --- audio/audiostream.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'audio') 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. -- cgit v1.2.3