mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-07-12 22:52:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Export percentage calc now takes considers loop markers as necessary

Browse Source
This commit is contained in:
Colin Wallace
2015-07-14 01:53:47 +00:00
parent 3ff55d755c
commit ffba37c7f2
3 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/ProjectRenderer.cpp
View File

@@ -163,17 +163,20 @@ void ProjectRenderer::run()
//skip first empty buffer
Engine::mixer()->nextBuffer();
const Song::PlayPos & pp = Engine::getSong()->getPlayPos(
const Song::PlayPos & exportPos = Engine::getSong()->getPlayPos(
Song::Mode_PlaySong );
m_progress = 0;
const int sl = ( Engine::getSong()->length() + 1 ) * 192;
std::pair<MidiTime, MidiTime> exportEndpoints = Engine::getSong()->getExportEndpoints();
tick_t startTick = exportEndpoints.first.getTicks();
tick_t lengthTicks = exportEndpoints.second.getTicks() - startTick;
// Continually track and emit progress percentage to listeners
while( Engine::getSong()->isExportDone() == false &&
Engine::getSong()->isExporting() == true
&& !m_abort )
{
m_fileDev->processNextBuffer();
const int nprog = pp * 100 / sl;
const int nprog = lengthTicks == 0 ? 100 : (exportPos.getTicks()-startTick) * 100 / lengthTicks;
if( m_progress != nprog )
{
m_progress = nprog;