hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fixed mistakes made by sed-mass-replaces

Browse Source 
Some variables got renamed the way the shouldn't. Doesn't have any
functional impact but fix it for the sake of cosmetics.
(cherry picked from commit d7365e4cf3)
This commit is contained in:
Tobias Doerffel
2009-08-26 00:38:54 +02:00
parent f4dbb2ff5c
commit c32567ce2f
3 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/note_play_handle.h
View File

@@ -222,7 +222,6 @@ private:
} ;
InstrumentTrack * m_instrumentTrack; // needed for calling
// InstrumentTrack::playNote
f_cnt_t m_frames; // total frames to play

24
plugins/audio_file_processor/audio_file_processor.cpp
View File

@@ -72,8 +72,8 @@ audioFileProcessor::audioFileProcessor( InstrumentTrack * _instrument_track ) :
Instrument( _instrument_track, &audiofileprocessor_plugin_descriptor ),
m_sampleBuffer(),
m_ampModel( 100, 0, 500, 1, this, tr( "Amplify" ) ),
m_startPoIntModel( 0, 0, 1, 0.0000001f, this, tr( "Start of sample") ),
m_endPoIntModel( 1, 0, 1, 0.0000001f, this, tr( "End of sample" ) ),
m_startPointModel( 0, 0, 1, 0.0000001f, this, tr( "Start of sample") ),
m_endPointModel( 1, 0, 1, 0.0000001f, this, tr( "End of sample" ) ),
m_reverseModel( false, this, tr( "Reverse sample" ) ),
m_loopModel( false, this, tr( "Loop") )
{
@@ -81,9 +81,9 @@ audioFileProcessor::audioFileProcessor( InstrumentTrack * _instrument_track ) :
this, SLOT( reverseModelChanged() ) );
connect( &m_ampModel, SIGNAL( dataChanged() ),
this, SLOT( ampModelChanged() ) );
connect( &m_startPoIntModel, SIGNAL( dataChanged() ),
connect( &m_startPointModel, SIGNAL( dataChanged() ),
this, SLOT( loopPointChanged() ) );
connect( &m_endPoIntModel, SIGNAL( dataChanged() ),
connect( &m_endPointModel, SIGNAL( dataChanged() ),
this, SLOT( loopPointChanged() ) );
}
@@ -142,8 +142,8 @@ void audioFileProcessor::saveSettings( QDomDocument & _doc,
m_reverseModel.saveSettings( _doc, _this, "reversed" );
m_loopModel.saveSettings( _doc, _this, "looped" );
m_ampModel.saveSettings( _doc, _this, "amp" );
m_startPoIntModel.saveSettings( _doc, _this, "sframe" );
m_endPoIntModel.saveSettings( _doc, _this, "eframe" );
m_startPointModel.saveSettings( _doc, _this, "sframe" );
m_endPointModel.saveSettings( _doc, _this, "eframe" );
}
@@ -162,8 +162,8 @@ void audioFileProcessor::loadSettings( const QDomElement & _this )
m_reverseModel.loadSettings( _this, "reversed" );
m_loopModel.loadSettings( _this, "looped" );
m_ampModel.loadSettings( _this, "amp" );
m_startPoIntModel.loadSettings( _this, "sframe" );
m_endPoIntModel.loadSettings( _this, "eframe" );
m_startPointModel.loadSettings( _this, "sframe" );
m_endPointModel.loadSettings( _this, "eframe" );
loopPointChanged();
}
@@ -248,9 +248,9 @@ void audioFileProcessor::ampModelChanged( void )
void audioFileProcessor::loopPointChanged( void )
{
const f_cnt_t f1 = static_cast<f_cnt_t>( m_startPoIntModel.value() *
const f_cnt_t f1 = static_cast<f_cnt_t>( m_startPointModel.value() *
( m_sampleBuffer.frames()-1 ) );
const f_cnt_t f2 = static_cast<f_cnt_t>( m_endPoIntModel.value() *
const f_cnt_t f2 = static_cast<f_cnt_t>( m_endPointModel.value() *
( m_sampleBuffer.frames()-1 ) );
m_sampleBuffer.setStartFrame( qMin<f_cnt_t>( f1, f2 ) );
m_sampleBuffer.setEndFrame( qMax<f_cnt_t>( f1, f2 ) );
@@ -525,8 +525,8 @@ void AudioFileProcessorView::modelChanged( void )
connect( &a->m_sampleBuffer, SIGNAL( sampleUpdated() ),
this, SLOT( sampleUpdated() ) );
m_ampKnob->setModel( &a->m_ampModel );
m_startKnob->setModel( &a->m_startPoIntModel );
m_endKnob->setModel( &a->m_endPoIntModel );
m_startKnob->setModel( &a->m_startPointModel );
m_endKnob->setModel( &a->m_endPointModel );
m_reverseButton->setModel( &a->m_reverseModel );
m_loopButton->setModel( &a->m_loopModel );
sampleUpdated();

4
plugins/audio_file_processor/audio_file_processor.h
View File

@@ -82,8 +82,8 @@ private:
sampleBuffer m_sampleBuffer;
FloatModel m_ampModel;
FloatModel m_startPoIntModel;
FloatModel m_endPoIntModel;
FloatModel m_startPointModel;
FloatModel m_endPointModel;
BoolModel m_reverseModel;
BoolModel m_loopModel;