diff --git a/ChangeLog b/ChangeLog index e78d6007338..76a33dc57ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2006-07-27 Tobias Doerffel + + * configure.in: + made 0.2.1 release + + * include/mixer.h: + * include/visualization_widget.h: + * src/widgets/visualization_widget.cpp: + fixed a bug in connection between mixer and visualization-widget + 2006-07-24 Javier Serrano Polo * src/tracks/instrument_track.cpp: diff --git a/configure.in b/configure.in index 29531c3d336..8d753b9f78e 100644 --- a/configure.in +++ b/configure.in @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.50) -AC_INIT(lmms, 0.2.0-cvs20060724, tobydox/at/users/dot/sourceforge/dot/net) -AM_INIT_AUTOMAKE(lmms, 0.2.0-cvs20060724) +AC_INIT(lmms, 0.2.1, tobydox/at/users/dot/sourceforge/dot/net) +AM_INIT_AUTOMAKE(lmms, 0.2.1) AM_CONFIG_HEADER(config.h) diff --git a/include/mixer.h b/include/mixer.h index 551e2e44087..b6b11f30d17 100644 --- a/include/mixer.h +++ b/include/mixer.h @@ -289,8 +289,7 @@ public slots: signals: void sampleRateChanged( void ); - void nextAudioBuffer( const surroundSampleFrame *, - const fpab_t _frames ); + void nextAudioBuffer( const surroundSampleFrame *, int _frames ); private: diff --git a/include/visualization_widget.h b/include/visualization_widget.h index e23be0d6373..e9a91e545d3 100644 --- a/include/visualization_widget.h +++ b/include/visualization_widget.h @@ -67,7 +67,7 @@ class visualizationWidget : public QWidget, public engineObject protected slots: - void setAudioBuffer( const surroundSampleFrame * _ab, const fpab_t _frames ); + void setAudioBuffer( const surroundSampleFrame * _ab, int _frames ); private: diff --git a/src/widgets/visualization_widget.cpp b/src/widgets/visualization_widget.cpp index 766740ec56a..dc75d3bfae4 100644 --- a/src/widgets/visualization_widget.cpp +++ b/src/widgets/visualization_widget.cpp @@ -82,9 +82,9 @@ visualizationWidget::visualizationWidget( const QPixmap & _bg, QWidget * _p, } connect( eng()->getMixer(), SIGNAL( nextAudioBuffer( - const surroundSampleFrame *, const fpab_t ) ), + const surroundSampleFrame *, int ) ), this, SLOT( setAudioBuffer( - const surroundSampleFrame *, const fpab_t ) ) ); + const surroundSampleFrame *, int ) ) ); toolTip::add( this, tr( "click to enable/disable visualization of " "master-output" ) ); @@ -101,7 +101,7 @@ visualizationWidget::~visualizationWidget() void visualizationWidget::setAudioBuffer( const surroundSampleFrame * _ab, - const fpab_t _frames ) + int _frames ) { if( m_enabled == TRUE ) {