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

NotePlayHandle: cleanups, header dependency reductions etc.

Browse Source 
* do not include instrument_track.h in note_play_handle.h by making
  two functions non-inline
* renamed notePlayHandleVector / constNotePlayHandleVector to
  NotePlayHandleList / ConstNotePlayHandleList and changed typedef
  to QList (which has faster insert- and remove-operations).
* removed unused method willFinishThisPeriod()

Signed-off-by: Tobias Doerffel <tobias.doerffel@gmail.com>
(cherry picked from commit 08ea133aa2)
This commit is contained in:
Tobias Doerffel
2009-06-15 14:36:56 +02:00
parent 33dd77f55c
commit cafb24fe9a
11 changed files with 45 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/instrument_track.h
View File

@@ -34,6 +34,7 @@
#include "instrument_sound_shaping.h"
#include "midi_event_processor.h"
#include "midi_port.h"
#include "note_play_handle.h"
#include "piano.h"
#include "track.h"
@@ -211,8 +212,7 @@ private:
intModel m_baseNoteModel;
QList<notePlayHandle *> m_processHandles;
NotePlayHandleList m_processHandles;
floatModel m_volumeModel;
floatModel m_panningModel;

75
include/note_play_handle.h
View File

@@ -2,7 +2,7 @@
* note_play_handle.h - declaration of class notePlayHandle which is needed
* by LMMS-Play-Engine
*
* Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2004-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -30,16 +30,16 @@
#include "lmmsconfig.h"
#include "mixer.h"
#include "note.h"
#include "instrument.h"
#include "instrument_track.h"
#include "engine.h"
#include "track.h"
class instrumentTrack;
class notePlayHandle;
template<ch_cnt_t=DEFAULT_CHANNELS> class basicFilters;
typedef QVector<notePlayHandle *> notePlayHandleVector;
typedef QVector<const notePlayHandle *> constNotePlayHandleVector;
typedef QList<notePlayHandle *> NotePlayHandleList;
typedef QList<const notePlayHandle *> ConstNotePlayHandleList;
class EXPORT notePlayHandle : public playHandle, public note
@@ -79,55 +79,6 @@ public:
return( m_released && framesLeft() <= 0 );
}
bool willFinishThisPeriod( void ) const
{
f_cnt_t rftd = m_releaseFramesToDo;
f_cnt_t fbr = m_framesBeforeRelease;
f_cnt_t rfd = m_releaseFramesDone;
if( m_released == TRUE )
{
f_cnt_t todo = engine::getMixer()->framesPerPeriod();
if( isArpeggioBaseNote() )
{
rftd = rfd + 2 *
engine::getMixer()->framesPerPeriod();
}
if( fbr )
{
if( fbr <=
engine::getMixer()->framesPerPeriod() )
{
todo -= fbr;
fbr = 0;
}
else
{
todo = 0;
fbr -=
engine::getMixer()->framesPerPeriod();
}
}
if( todo && rfd < rftd )
{
if( rftd - rfd >= todo )
{
rfd += todo;
}
else
{
rfd = rftd;
}
}
}
if( isArpeggioBaseNote() && m_subNotes.size() == 0 )
{
rfd = rftd;
}
return( ( m_released && fbr == 0 && rfd >= rftd ) );
}
f_cnt_t framesLeft( void ) const;
inline fpp_t framesLeftForCurrentPeriod( void ) const
@@ -202,11 +153,7 @@ public:
}
// returns whether note is base-note for arpeggio
inline bool isArpeggioBaseNote( void ) const
{
return( isBaseNote() && ( m_partOfArpeggio ||
m_instrumentTrack->arpeggiatorEnabled() ) );
}
bool isArpeggioBaseNote( void ) const;
inline bool isMuted( void ) const
{
@@ -219,15 +166,15 @@ public:
// belonging to this instrument-track - used by arpeggiator
int index( void ) const;
// note-play-handles belonging to given channel, if _all_ph = TRUE,
// note-play-handles belonging to given channel, if _all_ph = true,
// also released note-play-handles are returned
static constNotePlayHandleVector nphsOfInstrumentTrack(
const instrumentTrack * _ct, bool _all_ph = FALSE );
static ConstNotePlayHandleList nphsOfInstrumentTrack(
const instrumentTrack * _ct, bool _all_ph = false );
// return whether given note-play-handle is equal to *this
bool operator==( const notePlayHandle & _nph ) const;
bool bbTrackMuted( void )
inline bool bbTrackMuted( void )
{
return( m_bbTrack && m_bbTrack->isMuted() );
}
@@ -288,7 +235,7 @@ private:
// played after release
f_cnt_t m_releaseFramesDone; // number of frames done after
// release of note
notePlayHandleVector m_subNotes;// used for chords and arpeggios
NotePlayHandleList m_subNotes; // used for chords and arpeggios
volatile bool m_released; // indicates whether note is released
bool m_baseNote; // indicates whether note is a
// base-note (i.e. no sub-note)

2
include/preset_preview_play_handle.h
View File

@@ -48,7 +48,7 @@ public:
static void init( void );
static void cleanup( void );
static constNotePlayHandleVector nphsOfInstrumentTrack(
static ConstNotePlayHandleList nphsOfInstrumentTrack(
const instrumentTrack * _ct );