Fixed bug - Instruments had wrong channel models

Instruments were initialized with hardcoded 0-10 for min/max
channel selector range. Fixed.
This commit is contained in:
Andrew Kelley
2009-10-01 17:42:14 -07:00
parent 1c9b24afb7
commit abfdb6a74d
3 changed files with 6 additions and 5 deletions

View File

@@ -512,7 +512,7 @@ void FxMixer::saveSettings( QDomDocument & _doc, QDomElement & _this )
}
}
// make sure we have at least num channels
void FxMixer::allocateChannelsTo(int num)
{
while( num > m_fxChannels.size() - 1 )

View File

@@ -196,14 +196,13 @@ void FxMixerView::refreshDisplay()
chLayout->addWidget(m_fxChannelViews[i]->m_fxLine);
}
// fix master
//TODO
updateMaxChannelSelector();
}
// update the and max. channel number for every instrument
void FxMixerView::updateMaxChannelSelector()
{
// update the and max. channel number for every instrument
QVector<track *> songTrackList = engine::getSong()->tracks();
QVector<track *> bbTrackList = engine::getBBTrackContainer()->tracks();
@@ -439,6 +438,7 @@ void FxMixerView::setCurrentFxLine( int _line )
void FxMixerView::clear()
{
m_rackView->clearViews();
refreshDisplay();
}

View File

@@ -103,13 +103,14 @@ InstrumentTrack::InstrumentTrack( trackContainer * _tc ) :
this, tr( "Panning" ) ),
m_pitchModel( 0, -100, 100, 1, this, tr( "Pitch" ) ),
m_pitchRangeModel( 1, 1, 24, this, tr( "Pitch range" ) ),
m_effectChannelModel( 0, 0, 10, this, tr( "FX channel" ) ), // change this so it's a combo box, all the channels and then new.
m_effectChannelModel( 0, 0, 0, this, tr( "FX channel" ) ), // change this so it's a combo box, all the channels and then new.
m_instrument( NULL ),
m_soundShaping( this ),
m_arpeggiator( this ),
m_chordCreator( this ),
m_piano( this )
{
m_effectChannelModel.setRange( 0, engine::fxMixer()->numChannels()-1, 1);
connect( baseNoteModel(), SIGNAL( dataChanged() ),
this, SLOT( updateBaseNote() ) );
connect( &m_pitchModel, SIGNAL( dataChanged() ),