Don't count muted tracks in track length (#3390)
* Don't count muted tracks to length on render * Don't count muted TCO's to length on render
This commit is contained in:
@@ -167,8 +167,8 @@ void ProjectRenderer::run()
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
Engine::getSong()->startExport();
|
||||
Engine::getSong()->updateLength();
|
||||
//skip first empty buffer
|
||||
Engine::mixer()->nextBuffer();
|
||||
|
||||
|
||||
@@ -555,6 +555,12 @@ void Song::updateLength()
|
||||
for( TrackList::const_iterator it = tracks().begin();
|
||||
it != tracks().end(); ++it )
|
||||
{
|
||||
if( Engine::getSong()->isExporting() &&
|
||||
( *it )->isMuted() )
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
const tact_t cur = ( *it )->length();
|
||||
if( cur > m_length )
|
||||
{
|
||||
|
||||
@@ -2421,6 +2421,12 @@ tact_t Track::length() const
|
||||
for( tcoVector::const_iterator it = m_trackContentObjects.begin();
|
||||
it != m_trackContentObjects.end(); ++it )
|
||||
{
|
||||
if( Engine::getSong()->isExporting() &&
|
||||
( *it )->isMuted() )
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
const tick_t cur = ( *it )->endPosition();
|
||||
if( cur > last )
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user