NotePlayHandle, InstrumentTrack: removed obsolete singerbot support
The singerbot plugin doesn't exist anymore and thus any support in the code base just adds complexity and confusion, therefore remove it.
This commit is contained in:
@@ -232,18 +232,6 @@ public:
|
||||
return m_songGlobalParentOffset;
|
||||
}
|
||||
|
||||
#ifdef LMMS_SINGERBOT_SUPPORT
|
||||
int patternIndex()
|
||||
{
|
||||
return m_patternIndex;
|
||||
}
|
||||
|
||||
void setPatternIndex( int _i )
|
||||
{
|
||||
m_patternIndex = _i;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
private:
|
||||
class BaseDetuning
|
||||
@@ -288,9 +276,6 @@ private:
|
||||
// sub-note)
|
||||
bool m_muted; // indicates whether note is muted
|
||||
track* m_bbTrack; // related BB track
|
||||
#ifdef LMMS_SINGERBOT_SUPPORT
|
||||
int m_patternIndex; // position among relevant notes
|
||||
#endif
|
||||
|
||||
// tempo reaction
|
||||
bpm_t m_origTempo; // original tempo
|
||||
|
||||
@@ -67,9 +67,6 @@ NotePlayHandle::NotePlayHandle( InstrumentTrack* instrumentTrack,
|
||||
m_partOfArpeggio( _part_of_arp ),
|
||||
m_muted( false ),
|
||||
m_bbTrack( NULL ),
|
||||
#ifdef LMMS_SINGERBOT_SUPPORT
|
||||
m_patternIndex( 0 ),
|
||||
#endif
|
||||
m_origTempo( engine::getSong()->getTempo() ),
|
||||
m_origBaseNote( instrumentTrack->baseNoteModel()->value() ),
|
||||
m_frequency( 0 ),
|
||||
@@ -95,9 +92,6 @@ NotePlayHandle::NotePlayHandle( InstrumentTrack* instrumentTrack,
|
||||
parent->m_partOfArpeggio = isPartOfArpeggio() && parent->isTopNote();
|
||||
|
||||
m_bbTrack = parent->m_bbTrack;
|
||||
#ifdef LMMS_SINGERBOT_SUPPORT
|
||||
m_patternIndex = parent->m_patternIndex;
|
||||
#endif
|
||||
}
|
||||
|
||||
updateFrequency();
|
||||
|
||||
@@ -609,9 +609,6 @@ bool InstrumentTrack::play( const MidiTime & _start, const fpp_t _frames,
|
||||
const NoteVector & notes = p->notes();
|
||||
// ...and set our index to zero
|
||||
NoteVector::ConstIterator nit = notes.begin();
|
||||
#if LMMS_SINGERBOT_SUPPORT
|
||||
int note_idx = 0;
|
||||
#endif
|
||||
|
||||
// very effective algorithm for playing notes that are
|
||||
// posated within the current sample-frame
|
||||
@@ -622,12 +619,6 @@ bool InstrumentTrack::play( const MidiTime & _start, const fpp_t _frames,
|
||||
// skip notes which are posated before start-tact
|
||||
while( nit != notes.end() && ( *nit )->pos() < cur_start )
|
||||
{
|
||||
#if LMMS_SINGERBOT_SUPPORT
|
||||
if( ( *nit )->length() != 0 )
|
||||
{
|
||||
++note_idx;
|
||||
}
|
||||
#endif
|
||||
++nit;
|
||||
}
|
||||
}
|
||||
@@ -652,14 +643,8 @@ bool InstrumentTrack::play( const MidiTime & _start, const fpp_t _frames,
|
||||
notePlayHandle->setSongGlobalParentOffset( p->startPosition() );
|
||||
}
|
||||
|
||||
#if LMMS_SINGERBOT_SUPPORT
|
||||
notePlayHandle->setPatternIndex( note_idx );
|
||||
#endif
|
||||
engine::mixer()->addPlayHandle( notePlayHandle );
|
||||
played_a_note = true;
|
||||
#if LMMS_SINGERBOT_SUPPORT
|
||||
++note_idx;
|
||||
#endif
|
||||
}
|
||||
++nit;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user