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

introduced offset-property in playHandles-base-class, re-ordered mixing-procedure, improved handling of monophonic instruments

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@504 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2007-08-04 01:21:35 +00:00
parent b95fa0aab8
commit 6243edf1ec
7 changed files with 181 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
include/note_play_handle.h
View File

@@ -48,8 +48,8 @@ public:
void * m_pluginData;
basicFilters<> * m_filter;
notePlayHandle( instrumentTrack * _chnl_trk,
const f_cnt_t _frames_ahead,
notePlayHandle( instrumentTrack * _instrument_track,
const f_cnt_t _offset,
const f_cnt_t _frames, const note & _n,
notePlayHandle * _parent = NULL,
const bool _arp_note = FALSE );
@@ -67,8 +67,8 @@ public:
virtual inline bool done( void ) const
{
return( ( m_released && m_framesBeforeRelease == 0 &&
m_releaseFramesDone >= m_releaseFramesToDo ) );
return( m_released && framesLeft() == 0 );/* ( m_released && m_framesBeforeRelease == 0 &&
m_releaseFramesDone >= m_releaseFramesToDo ) );*/
}
bool willFinishThisPeriod( void ) const
@@ -78,16 +78,16 @@ public:
f_cnt_t rfd = m_releaseFramesDone;
if( m_released == TRUE )
{
f_cnt_t todo = engine::getMixer()->framesPerAudioBuffer();
f_cnt_t todo = engine::getMixer()->framesPerPeriod();
if( arpBaseNote() == TRUE )
{
rftd = rfd + 2 *
engine::getMixer()->framesPerAudioBuffer();
engine::getMixer()->framesPerPeriod();
}
if( fbr )
{
if( fbr <=
engine::getMixer()->framesPerAudioBuffer() )
engine::getMixer()->framesPerPeriod() )
{
todo -= fbr;
fbr = 0;
@@ -96,7 +96,7 @@ public:
{
todo = 0;
fbr -=
engine::getMixer()->framesPerAudioBuffer();
engine::getMixer()->framesPerPeriod();
}
}
if( todo && rfd < rftd )
@@ -120,6 +120,15 @@ public:
return( ( m_released && fbr == 0 && rfd >= rftd ) );
}
f_cnt_t framesLeft( void ) const;
inline f_cnt_t framesLeftForCurrentPeriod( void ) const
{
return( tMin<f_cnt_t>( framesLeft(),
engine::getMixer()->framesPerPeriod() ) );
}
virtual bool isFromTrack( const track * _track ) const;
@@ -138,13 +147,6 @@ public:
f_cnt_t actualReleaseFramesToDo( void ) const;
// returns how many samples this note is aligned ahead, i.e.
// at which position it is inserted in the according buffer
inline f_cnt_t framesAhead( void ) const
{
return ( m_framesAhead );
}
// returns total numbers of frames to play
inline f_cnt_t frames( void ) const
{
@@ -292,8 +294,6 @@ private:
instrumentTrack * m_instrumentTrack; // needed for calling
// instrumentTrack::playNote
f_cnt_t m_frames; // total frames to play
f_cnt_t m_framesAhead; // numbers of frames ahead in buffer
// to mix in
f_cnt_t m_totalFramesPlayed; // total frame-counter - used for
// figuring out whether a whole note
// has been played

20
include/play_handle.h
View File

@@ -43,6 +43,7 @@
#endif
#include "types.h"
class track;
@@ -58,8 +59,9 @@ public:
PresetPreviewHandle
} ;
playHandle( const types _type ) :
m_type( _type )
playHandle( const types _type, f_cnt_t _offset = 0 ) :
m_type( _type ),
m_offset( _offset )
{
}
@@ -75,6 +77,19 @@ public:
virtual void play( bool _try_parallelizing = FALSE ) = 0;
virtual bool done( void ) const = 0;
// returns how many frames this play-handle is aligned ahead, i.e.
// at which position it is inserted in the according buffer
inline f_cnt_t offset( void ) const
{
return ( m_offset );
}
inline void setOffset( f_cnt_t _offset )
{
m_offset = _offset;
}
virtual bool isFromTrack( const track * _track ) const = 0;
virtual bool supportsParallelizing( void ) const
@@ -89,6 +104,7 @@ public:
private:
types m_type;
f_cnt_t m_offset;
} ;