* additionally provide frequency without pitch-wheel

* added instrumentTrack::midiPitch()



git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1292 0778d3d1-df1d-0410-868b-ea421aaaa00d

include/instrument_track.h

@@ -94,8 +94,15 @@ public:
 	// name-stuff
 	virtual void setName( const QString & _new_name );
 
+	// translate key of given notePlayHandle to absolute key (i.e.
+	// add global master-pitch and base-note in piano)
 	int masterKey( notePlayHandle * _n ) const;
 
+	// translate pitch to midi-pitch [0,16383]
+	inline int midiPitch( void ) const
+	{
+		return( (int)( ( m_pitchModel.value()+100 ) * 81.92 ) );
+	}
 
 	// play everything in given frame-range - creates note-play-handles
 	virtual bool play( const midiTime & _start, const fpp_t _frames,

include/note_play_handle.h

@@ -63,6 +63,12 @@ public:
 
 	void updateFrequency( void );
 
+	// returns frequency without pitch-wheel influence
+	float unpitchedFrequency( void ) const
+	{
+		return( m_unpitchedFrequency );
+	}
+
 	virtual void play( bool _try_parallelizing,
 						sampleFrame * _working_buffer );
 
@@ -318,6 +324,7 @@ private:
 	f_cnt_t m_orig_frames;		// original m_frames
 
 	float m_frequency;
+	float m_unpitchedFrequency;
 
 	baseDetuning * m_baseDetuning;