mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-06-09 06:36:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2394 from M374LX/decouple-mixer-visualization

Browse Source 
Partially decouple VisualizationWidget from Mixer
This commit is contained in:
Colin Wallace
2015-10-05 05:18:41 +00:00
parent fb46bfc753 12e2da9b44
commit 3a8f491ddb
4 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/widgets/VisualizationWidget.cpp
View File

@@ -73,14 +73,12 @@ VisualizationWidget::~VisualizationWidget()
void VisualizationWidget::updateAudioBuffer()
void VisualizationWidget::updateAudioBuffer( const surroundSampleFrame * buffer )
{
if( !Engine::getSong()->isExporting() )
{
const surroundSampleFrame * c = Engine::mixer()->
currentReadBuffer();
const fpp_t fpp = Engine::mixer()->framesPerPeriod();
memcpy( m_buffer, c, sizeof( surroundSampleFrame ) * fpp );
memcpy( m_buffer, buffer, sizeof( surroundSampleFrame ) * fpp );
}
}
@@ -96,8 +94,8 @@ void VisualizationWidget::setActive( bool _active )
SIGNAL( periodicUpdate() ),
this, SLOT( update() ) );
connect( Engine::mixer(),
SIGNAL( nextAudioBuffer() ),
this, SLOT( updateAudioBuffer() ) );
SIGNAL( nextAudioBuffer( const surroundSampleFrame* ) ),
this, SLOT( updateAudioBuffer( const surroundSampleFrame* ) ) );
}
else
{
@@ -105,8 +103,8 @@ void VisualizationWidget::setActive( bool _active )
SIGNAL( periodicUpdate() ),
this, SLOT( update() ) );
disconnect( Engine::mixer(),
SIGNAL( nextAudioBuffer() ),
this, SLOT( updateAudioBuffer() ) );
SIGNAL( nextAudioBuffer( const surroundSampleFrame* ) ),
this, SLOT( updateAudioBuffer( const surroundSampleFrame* ) ) );
// we have to update (remove last waves),
// because timer doesn't do that anymore
update();