removed start frame from play() methods
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@368 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
@@ -47,7 +47,6 @@ private:
|
||||
virtual trackTypes type( void ) const;
|
||||
|
||||
virtual bool FASTCALL play( const midiTime & _start,
|
||||
const f_cnt_t _start_frame,
|
||||
const fpab_t _frames,
|
||||
const f_cnt_t _frame_base,
|
||||
Sint16 _tco_num = -1 );
|
||||
|
||||
@@ -40,8 +40,7 @@ class bbEditor : public trackContainer
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
virtual bool FASTCALL play( midiTime _start, const f_cnt_t _start_frame,
|
||||
const f_cnt_t _frames,
|
||||
virtual bool FASTCALL play( midiTime _start, const fpab_t _frames,
|
||||
const f_cnt_t _frame_base,
|
||||
Sint16 _tco_num = -1 );
|
||||
|
||||
|
||||
@@ -100,7 +100,6 @@ public:
|
||||
|
||||
virtual trackTypes type( void ) const;
|
||||
virtual bool FASTCALL play( const midiTime & _start,
|
||||
const f_cnt_t _start_frame,
|
||||
const fpab_t _frames,
|
||||
const f_cnt_t _frame_base,
|
||||
Sint16 _tco_num = -1 );
|
||||
|
||||
@@ -143,7 +143,6 @@ public:
|
||||
|
||||
// play everything in given frame-range - creates note-play-handles
|
||||
virtual bool FASTCALL play( const midiTime & _start,
|
||||
const f_cnt_t _start_frame,
|
||||
const fpab_t _frames,
|
||||
const f_cnt_t _frame_base,
|
||||
Sint16 _tco_num = -1 );
|
||||
|
||||
@@ -136,7 +136,6 @@ public:
|
||||
|
||||
virtual trackTypes type( void ) const;
|
||||
virtual bool FASTCALL play( const midiTime & _start,
|
||||
const f_cnt_t _start_frame,
|
||||
const fpab_t _frames,
|
||||
const f_cnt_t _frame_base,
|
||||
Sint16 _tco_num = -1 );
|
||||
|
||||
@@ -227,8 +227,8 @@ tact bbEditor::lengthOfBB( csize _bb )
|
||||
|
||||
|
||||
|
||||
bool FASTCALL bbEditor::play( midiTime _start, f_cnt_t _start_frame,
|
||||
f_cnt_t _frames, f_cnt_t _frame_base,
|
||||
bool FASTCALL bbEditor::play( midiTime _start, fpab_t _frames,
|
||||
f_cnt_t _frame_base,
|
||||
Sint16 _tco_num )
|
||||
{
|
||||
bool played_a_note = FALSE;
|
||||
@@ -242,7 +242,7 @@ bool FASTCALL bbEditor::play( midiTime _start, f_cnt_t _start_frame,
|
||||
trackVector tv = tracks();
|
||||
for( trackVector::iterator it = tv.begin(); it != tv.end(); ++it )
|
||||
{
|
||||
if( ( *it )->play( _start, _start_frame, _frames, _frame_base,
|
||||
if( ( *it )->play( _start, _frames, _frame_base,
|
||||
_tco_num ) == TRUE )
|
||||
{
|
||||
played_a_note = TRUE;
|
||||
|
||||
@@ -1056,20 +1056,23 @@ void songEditor::processNextBuffer( void )
|
||||
played_frames = last_frames;
|
||||
}
|
||||
|
||||
if( m_playMode == PLAY_SONG )
|
||||
if( (f_cnt_t)current_frame == 0 )
|
||||
{
|
||||
m_automation_track->play( m_playPos[m_playMode],
|
||||
(f_cnt_t)current_frame, played_frames,
|
||||
total_frames_played, tco_num );
|
||||
}
|
||||
if( m_playMode == PLAY_SONG )
|
||||
{
|
||||
m_automation_track->play( m_playPos[m_playMode],
|
||||
played_frames,
|
||||
total_frames_played, tco_num );
|
||||
}
|
||||
|
||||
// loop through all tracks and play them
|
||||
for( trackVector::iterator it = tv.begin(); it != tv.end();
|
||||
++it )
|
||||
{
|
||||
( *it )->play( m_playPos[m_playMode],
|
||||
(f_cnt_t)current_frame, played_frames,
|
||||
total_frames_played, tco_num );
|
||||
// loop through all tracks and play them
|
||||
for( trackVector::iterator it = tv.begin();
|
||||
it != tv.end(); ++it )
|
||||
{
|
||||
( *it )->play( m_playPos[m_playMode],
|
||||
played_frames,
|
||||
total_frames_played, tco_num );
|
||||
}
|
||||
}
|
||||
|
||||
// update frame-counters
|
||||
|
||||
@@ -55,7 +55,6 @@ track::trackTypes automationTrack::type( void ) const
|
||||
|
||||
|
||||
bool automationTrack::play( const midiTime & _start,
|
||||
const f_cnt_t _start_frame,
|
||||
const fpab_t _frames,
|
||||
const f_cnt_t _frame_base,
|
||||
Sint16 _tco_num )
|
||||
|
||||
@@ -368,9 +368,8 @@ track::trackTypes bbTrack::type( void ) const
|
||||
|
||||
|
||||
|
||||
// play _frames frames of given TCO within starting with _start/_start_frame
|
||||
// play _frames frames of given TCO within starting with _start
|
||||
bool FASTCALL bbTrack::play( const midiTime & _start,
|
||||
const f_cnt_t _start_frame,
|
||||
const fpab_t _frames,
|
||||
const f_cnt_t _frame_base,
|
||||
Sint16 _tco_num )
|
||||
@@ -379,8 +378,7 @@ bool FASTCALL bbTrack::play( const midiTime & _start,
|
||||
|
||||
if( _tco_num >= 0 )
|
||||
{
|
||||
return( eng()->getBBEditor()->play( _start, _start_frame,
|
||||
_frames,
|
||||
return( eng()->getBBEditor()->play( _start, _frames,
|
||||
_frame_base,
|
||||
s_infoMap[this] ) );
|
||||
}
|
||||
@@ -388,7 +386,7 @@ bool FASTCALL bbTrack::play( const midiTime & _start,
|
||||
vlist<trackContentObject *> tcos;
|
||||
getTCOsInRange( tcos, _start, _start + static_cast<Sint32>( _frames /
|
||||
eng()->framesPerTact64th() ) );
|
||||
|
||||
|
||||
if ( tcos.size() == 0 )
|
||||
{
|
||||
return( FALSE );
|
||||
@@ -409,7 +407,7 @@ bool FASTCALL bbTrack::play( const midiTime & _start,
|
||||
if( _start - lastPosition < lastLen )
|
||||
{
|
||||
return( eng()->getBBEditor()->play( _start - lastPosition,
|
||||
_start_frame, _frames,
|
||||
_frames,
|
||||
_frame_base,
|
||||
s_infoMap[this] ) );
|
||||
}
|
||||
|
||||
@@ -421,16 +421,10 @@ track::trackTypes sampleTrack::type( void ) const
|
||||
|
||||
|
||||
bool FASTCALL sampleTrack::play( const midiTime & _start,
|
||||
const f_cnt_t _start_frame,
|
||||
const fpab_t _frames,
|
||||
const f_cnt_t _frame_base,
|
||||
Sint16 /*_tco_num*/ )
|
||||
{
|
||||
if ( _start_frame > 0 )
|
||||
{
|
||||
return( FALSE );
|
||||
}
|
||||
|
||||
sendMidiTime( _start );
|
||||
|
||||
#ifdef LADSPA_SUPPORT
|
||||
|
||||
Reference in New Issue
Block a user