hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

ProjectRenderer: lock Mixer while calling Song::{start,stop}Export()

Browse Source 
We have to lock Mixer when touching Song's state via Song::startExport()
and Song::stopExport() in ProjectRenderer::run() as the FIFO writer
thread may call Mixer::renderNextBuffer() (which calls Song::doActions())
simultaneously. Fixes a random segfault when exporting project.

This was a new bug as the ProjectRenderer does not operate FIFO-less
anymore.
This commit is contained in:
Tobias Doerffel
2009-11-29 23:57:30 +01:00
parent c9802d8a26
commit 9bb3ab5f16
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/Mixer.cpp
View File

@@ -495,8 +495,7 @@ sampleFrameA * Mixer::renderNextBuffer()
MicroTimer timer;
static song::playPos last_metro_pos = -1;
song::playPos p = engine::getSong()->getPlayPos(
song::Mode_PlayPattern );
song::playPos p = engine::getSong()->getPlayPos( song::Mode_PlayPattern );
if( engine::getSong()->playMode() == song::Mode_PlayPattern &&
engine::getPianoRoll()->isRecording() == true &&
p != last_metro_pos && p.getTicks() %

11
src/core/ProjectRenderer.cpp
View File

@@ -59,9 +59,9 @@ FileEncodeDevice __fileEncodeDevices[] =
".mp3", &AudioFileMp3::getInst },
{ ProjectRenderer::FlacFile,
QT_TRANSLATE_NOOP( "ProjectRenderer", "FLAC File (*.flac)" ),
".flac",
".flac",
#ifdef LMMS_HAVE_FLAC
&AudioFileFlac::getInst
&AudioFileFlac::getInst
#else
NULL
#endif
@@ -219,7 +219,12 @@ void ProjectRenderer::run()
#endif
#endif
// have to lock Mixer when touching Song's state as the FIFO writer thread
// may call Mixer::renderNextBuffer() (which calls Song::doActions())
// simultaneously
engine::mixer()->lock();
engine::getSong()->startExport();
engine::mixer()->unlock();
song::playPos & pp = engine::getSong()->getPlayPos(
song::Mode_PlaySong );
@@ -239,7 +244,9 @@ void ProjectRenderer::run()
}
}
engine::mixer()->lock();
engine::getSong()->stopExport();
engine::mixer()->unlock();
}