From 9852cb9a57703304f68e9b621cb2d9aec4c72e40 Mon Sep 17 00:00:00 2001
From: Tobias Doerffel <tobias.doerffel@gmail.com>
Date: Wed, 29 Jan 2014 23:56:07 +0100
Subject: [PATCH] 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.
---
 include/NotePlayHandle.h       | 15 ---------------
 src/core/NotePlayHandle.cpp    |  6 ------
 src/tracks/InstrumentTrack.cpp | 15 ---------------
 3 files changed, 36 deletions(-)

diff --git a/include/NotePlayHandle.h b/include/NotePlayHandle.h
index fd6c8bf14..1f1d9fa36 100644
--- a/include/NotePlayHandle.h
+++ b/include/NotePlayHandle.h
@@ -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
diff --git a/src/core/NotePlayHandle.cpp b/src/core/NotePlayHandle.cpp
index 78db9df90..e833a8d47 100644
--- a/src/core/NotePlayHandle.cpp
+++ b/src/core/NotePlayHandle.cpp
@@ -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();
diff --git a/src/tracks/InstrumentTrack.cpp b/src/tracks/InstrumentTrack.cpp
index aeaa49dc9..c4cc26a8f 100644
--- a/src/tracks/InstrumentTrack.cpp
+++ b/src/tracks/InstrumentTrack.cpp
@@ -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;
 		}