From 2429755bf1daa4ddad0cae74171cf5ef41c71703 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Sat, 17 Mar 2012 03:20:43 -0700 Subject: [PATCH] Make the sound's Play method return void --- apps/openmw/mwsound/openal_output.cpp | 6 ++---- apps/openmw/mwsound/sound.hpp | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/apps/openmw/mwsound/openal_output.cpp b/apps/openmw/mwsound/openal_output.cpp index 7668dcac2..246fce7e1 100644 --- a/apps/openmw/mwsound/openal_output.cpp +++ b/apps/openmw/mwsound/openal_output.cpp @@ -66,7 +66,7 @@ public: OpenAL_SoundStream(std::auto_ptr decoder); virtual ~OpenAL_SoundStream(); - virtual bool Play(); + virtual void Play(); virtual void Stop(); virtual bool isPlaying(); }; @@ -116,7 +116,7 @@ OpenAL_SoundStream::~OpenAL_SoundStream() Decoder->Close(); } -bool OpenAL_SoundStream::Play() +void OpenAL_SoundStream::Play() { std::vector data(BufferSize); @@ -135,8 +135,6 @@ bool OpenAL_SoundStream::Play() alSourceQueueBuffers(Source, NumBuffers, Buffers); alSourcePlay(Source); throwALerror(); - - return true; } void OpenAL_SoundStream::Stop() diff --git a/apps/openmw/mwsound/sound.hpp b/apps/openmw/mwsound/sound.hpp index 9d262416e..5ffb48820 100644 --- a/apps/openmw/mwsound/sound.hpp +++ b/apps/openmw/mwsound/sound.hpp @@ -7,7 +7,7 @@ namespace MWSound { class Sound { - virtual bool Play() = 0; + virtual void Play() = 0; virtual void Stop() = 0; virtual bool isPlaying() = 0;