Move improvements to sample-exact controller handling,
also some coding style fixes
This commit is contained in:
@@ -256,14 +256,14 @@ public:
|
||||
|
||||
float globalAutomationValueAt( const MidiTime& time );
|
||||
|
||||
bool strictStepSize() const
|
||||
bool hasStrictStepSize() const
|
||||
{
|
||||
return m_strictStepSize;
|
||||
return m_hasStrictStepSize;
|
||||
}
|
||||
|
||||
void setStrictStepSize( const bool b )
|
||||
{
|
||||
m_strictStepSize = b;
|
||||
m_hasStrictStepSize = b;
|
||||
}
|
||||
|
||||
public slots:
|
||||
@@ -320,7 +320,7 @@ private:
|
||||
|
||||
// used to determine if step size should be applied strictly (ie. always)
|
||||
// or only when value set from gui (default)
|
||||
bool m_strictStepSize;
|
||||
bool m_hasStrictStepSize;
|
||||
|
||||
AutoModelVector m_linkedModels;
|
||||
bool m_hasLinkedModels;
|
||||
|
||||
@@ -114,7 +114,7 @@ public:
|
||||
return tLimit<float>( _val, 0.0f, 1.0f );
|
||||
}
|
||||
|
||||
static unsigned int runningPeriods()
|
||||
static long runningPeriods()
|
||||
{
|
||||
return s_periods;
|
||||
}
|
||||
@@ -152,7 +152,7 @@ protected:
|
||||
// again every time
|
||||
ValueBuffer m_valueBuffer;
|
||||
// when we last updated the valuebuffer - so we know if we have to update it
|
||||
unsigned int m_bufferLastUpdated;
|
||||
long m_bufferLastUpdated;
|
||||
|
||||
float m_currentValue;
|
||||
bool m_sampleExact;
|
||||
@@ -163,7 +163,7 @@ protected:
|
||||
|
||||
static ControllerVector s_controllers;
|
||||
|
||||
static unsigned int s_periods;
|
||||
static long s_periods;
|
||||
|
||||
|
||||
signals:
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef _SONG_H
|
||||
#define _SONG_H
|
||||
#ifndef SONG_H
|
||||
#define SONG_H
|
||||
|
||||
#include <QtCore/QSharedMemory>
|
||||
#include <QtCore/QVector>
|
||||
@@ -131,6 +131,10 @@ public:
|
||||
{
|
||||
return currentTick();
|
||||
}
|
||||
inline f_cnt_t getFrames() const
|
||||
{
|
||||
return currentFrame();
|
||||
}
|
||||
inline bool isTempoAutomated()
|
||||
{
|
||||
return m_tempoModel.isAutomated();
|
||||
@@ -310,6 +314,12 @@ private:
|
||||
{
|
||||
return m_playPos[m_playMode].getTicks();
|
||||
}
|
||||
|
||||
inline f_cnt_t currentFrame() const
|
||||
{
|
||||
return m_playPos[m_playMode].getTicks() * engine::framesPerTick() + m_playPos[m_playMode].currentFrame();
|
||||
}
|
||||
|
||||
void setPlayPos( tick_t _ticks, PlayModes _play_mode );
|
||||
|
||||
void saveControllerStates( QDomDocument & _doc, QDomElement & _this );
|
||||
@@ -362,6 +372,7 @@ private:
|
||||
signals:
|
||||
void projectLoaded();
|
||||
void playbackStateChanged();
|
||||
void playbackPositionChanged();
|
||||
void lengthChanged( int _tacts );
|
||||
void tempoChanged( bpm_t _new_bpm );
|
||||
void timeSignatureChanged( int _old_ticks_per_tact,
|
||||
|
||||
Reference in New Issue
Block a user