Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TripleOscillator: Phase Randomization #4369

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

TripleOscillator: Phase Randomization #4369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
efe3457
Testing stuff
josh-audio May 16, 2018
706feba
(Broken) Naive attempt at phase randomization
josh-audio May 20, 2018
6d7d8a0
More broken changes
josh-audio May 20, 2018
4245c67
Fix errors
josh-audio May 21, 2018
e478ca7
Add knob to UI - doesn't work yet
josh-audio May 21, 2018
6ed7817
Use rand from lmms_math.h
josh-audio May 21, 2018
fc7be3d
Undo unnecessary change to oscillator.h
josh-audio May 21, 2018
e001869
Fix voice tracking
josh-audio May 21, 2018
c2dcdf5
Fix segfault due to QMap not being thread-safe
josh-audio May 22, 2018
5a74a49
Fix phase rand knobs
josh-audio May 22, 2018
c584a00
Clean up oscillator.h
josh-audio May 22, 2018
6a05d0e
Turns out that a disturbing amount of that was unnecessary
josh-audio May 22, 2018
2708e6c
UI Tweaks
josh-audio May 22, 2018
cb571b7
Implement changes suggested by Wallacoloo
josh-audio May 23, 2018
738eea2
Merge branch 'master' into phase-rand-experiments
PhysSong Jun 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/Oscillator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ class LMMS_EXPORT Oscillator
const float & m_freq;
const float & m_detuning_div_samplerate;
const float & m_volume;
const float & m_ext_phaseOffset;
float m_ext_phaseOffset;
Oscillator * m_subOsc;
float m_phaseOffset;
float m_phase;
Expand Down
50 changes: 40 additions & 10 deletions plugins/TripleOscillator/TripleOscillator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
#include "Oscillator.h"
#include "PixmapButton.h"
#include "SampleBuffer.h"
#include "lmms_math.h"

#include "embed.h"
#include "plugin_export.h"
Expand Down Expand Up @@ -75,15 +76,17 @@ OscillatorObject::OscillatorObject( Model * _parent, int _idx ) :
tr( "Osc %1 panning" ).arg( _idx+1 ) ),
m_coarseModel( -_idx*KeysPerOctave,
-2 * KeysPerOctave, 2 * KeysPerOctave, 1.0f, this,
tr( "Osc %1 coarse detuning" ).arg( _idx+1 ) ),
tr( "Osc %1 coarse detuning" ).arg( _idx + 1 ) ),
m_fineLeftModel( 0.0f, -100.0f, 100.0f, 1.0f, this,
tr( "Osc %1 fine detuning left" ).arg( _idx+1 ) ),
tr( "Osc %1 fine detuning left" ).arg( _idx + 1 ) ),
m_fineRightModel( 0.0f, -100.0f, 100.0f, 1.0f, this,
tr( "Osc %1 fine detuning right" ).arg( _idx + 1 ) ),
m_phaseOffsetModel( 0.0f, 0.0f, 360.0f, 1.0f, this,
tr( "Osc %1 phase-offset" ).arg( _idx+1 ) ),
tr( "Osc %1 phase-offset" ).arg( _idx + 1 ) ),
m_stereoPhaseDetuningModel( 0.0f, 0.0f, 360.0f, 1.0f, this,
tr( "Osc %1 stereo phase-detuning" ).arg( _idx+1 ) ),
tr( "Osc %1 stereo phase-detuning" ).arg( _idx + 1 ) ),
m_phaseRandModel( 0.0f, 0.0f, 100.0f, 1.0f, this,
tr( "Osc %1 phase randomization" ).arg( _idx + 1 ) ),
m_waveShapeModel( Oscillator::SineWave, 0,
Oscillator::NumWaveShapes-1, this,
tr( "Osc %1 wave shape" ).arg( _idx+1 ) ),
Expand Down Expand Up @@ -125,6 +128,8 @@ OscillatorObject::OscillatorObject( Model * _parent, int _idx ) :
this, SLOT( updatePhaseOffsetRight() ), Qt::DirectConnection );
connect( &m_stereoPhaseDetuningModel, SIGNAL( dataChanged() ),
this, SLOT( updatePhaseOffsetLeft() ), Qt::DirectConnection );
connect( &m_phaseRandModel, SIGNAL( dataChanged() ),
this, SLOT( updatePhaseRand() ), Qt::DirectConnection );
connect ( &m_useWaveTableModel, SIGNAL(dataChanged()),
this, SLOT( updateUseWaveTable()));

Expand Down Expand Up @@ -222,6 +227,15 @@ void OscillatorObject::updateUseWaveTable()




void OscillatorObject::updatePhaseRand()
{
m_phaseRand = m_phaseRandModel.value() / 100;
}




TripleOscillator::TripleOscillator( InstrumentTrack * _instrument_track ) :
Instrument( _instrument_track, &tripleoscillator_plugin_descriptor )
{
Expand Down Expand Up @@ -255,6 +269,8 @@ void TripleOscillator::saveSettings( QDomDocument & _doc, QDomElement & _this )
"phoffset" + is );
m_osc[i]->m_stereoPhaseDetuningModel.saveSettings( _doc, _this,
"stphdetun" + is );
m_osc[i]->m_phaseRandModel.saveSettings( _doc, _this,
"phrand" + is );
m_osc[i]->m_waveShapeModel.saveSettings( _doc, _this,
"wavetype" + is );
m_osc[i]->m_modulationAlgoModel.saveSettings( _doc, _this,
Expand Down Expand Up @@ -283,6 +299,8 @@ void TripleOscillator::loadSettings( const QDomElement & _this )
"phoffset" + is );
m_osc[i]->m_stereoPhaseDetuningModel.loadSettings( _this,
"stphdetun" + is );
m_osc[i]->m_phaseRandModel.loadSettings( _this,
"phrand" + is );
m_osc[i]->m_waveShapeModel.loadSettings( _this, "wavetype" +
is );
m_osc[i]->m_modulationAlgoModel.loadSettings( _this,
Expand Down Expand Up @@ -316,6 +334,9 @@ void TripleOscillator::playNote( NotePlayHandle * _n,
for( int i = NUM_OF_OSCILLATORS - 1; i >= 0; --i )
{

float phaseRandL = fastRandf( 1 ) * m_osc[i]->m_phaseRand;
float phaseRandR = fastRandf( 1 ) * m_osc[i]->m_phaseRand;

// the last oscs needs no sub-oscs...
if( i == NUM_OF_OSCILLATORS - 1 )
{
Expand All @@ -324,15 +345,15 @@ void TripleOscillator::playNote( NotePlayHandle * _n,
&m_osc[i]->m_modulationAlgoModel,
_n->frequency(),
m_osc[i]->m_detuningLeft,
m_osc[i]->m_phaseOffsetLeft,
m_osc[i]->m_phaseOffsetLeft + phaseRandL,
m_osc[i]->m_volumeLeft );
oscs_l[i]->setUseWaveTable(m_osc[i]->m_useWaveTable);
oscs_r[i] = new Oscillator(
&m_osc[i]->m_waveShapeModel,
&m_osc[i]->m_modulationAlgoModel,
_n->frequency(),
m_osc[i]->m_detuningRight,
m_osc[i]->m_phaseOffsetRight,
m_osc[i]->m_phaseOffsetRight + phaseRandR,
m_osc[i]->m_volumeRight );
oscs_r[i]->setUseWaveTable(m_osc[i]->m_useWaveTable);
}
Expand All @@ -343,7 +364,7 @@ void TripleOscillator::playNote( NotePlayHandle * _n,
&m_osc[i]->m_modulationAlgoModel,
_n->frequency(),
m_osc[i]->m_detuningLeft,
m_osc[i]->m_phaseOffsetLeft,
m_osc[i]->m_phaseOffsetLeft + phaseRandL,
m_osc[i]->m_volumeLeft,
oscs_l[i + 1] );
oscs_l[i]->setUseWaveTable(m_osc[i]->m_useWaveTable);
Expand All @@ -352,15 +373,14 @@ void TripleOscillator::playNote( NotePlayHandle * _n,
&m_osc[i]->m_modulationAlgoModel,
_n->frequency(),
m_osc[i]->m_detuningRight,
m_osc[i]->m_phaseOffsetRight,
m_osc[i]->m_phaseOffsetRight + phaseRandR,
m_osc[i]->m_volumeRight,
oscs_r[i + 1] );
oscs_r[i]->setUseWaveTable(m_osc[i]->m_useWaveTable);
}

oscs_l[i]->setUserWave( m_osc[i]->m_sampleBuffer );
oscs_r[i]->setUserWave( m_osc[i]->m_sampleBuffer );

}

_n->m_pluginData = new oscPtr;
Expand Down Expand Up @@ -586,6 +606,13 @@ TripleOscillatorView::TripleOscillatorView( Instrument * _instrument,
arg( i + 1 ),
" " + tr( "cents" ) );

// setup phase randomization knob
Knob * phrk = new TripleOscKnob( this );
phrk->move( 165, knob_y );
phrk->setHintText( tr( "Osc %1 phase randomization:" ).
arg( i + 1 ),
" " + tr( "%" ) );

// setup phase-offset-knob
Knob * pok = new TripleOscKnob( this );
pok->move( 188, knob_y );
Expand All @@ -600,6 +627,7 @@ TripleOscillatorView::TripleOscillatorView( Instrument * _instrument,
arg( i + 1 ),
" " + tr( "degrees" ) );


int btn_y = 96 + i * osc_h;

auto sin_wave_btn = new PixmapButton(this, nullptr);
Expand Down Expand Up @@ -695,7 +723,7 @@ TripleOscillatorView::TripleOscillatorView( Instrument * _instrument,


m_oscKnobs[i] = OscillatorKnobs( vk, pk, ck, flk, frk, pok,
spdk, uwb, wsbg, uwt );
spdk, phrk, uwb, wsbg, uwt );
}
}

Expand Down Expand Up @@ -724,6 +752,8 @@ void TripleOscillatorView::modelChanged()
&t->m_osc[i]->m_phaseOffsetModel );
m_oscKnobs[i].m_stereoPhaseDetuningKnob->setModel(
&t->m_osc[i]->m_stereoPhaseDetuningModel );
m_oscKnobs[i].m_phaseRandKnob->setModel(
&t->m_osc[i]->m_phaseRandModel );
m_oscKnobs[i].m_waveShapeBtnGrp->setModel(
&t->m_osc[i]->m_waveShapeModel );
m_oscKnobs[i].m_multiBandWaveTableButton->setModel(
Expand Down
7 changes: 7 additions & 0 deletions plugins/TripleOscillator/TripleOscillator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ class OscillatorObject : public Model
FloatModel m_fineRightModel;
FloatModel m_phaseOffsetModel;
FloatModel m_stereoPhaseDetuningModel;
FloatModel m_phaseRandModel;
IntModel m_waveShapeModel;
IntModel m_modulationAlgoModel;
BoolModel m_useWaveTableModel;
Expand All @@ -84,6 +85,8 @@ class OscillatorObject : public Model
float m_phaseOffsetRight;
bool m_useWaveTable;

float m_phaseRand;

friend class TripleOscillator;
friend class gui::TripleOscillatorView;

Expand All @@ -96,6 +99,7 @@ private slots:
void updateDetuningRight();
void updatePhaseOffsetLeft();
void updatePhaseOffsetRight();
void updatePhaseRand();
void updateUseWaveTable();

} ;
Expand Down Expand Up @@ -176,6 +180,7 @@ class TripleOscillatorView : public InstrumentViewFixedSize
Knob * fr,
Knob * po,
Knob * spd,
Knob * rnd,
PixmapButton * uwb,
automatableButtonGroup * wsbg,
PixmapButton * wt) :
Expand All @@ -186,6 +191,7 @@ class TripleOscillatorView : public InstrumentViewFixedSize
m_fineRightKnob( fr ),
m_phaseOffsetKnob( po ),
m_stereoPhaseDetuningKnob( spd ),
m_phaseRandKnob( rnd ),
m_userWaveButton( uwb ),
m_waveShapeBtnGrp( wsbg ),
m_multiBandWaveTableButton( wt )
Expand All @@ -199,6 +205,7 @@ class TripleOscillatorView : public InstrumentViewFixedSize
Knob * m_fineRightKnob;
Knob * m_phaseOffsetKnob;
Knob * m_stereoPhaseDetuningKnob;
Knob * m_phaseRandKnob;
PixmapButton * m_userWaveButton;
automatableButtonGroup * m_waveShapeBtnGrp;
PixmapButton * m_multiBandWaveTableButton;
Expand Down
Binary file modified plugins/TripleOscillator/artwork.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.