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

Merge pull request #609 from diizy/wavetablesynth

Browse Source 
Watsyn: use fast sinc instead of medium quality (not much diff in this c...
This commit is contained in:
Vesa V
2014-04-14 14:18:28 +03:00
parent fb1febe299 49d05f466d
commit f32f7689b4
4 changed files with 38 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/graph.h
View File

@@ -150,7 +150,7 @@ public slots:
void setLength( int _size );
void setSampleAt( int _samplePos, float _value );
void setSampleAt( int x, float val );
void setSamples( const float * _value );
void setWaveToSine();
@@ -172,6 +172,7 @@ signals:
void rangeChanged();
private:
void drawSampleAt( int x, float val );
QVector<float> m_samples;
float m_minValue;

25
plugins/watsyn/Watsyn.cpp
View File

@@ -116,14 +116,13 @@ void WatsynObject::renderOutput( fpp_t _frames )
///////////// A-series /////////////////
// A2
sample_t A2_L = m_A2wave[ static_cast<int>( m_lphase[A2_OSC] ) ] * m_parent->m_lvol[A2_OSC];
/*interpolate( m_A2wave[ static_cast<int>( m_lphase[A2_OSC] ) % WAVELEN ],
sample_t A2_L = linearInterpolate( m_A2wave[ static_cast<int>( m_lphase[A2_OSC] ) ],
m_A2wave[ static_cast<int>( m_lphase[A2_OSC] + 1 ) % WAVELEN ],
fraction( m_lphase[A2_OSC] ) ) * m_parent->m_lvol[A2_OSC];*/
sample_t A2_R = m_A2wave[ static_cast<int>( m_rphase[A2_OSC] ) ] * m_parent->m_rvol[A2_OSC];
/*interpolate( m_A2wave[ static_cast<int>( m_rphase[A2_OSC] ) % WAVELEN ],
fraction( m_lphase[A2_OSC] ) ) * m_parent->m_lvol[A2_OSC];
sample_t A2_R = linearInterpolate( m_A2wave[ static_cast<int>( m_rphase[A2_OSC] ) ],
m_A2wave[ static_cast<int>( m_rphase[A2_OSC] + 1 ) % WAVELEN ],
fraction( m_rphase[A2_OSC] ) ) * m_parent->m_rvol[A2_OSC];*/
fraction( m_rphase[A2_OSC] ) ) * m_parent->m_rvol[A2_OSC];
// if phase mod, add to phases
if( m_amod == MOD_PM )
{
@@ -143,14 +142,12 @@ void WatsynObject::renderOutput( fpp_t _frames )
///////////// B-series /////////////////
// B2
sample_t B2_L = m_B2wave[ static_cast<int>( m_lphase[B2_OSC] ) ] * m_parent->m_lvol[B2_OSC];
/*interpolate( m_B2wave[ static_cast<int>( m_lphase[B2_OSC] ) % WAVELEN ],
m_B2wave[ static_cast<int>( m_lphase[B2_OSC] + 1 ) % WAVELEN ],
fraction( m_lphase[B2_OSC] ) ) * m_parent->m_lvol[B2_OSC];*/
sample_t B2_R = m_B2wave[ static_cast<int>( m_rphase[B2_OSC] ) ] * m_parent->m_rvol[B2_OSC];
/*interpolate( m_B2wave[ static_cast<int>( m_rphase[B2_OSC] ) % WAVELEN ],
m_B2wave[ static_cast<int>( m_rphase[B2_OSC] + 1 ) % WAVELEN ],
fraction( m_rphase[B2_OSC] ) ) * m_parent->m_rvol[B2_OSC];*/
sample_t B2_L = linearInterpolate( m_B2wave[ static_cast<int>( m_lphase[B2_OSC] ) ],
m_B2wave[ static_cast<int>( m_lphase[B2_OSC] + 1 ) % WAVELEN ],
fraction( m_lphase[B2_OSC] ) ) * m_parent->m_lvol[B2_OSC];
sample_t B2_R = linearInterpolate( m_B2wave[ static_cast<int>( m_rphase[B2_OSC] ) ],
m_B2wave[ static_cast<int>( m_rphase[B2_OSC] + 1 ) % WAVELEN ],
fraction( m_rphase[B2_OSC] ) ) * m_parent->m_rvol[B2_OSC];
// if crosstalk active, add a1
const float xt = m_parent->m_xtalk.value();

4
plugins/watsyn/Watsyn.h
View File

@@ -59,7 +59,7 @@
const int GRAPHLEN = 220; // don't change - must be same as the size of the widget
const int WAVERATIO = 25; // oversampling ratio
const int WAVERATIO = 32; // oversampling ratio
const int WAVELEN = GRAPHLEN * WAVERATIO;
const int PMOD_AMT = WAVELEN / 2;
@@ -177,7 +177,7 @@ private:
inline void srccpy( float * _dst, float * _src )
{
int err;
SRC_STATE * src_state = src_new( SRC_SINC_MEDIUM_QUALITY, 1, &err );
SRC_STATE * src_state = src_new( SRC_SINC_FASTEST, 1, &err );
SRC_DATA src_data;
src_data.data_in = _src;
src_data.input_frames = GRAPHLEN;

35
src/gui/widgets/graph.cpp
View File

@@ -221,8 +221,11 @@ void graph::drawLineAt( int _x, int _y, int _lastx )
for ( int i = 0; i < linelen; i++ )
{
int x = (_x + (i * xstep)); // get x value
model()->setSampleAt( (int)( x * xscale ), val + (i * ystep));
model()->drawSampleAt( (int)( x * xscale ), val + (i * ystep));
}
int start = qMin( _x, _x + ( ( linelen - 1 ) * xstep ) );
int end = qMax( _x, _x + ( ( linelen - 1 ) * xstep ) );
model()->samplesChanged( start, end );
}
void graph::changeSampleAt( int _x, int _y )
@@ -488,18 +491,10 @@ void graphModel::setLength( int _length )
void graphModel::setSampleAt( int _x, float _val )
void graphModel::setSampleAt( int x, float val )
{
//snap to the grid
_val -= ( m_step != 0.0 ) ? fmod( _val, m_step ) * m_step : 0;
// boundary crop
_x = qMax( 0, qMin( length()-1, _x ) );
_val = qMax( minValue(), qMin( maxValue(), _val ) );
// change sample shape
m_samples[_x] = _val;
emit samplesChanged( _x, _x );
drawSampleAt( x, val );
emit samplesChanged( x, x );
}
@@ -690,4 +685,20 @@ void graphModel::shiftPhase( int _deg )
void graphModel::drawSampleAt( int x, float val )
{
//snap to the grid
val -= ( m_step != 0.0 ) ? fmod( val, m_step ) * m_step : 0;
// boundary crop
x = qMax( 0, qMin( length()-1, x ) );
val = qMax( minValue(), qMin( maxValue(), val ) );
// change sample shape
m_samples[x] = val;
}
#include "moc_graph.cxx"