Make sure the recording thread in sf::SoundRecorder is stopped before sf::SoundBufferRecorder is destroyed.

Fixes a "pure virtual method called" crash.
Also updated the documentation and the VoIP example.
This commit is contained in:
Maximilian Wagenbach 2015-10-02 14:49:00 +02:00 committed by Lukas Dürrenberger
parent e00d160224
commit 1ee6d1dbc6
5 changed files with 54 additions and 10 deletions

View file

@ -32,6 +32,14 @@
namespace sf
{
////////////////////////////////////////////////////////////
SoundBufferRecorder::~SoundBufferRecorder()
{
// Make sure to stop the recording thread
stop();
}
////////////////////////////////////////////////////////////
bool SoundBufferRecorder::onStart()
{

View file

@ -31,6 +31,7 @@
#include <SFML/System/Sleep.hpp>
#include <SFML/System/Err.hpp>
#include <cstring>
#include <cassert>
#ifdef _MSC_VER
#pragma warning(disable: 4355) // 'this' used in base member initializer list
@ -59,7 +60,12 @@ m_deviceName (getDefaultDevice())
////////////////////////////////////////////////////////////
SoundRecorder::~SoundRecorder()
{
// Nothing to do
// This assertion is triggered if the recording is still running while
// the object is destroyed. It ensures that stop() is called in the
// destructor of the derived class, which makes sure that the recording
// thread finishes before the derived object is destroyed. Otherwise a
// "pure virtual method called" exception is triggered.
assert(!m_isCapturing && "You must call stop() in the destructor of your derived class, so that the recording thread finishes before your object is destroyed.");
}
@ -114,12 +120,15 @@ bool SoundRecorder::start(unsigned int sampleRate)
////////////////////////////////////////////////////////////
void SoundRecorder::stop()
{
// Stop the capturing thread
m_isCapturing = false;
m_thread.wait();
// Stop the capturing thread if there is one
if (m_isCapturing)
{
m_isCapturing = false;
m_thread.wait();
// Notify derived class
onStop();
// Notify derived class
onStop();
}
}