From 814076f10e51b075e5fd331125caafb259c21134 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Thu, 3 Apr 2008 20:13:54 +0000 Subject: [PATCH] use sampleFrame-array instead of surroundSampleFrame-array internally git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@866 0778d3d1-df1d-0410-868b-ea421aaaa00d --- include/visualization_widget.h | 2 +- src/gui/widgets/visualization_widget.cpp | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/include/visualization_widget.h b/include/visualization_widget.h index cbe278b4a..3dcf5b028 100644 --- a/include/visualization_widget.h +++ b/include/visualization_widget.h @@ -61,7 +61,7 @@ private: QPixmap s_background; bool m_enabled; - surroundSampleFrame * m_buffer; + sampleFrame * m_buffer; QTimer * m_updateTimer; diff --git a/src/gui/widgets/visualization_widget.cpp b/src/gui/widgets/visualization_widget.cpp index 1c64bf235..218e50081 100644 --- a/src/gui/widgets/visualization_widget.cpp +++ b/src/gui/widgets/visualization_widget.cpp @@ -51,7 +51,7 @@ visualizationWidget::visualizationWidget( const QPixmap & _bg, QWidget * _p, const fpp_t frames = engine::getMixer()->framesPerPeriod(); - m_buffer = new surroundSampleFrame[frames]; + m_buffer = new sampleFrame[frames]; engine::getMixer()->clearAudioBuffer( m_buffer, frames ); @@ -86,9 +86,14 @@ void visualizationWidget::updateAudioBuffer( void ) if( m_enabled == TRUE ) { engine::getMixer()->lock(); - memcpy( m_buffer, engine::getMixer()->currentReadBuffer(), - engine::getMixer()->framesPerPeriod() * - BYTES_PER_SURROUND_FRAME ); + const surroundSampleFrame * c = engine::getMixer()-> + currentReadBuffer(); + for( f_cnt_t f = 0; f < engine::getMixer()->framesPerPeriod(); + ++f ) + { + m_buffer[f][0] = c[f][0]; + m_buffer[f][1] = c[f][1]; + } engine::getMixer()->unlock(); } }