From b118c23123b4734f2e9032a53fad3f44eee1c8cf Mon Sep 17 00:00:00 2001 From: Vesa Date: Tue, 25 Mar 2014 02:15:03 +0200 Subject: [PATCH] Rename & refactor to Watsyn, add logo, tweak some algorithms --- data/themes/default/style.css | 46 ++++------ plugins/CMakeLists.txt | 2 +- plugins/watsyn/CMakeLists.txt | 3 + .../WTSynth.cpp => watsyn/Watsyn.cpp} | 82 +++++++++--------- .../{wtsynth/WTSynth.h => watsyn/Watsyn.h} | 58 ++++++++----- plugins/{wtsynth => watsyn}/a1_active.png | Bin plugins/{wtsynth => watsyn}/a1_inactive.png | Bin plugins/{wtsynth => watsyn}/a2_active.png | Bin plugins/{wtsynth => watsyn}/a2_inactive.png | Bin plugins/{wtsynth => watsyn}/aam_active.png | Bin plugins/{wtsynth => watsyn}/aam_inactive.png | Bin plugins/{wtsynth => watsyn}/amix_active.png | Bin plugins/{wtsynth => watsyn}/amix_inactive.png | Bin plugins/{wtsynth => watsyn}/apm_active.png | Bin plugins/{wtsynth => watsyn}/apm_inactive.png | Bin plugins/{wtsynth => watsyn}/arm_active.png | Bin plugins/{wtsynth => watsyn}/arm_inactive.png | Bin plugins/{wtsynth => watsyn}/artwork.png | Bin plugins/{wtsynth => watsyn}/b1_active.png | Bin plugins/{wtsynth => watsyn}/b1_inactive.png | Bin plugins/{wtsynth => watsyn}/b2_active.png | Bin plugins/{wtsynth => watsyn}/b2_inactive.png | Bin plugins/{wtsynth => watsyn}/bam_active.png | Bin plugins/{wtsynth => watsyn}/bam_inactive.png | Bin plugins/{wtsynth => watsyn}/bmix_active.png | Bin plugins/{wtsynth => watsyn}/bmix_inactive.png | Bin plugins/{wtsynth => watsyn}/bpm_active.png | Bin plugins/{wtsynth => watsyn}/bpm_inactive.png | Bin plugins/{wtsynth => watsyn}/brm_active.png | Bin plugins/{wtsynth => watsyn}/brm_inactive.png | Bin plugins/{wtsynth => watsyn}/inv_active.png | Bin plugins/{wtsynth => watsyn}/inv_inactive.png | Bin plugins/{wtsynth => watsyn}/load_active.png | Bin plugins/{wtsynth => watsyn}/load_inactive.png | Bin plugins/watsyn/logo.png | Bin 0 -> 4425 bytes plugins/{wtsynth => watsyn}/norm_active.png | Bin plugins/{wtsynth => watsyn}/norm_inactive.png | Bin plugins/{wtsynth => watsyn}/phl_active.png | Bin plugins/{wtsynth => watsyn}/phl_inactive.png | Bin plugins/{wtsynth => watsyn}/phr_active.png | Bin plugins/{wtsynth => watsyn}/phr_inactive.png | Bin plugins/{wtsynth => watsyn}/saw_active.png | Bin plugins/{wtsynth => watsyn}/saw_inactive.png | Bin plugins/{wtsynth => watsyn}/sin_active.png | Bin plugins/{wtsynth => watsyn}/sin_inactive.png | Bin plugins/{wtsynth => watsyn}/smooth_active.png | Bin .../{wtsynth => watsyn}/smooth_inactive.png | Bin plugins/{wtsynth => watsyn}/sqr_active.png | Bin plugins/{wtsynth => watsyn}/sqr_inactive.png | Bin plugins/{wtsynth => watsyn}/tri_active.png | Bin plugins/{wtsynth => watsyn}/tri_inactive.png | Bin plugins/{wtsynth => watsyn}/wavegraph.png | Bin plugins/wtsynth/CMakeLists.txt | 3 - plugins/wtsynth/logo.png | Bin 174 -> 0 bytes 54 files changed, 98 insertions(+), 96 deletions(-) create mode 100644 plugins/watsyn/CMakeLists.txt rename plugins/{wtsynth/WTSynth.cpp => watsyn/Watsyn.cpp} (95%) rename plugins/{wtsynth/WTSynth.h => watsyn/Watsyn.h} (84%) rename plugins/{wtsynth => watsyn}/a1_active.png (100%) rename plugins/{wtsynth => watsyn}/a1_inactive.png (100%) rename plugins/{wtsynth => watsyn}/a2_active.png (100%) rename plugins/{wtsynth => watsyn}/a2_inactive.png (100%) rename plugins/{wtsynth => watsyn}/aam_active.png (100%) rename plugins/{wtsynth => watsyn}/aam_inactive.png (100%) rename plugins/{wtsynth => watsyn}/amix_active.png (100%) rename plugins/{wtsynth => watsyn}/amix_inactive.png (100%) rename plugins/{wtsynth => watsyn}/apm_active.png (100%) rename plugins/{wtsynth => watsyn}/apm_inactive.png (100%) rename plugins/{wtsynth => watsyn}/arm_active.png (100%) rename plugins/{wtsynth => watsyn}/arm_inactive.png (100%) rename plugins/{wtsynth => watsyn}/artwork.png (100%) rename plugins/{wtsynth => watsyn}/b1_active.png (100%) rename plugins/{wtsynth => watsyn}/b1_inactive.png (100%) rename plugins/{wtsynth => watsyn}/b2_active.png (100%) rename plugins/{wtsynth => watsyn}/b2_inactive.png (100%) rename plugins/{wtsynth => watsyn}/bam_active.png (100%) rename plugins/{wtsynth => watsyn}/bam_inactive.png (100%) rename plugins/{wtsynth => watsyn}/bmix_active.png (100%) rename plugins/{wtsynth => watsyn}/bmix_inactive.png (100%) rename plugins/{wtsynth => watsyn}/bpm_active.png (100%) rename plugins/{wtsynth => watsyn}/bpm_inactive.png (100%) rename plugins/{wtsynth => watsyn}/brm_active.png (100%) rename plugins/{wtsynth => watsyn}/brm_inactive.png (100%) rename plugins/{wtsynth => watsyn}/inv_active.png (100%) rename plugins/{wtsynth => watsyn}/inv_inactive.png (100%) rename plugins/{wtsynth => watsyn}/load_active.png (100%) rename plugins/{wtsynth => watsyn}/load_inactive.png (100%) create mode 100644 plugins/watsyn/logo.png rename plugins/{wtsynth => watsyn}/norm_active.png (100%) rename plugins/{wtsynth => watsyn}/norm_inactive.png (100%) rename plugins/{wtsynth => watsyn}/phl_active.png (100%) rename plugins/{wtsynth => watsyn}/phl_inactive.png (100%) rename plugins/{wtsynth => watsyn}/phr_active.png (100%) rename plugins/{wtsynth => watsyn}/phr_inactive.png (100%) rename plugins/{wtsynth => watsyn}/saw_active.png (100%) rename plugins/{wtsynth => watsyn}/saw_inactive.png (100%) rename plugins/{wtsynth => watsyn}/sin_active.png (100%) rename plugins/{wtsynth => watsyn}/sin_inactive.png (100%) rename plugins/{wtsynth => watsyn}/smooth_active.png (100%) rename plugins/{wtsynth => watsyn}/smooth_inactive.png (100%) rename plugins/{wtsynth => watsyn}/sqr_active.png (100%) rename plugins/{wtsynth => watsyn}/sqr_inactive.png (100%) rename plugins/{wtsynth => watsyn}/tri_active.png (100%) rename plugins/{wtsynth => watsyn}/tri_inactive.png (100%) rename plugins/{wtsynth => watsyn}/wavegraph.png (100%) delete mode 100644 plugins/wtsynth/CMakeLists.txt delete mode 100644 plugins/wtsynth/logo.png diff --git a/data/themes/default/style.css b/data/themes/default/style.css index 7d41a8f07..b68ef0658 100644 --- a/data/themes/default/style.css +++ b/data/themes/default/style.css @@ -238,7 +238,7 @@ TrackContainerView QFrame{ /* autoscroll, loop, stop behaviour toggle buttons */ -nStateButton { +nStateButton { max-height: 26px; max-width: 26px; min-height: 26px; @@ -366,7 +366,7 @@ toolButton#playButton { toolButton#stopButton { border-top-right-radius: 5px 15px; - border-bottom-right-radius: 5px 15px; + border-bottom-right-radius: 5px 15px; } /* record and record-accompany can be styled with #recordButton and #recordAccompanyButton respectively */ @@ -608,54 +608,40 @@ sidInstrumentView knob { qproperty-lineWidth: 2; } -WTSynthView knob#aKnob { +WatsynView knob { + qproperty-innerRadius: 1; + qproperty-outerRadius: 7; + qproperty-centerPointX: 9.5; + qproperty-centerPointY: 9.5; + qproperty-lineWidth: 2; +} + +WatsynView knob#aKnob { color: #43b2ff; qproperty-outerColor: #43b2ff; - qproperty-innerRadius: 1; - qproperty-outerRadius: 7; - qproperty-centerPointX: 9.5; - qproperty-centerPointY: 9.5; - qproperty-lineWidth: 2; } -WTSynthView knob#bKnob { +WatsynView knob#bKnob { color: #fc5431; qproperty-outerColor: #fc5431; - qproperty-innerRadius: 1; - qproperty-outerRadius: 7; - qproperty-centerPointX: 9.5; - qproperty-centerPointY: 9.5; - qproperty-lineWidth: 2; } -WTSynthView knob#mixKnob { +WatsynView knob#mixKnob { color: #43ff82; qproperty-outerColor: #43ff82; - qproperty-innerRadius: 1; qproperty-outerRadius: 13; qproperty-centerPointX: 15.5; - qproperty-centerPointY: 15.5; - qproperty-lineWidth: 2; + qproperty-centerPointY: 15.5; } -WTSynthView knob#mixenvKnob { +WatsynView knob#mixenvKnob { color: #43ff82; qproperty-outerColor: #43ff82; - qproperty-innerRadius: 1; - qproperty-outerRadius: 7; - qproperty-centerPointX: 9.5; - qproperty-centerPointY: 9.5; - qproperty-lineWidth: 2; } -WTSynthView knob#xtalkKnob { +WatsynView knob#xtalkKnob { color: #fb50fb; qproperty-outerColor: #fb50fb; - qproperty-innerRadius: 1; - qproperty-outerRadius: 7; - qproperty-centerPointX: 9.5; - qproperty-centerPointY: 9.5; - qproperty-lineWidth: 2; } /* palette information - each colour definition must be on a single line, and the line must begin with "palette:", with no leading whitespace diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index aba116025..b1247ce18 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -28,7 +28,7 @@ ADD_SUBDIRECTORY(triple_oscillator) ADD_SUBDIRECTORY(vestige) ADD_SUBDIRECTORY(vst_base) ADD_SUBDIRECTORY(VstEffect) +ADD_SUBDIRECTORY(watsyn) ADD_SUBDIRECTORY(waveshaper) -ADD_SUBDIRECTORY(wtsynth) ADD_SUBDIRECTORY(vibed) ADD_SUBDIRECTORY(zynaddsubfx) diff --git a/plugins/watsyn/CMakeLists.txt b/plugins/watsyn/CMakeLists.txt new file mode 100644 index 000000000..c5344f7e7 --- /dev/null +++ b/plugins/watsyn/CMakeLists.txt @@ -0,0 +1,3 @@ +INCLUDE(BuildPlugin) + +BUILD_PLUGIN(watsyn Watsyn.cpp Watsyn.h MOCFILES Watsyn.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) diff --git a/plugins/wtsynth/WTSynth.cpp b/plugins/watsyn/Watsyn.cpp similarity index 95% rename from plugins/wtsynth/WTSynth.cpp rename to plugins/watsyn/Watsyn.cpp index 8ba27e38b..b3b720d4d 100644 --- a/plugins/wtsynth/WTSynth.cpp +++ b/plugins/watsyn/Watsyn.cpp @@ -1,5 +1,5 @@ /* - * WTSynth.cpp - work in process, name pending + * Watsyn.cpp - a 4-oscillator modulating wavetable synth * * Copyright (c) 2014 Vesa Kivimäki * @@ -24,7 +24,7 @@ #include -#include "WTSynth.h" +#include "Watsyn.h" #include "engine.h" #include "InstrumentTrack.h" #include "templates.h" @@ -37,10 +37,10 @@ extern "C" { -Plugin::Descriptor PLUGIN_EXPORT wtsynth_plugin_descriptor = +Plugin::Descriptor PLUGIN_EXPORT watsyn_plugin_descriptor = { STRINGIFY( PLUGIN_NAME ), - "WTSynth", + "Watsyn", QT_TRANSLATE_NOOP( "pluginBrowser", "4-oscillator modulatable wavetable synth" ), "Vesa Kivimäki ", @@ -56,10 +56,10 @@ Plugin::Descriptor PLUGIN_EXPORT wtsynth_plugin_descriptor = -WTSynthObject::WTSynthObject( float * _A1wave, float * _A2wave, +WatsynObject::WatsynObject( float * _A1wave, float * _A2wave, float * _B1wave, float * _B2wave, int _amod, int _bmod, const sample_rate_t _samplerate, NotePlayHandle * _nph, fpp_t _frames, - WTSynthInstrument * _w ) : + WatsynInstrument * _w ) : m_amod( _amod ), m_bmod( _bmod ), m_samplerate( _samplerate ), @@ -89,14 +89,14 @@ WTSynthObject::WTSynthObject( float * _A1wave, float * _A2wave, -WTSynthObject::~WTSynthObject() +WatsynObject::~WatsynObject() { delete[] m_abuf; delete[] m_bbuf; } -void WTSynthObject::renderOutput( fpp_t _frames ) +void WatsynObject::renderOutput( fpp_t _frames ) { if( m_abuf == NULL ) m_abuf = new sampleFrame[m_fpp]; @@ -223,8 +223,8 @@ void WTSynthObject::renderOutput( fpp_t _frames ) -WTSynthInstrument::WTSynthInstrument( InstrumentTrack * _instrument_track ) : - Instrument( _instrument_track, &wtsynth_plugin_descriptor ), +WatsynInstrument::WatsynInstrument( InstrumentTrack * _instrument_track ) : + Instrument( _instrument_track, &watsyn_plugin_descriptor ), a1_vol( 100.0f, 0.0f, 200.0f, 0.1f, this, tr( "Volume A1" ) ), a2_vol( 100.0f, 0.0f, 200.0f, 0.1f, this, tr( "Volume A2" ) ), @@ -305,17 +305,17 @@ WTSynthInstrument::WTSynthInstrument( InstrumentTrack * _instrument_track ) : } -WTSynthInstrument::~WTSynthInstrument() +WatsynInstrument::~WatsynInstrument() { } -void WTSynthInstrument::playNote( NotePlayHandle * _n, +void WatsynInstrument::playNote( NotePlayHandle * _n, sampleFrame * _working_buffer ) { if ( _n->totalFramesPlayed() == 0 || _n->m_pluginData == NULL ) { - WTSynthObject * w = new WTSynthObject( const_cast( a1_graph.samples() ), + WatsynObject * w = new WatsynObject( const_cast( a1_graph.samples() ), const_cast( a2_graph.samples() ), const_cast( b1_graph.samples() ), const_cast( b2_graph.samples() ), @@ -328,7 +328,7 @@ void WTSynthInstrument::playNote( NotePlayHandle * _n, const fpp_t frames = _n->framesLeftForCurrentPeriod(); - WTSynthObject * w = static_cast( _n->m_pluginData ); + WatsynObject * w = static_cast( _n->m_pluginData ); sampleFrame * abuf = w->abuf(); sampleFrame * bbuf = w->bbuf(); @@ -435,13 +435,13 @@ void WTSynthInstrument::playNote( NotePlayHandle * _n, } -void WTSynthInstrument::deleteNotePluginData( NotePlayHandle * _n ) +void WatsynInstrument::deleteNotePluginData( NotePlayHandle * _n ) { - delete static_cast( _n->m_pluginData ); + delete static_cast( _n->m_pluginData ); } -void WTSynthInstrument::saveSettings( QDomDocument & _doc, +void WatsynInstrument::saveSettings( QDomDocument & _doc, QDomElement & _this ) { a1_vol.saveSettings( _doc, _this, "a1_vol" ); @@ -495,7 +495,7 @@ void WTSynthInstrument::saveSettings( QDomDocument & _doc, } -void WTSynthInstrument::loadSettings( const QDomElement & _this ) +void WatsynInstrument::loadSettings( const QDomElement & _this ) { a1_vol.loadSettings( _this, "a1_vol" ); a2_vol.loadSettings( _this, "a2_vol" ); @@ -552,19 +552,19 @@ void WTSynthInstrument::loadSettings( const QDomElement & _this ) } -QString WTSynthInstrument::nodeName() const +QString WatsynInstrument::nodeName() const { - return( wtsynth_plugin_descriptor.name ); + return( watsyn_plugin_descriptor.name ); } -PluginView * WTSynthInstrument::instantiateView( QWidget * _parent ) +PluginView * WatsynInstrument::instantiateView( QWidget * _parent ) { - return( new WTSynthView( this, _parent ) ); + return( new WatsynView( this, _parent ) ); } -void WTSynthInstrument::updateVolumes() +void WatsynInstrument::updateVolumes() { m_lvol[A1_OSC] = leftCh( a1_vol.value(), a1_pan.value() ); m_rvol[A1_OSC] = rightCh( a1_vol.value(), a1_pan.value() ); @@ -579,7 +579,7 @@ void WTSynthInstrument::updateVolumes() m_rvol[B2_OSC] = rightCh( b2_vol.value(), b2_pan.value() ); } -void WTSynthInstrument::updateFreq() +void WatsynInstrument::updateFreq() { // calculate frequencies m_lfreq[A1_OSC] = ( a1_mult.value() / 8 ) * powf( 2, a1_ltune.value() / 1200 ); @@ -596,7 +596,7 @@ void WTSynthInstrument::updateFreq() } -WTSynthView::WTSynthView( Instrument * _instrument, +WatsynView::WatsynView( Instrument * _instrument, QWidget * _parent ) : InstrumentView( _instrument, _parent ) { @@ -871,13 +871,13 @@ WTSynthView::WTSynthView( Instrument * _instrument, } -WTSynthView::~WTSynthView() +WatsynView::~WatsynView() { } -void WTSynthView::updateLayout() +void WatsynView::updateLayout() { switch( m_selectedGraphGroup->model()->value() ) { @@ -910,7 +910,7 @@ void WTSynthView::updateLayout() -void WTSynthView::sinWaveClicked() +void WatsynView::sinWaveClicked() { switch( m_selectedGraphGroup->model()->value() ) { @@ -934,7 +934,7 @@ void WTSynthView::sinWaveClicked() } -void WTSynthView::triWaveClicked() +void WatsynView::triWaveClicked() { switch( m_selectedGraphGroup->model()->value() ) { @@ -958,7 +958,7 @@ void WTSynthView::triWaveClicked() } -void WTSynthView::sawWaveClicked() +void WatsynView::sawWaveClicked() { switch( m_selectedGraphGroup->model()->value() ) { @@ -982,7 +982,7 @@ void WTSynthView::sawWaveClicked() } -void WTSynthView::sqrWaveClicked() +void WatsynView::sqrWaveClicked() { switch( m_selectedGraphGroup->model()->value() ) { @@ -1006,7 +1006,7 @@ void WTSynthView::sqrWaveClicked() } -void WTSynthView::normalizeClicked() +void WatsynView::normalizeClicked() { switch( m_selectedGraphGroup->model()->value() ) { @@ -1030,7 +1030,7 @@ void WTSynthView::normalizeClicked() } -void WTSynthView::invertClicked() +void WatsynView::invertClicked() { switch( m_selectedGraphGroup->model()->value() ) { @@ -1054,7 +1054,7 @@ void WTSynthView::invertClicked() } -void WTSynthView::smoothClicked() +void WatsynView::smoothClicked() { switch( m_selectedGraphGroup->model()->value() ) { @@ -1078,7 +1078,7 @@ void WTSynthView::smoothClicked() } -void WTSynthView::phaseLeftClicked() +void WatsynView::phaseLeftClicked() { switch( m_selectedGraphGroup->model()->value() ) { @@ -1102,7 +1102,7 @@ void WTSynthView::phaseLeftClicked() } -void WTSynthView::phaseRightClicked() +void WatsynView::phaseRightClicked() { switch( m_selectedGraphGroup->model()->value() ) { @@ -1126,7 +1126,7 @@ void WTSynthView::phaseRightClicked() } -void WTSynthView::loadClicked() +void WatsynView::loadClicked() { QString fileName; switch( m_selectedGraphGroup->model()->value() ) @@ -1151,9 +1151,9 @@ void WTSynthView::loadClicked() } -void WTSynthView::modelChanged() +void WatsynView::modelChanged() { - WTSynthInstrument * w = castModel(); + WatsynInstrument * w = castModel(); a1_volKnob -> setModel( &w -> a1_vol ); a2_volKnob -> setModel( &w -> a2_vol ); @@ -1210,11 +1210,11 @@ extern "C" // necessary for getting instance out of shared lib Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data ) { - return( new WTSynthInstrument( static_cast( _data ) ) ); + return( new WatsynInstrument( static_cast( _data ) ) ); } } -#include "moc_WTSynth.cxx" +#include "moc_Watsyn.cxx" diff --git a/plugins/wtsynth/WTSynth.h b/plugins/watsyn/Watsyn.h similarity index 84% rename from plugins/wtsynth/WTSynth.h rename to plugins/watsyn/Watsyn.h index 6513e9141..a6860cbed 100644 --- a/plugins/wtsynth/WTSynth.h +++ b/plugins/watsyn/Watsyn.h @@ -1,5 +1,5 @@ /* - * WTSynth.h - work in process, name pending + * Watsyn.h - a 4-oscillator modulating wavetable synth * * Copyright (c) 2014 Vesa Kivimäki * @@ -23,8 +23,8 @@ */ -#ifndef WTSYNTH_H -#define WTSYNTH_H +#ifndef WATSYN_H +#define WATSYN_H #include "Instrument.h" #include "InstrumentView.h" @@ -71,16 +71,16 @@ extern const int B1_OSC = 2; extern const int B2_OSC = 3; extern const int NUM_OSCS = 4; -class WTSynthInstrument; +class WatsynInstrument; -class WTSynthObject +class WatsynObject { public: - WTSynthObject( float * _A1wave, float * _A2wave, + WatsynObject( float * _A1wave, float * _A2wave, float * _B1wave, float * _B2wave, int _amod, int _bmod, const sample_rate_t _samplerate, NotePlayHandle * _nph, fpp_t _frames, - WTSynthInstrument * _w ); - virtual ~WTSynthObject(); + WatsynInstrument * _w ); + virtual ~WatsynObject(); void renderOutput( fpp_t _frames ); @@ -103,17 +103,33 @@ private: { return s1 + ( s2 - s1 ) * x; }*/ + // quick and dirty approximation of cubic interpolation inline sample_t interpolate( sample_t s1, sample_t s2, float x ) { const float x2 = powf( x, 2 ); const float x3 = powf( x, 3 ); - const float m = s2 - s1; + //const float m = s2 - s1; + + return ( ( x3 * 2.0 - x2 * 3.0 + 1.0 ) * s1 ) + + ( ( x3 * -2.0 + x2 * 3.0 ) * s2 );// + + //( ( x + x3 * 2.0 - x2 * 3.0 ) * m ); + } + + // more accurate cubic interpolation... + // consumes more cpu than ^ but doesn't bring a marked increase in sound quality IMO +/* inline sample_t interpolate( sample_t s0, sample_t s1, sample_t s2, sample_t s3, float x ) + { + const float x2 = powf( x, 2 ); + const float x3 = powf( x, 3 ); + const float m1 = ( s2 - s0 ) / 2; + const float m2 = ( s3 - s1 ) / 2; return ( ( x3 * 2.0 - x2 * 3.0 + 1.0 ) * s1 ) + ( ( x3 * -2.0 + x2 * 3.0 ) * s2 ) + - ( ( x + x3 * 2.0 - x2 * 3.0 ) * m ); - } + ( ( x3 - x2 * 2 + x ) * m1 ) + + ( ( x3 - x2 ) * m2 ); + }*/ int m_amod; int m_bmod; @@ -123,7 +139,7 @@ private: fpp_t m_fpp; - WTSynthInstrument * m_parent; + WatsynInstrument * m_parent; sampleFrame * m_abuf; sampleFrame * m_bbuf; @@ -137,12 +153,12 @@ private: float m_B2wave [WAVELEN]; }; -class WTSynthInstrument : public Instrument +class WatsynInstrument : public Instrument { Q_OBJECT public: - WTSynthInstrument( InstrumentTrack * _instrument_track ); - virtual ~WTSynthInstrument(); + WatsynInstrument( InstrumentTrack * _instrument_track ); + virtual ~WatsynInstrument(); virtual void playNote( NotePlayHandle * _n, sampleFrame * _working_buffer ); @@ -161,7 +177,7 @@ public: } virtual PluginView * instantiateView( QWidget * _parent ); - + public slots: void updateVolumes(); void updateFreq(); @@ -229,18 +245,18 @@ private: IntModel m_selectedGraph; - friend class WTSynthObject; - friend class WTSynthView; + friend class WatsynObject; + friend class WatsynView; }; -class WTSynthView : public InstrumentView +class WatsynView : public InstrumentView { Q_OBJECT public: - WTSynthView( Instrument * _instrument, + WatsynView( Instrument * _instrument, QWidget * _parent ); - virtual ~WTSynthView(); + virtual ~WatsynView(); protected slots: void updateLayout(); diff --git a/plugins/wtsynth/a1_active.png b/plugins/watsyn/a1_active.png similarity index 100% rename from plugins/wtsynth/a1_active.png rename to plugins/watsyn/a1_active.png diff --git a/plugins/wtsynth/a1_inactive.png b/plugins/watsyn/a1_inactive.png similarity index 100% rename from plugins/wtsynth/a1_inactive.png rename to plugins/watsyn/a1_inactive.png diff --git a/plugins/wtsynth/a2_active.png b/plugins/watsyn/a2_active.png similarity index 100% rename from plugins/wtsynth/a2_active.png rename to plugins/watsyn/a2_active.png diff --git a/plugins/wtsynth/a2_inactive.png b/plugins/watsyn/a2_inactive.png similarity index 100% rename from plugins/wtsynth/a2_inactive.png rename to plugins/watsyn/a2_inactive.png diff --git a/plugins/wtsynth/aam_active.png b/plugins/watsyn/aam_active.png similarity index 100% rename from plugins/wtsynth/aam_active.png rename to plugins/watsyn/aam_active.png diff --git a/plugins/wtsynth/aam_inactive.png b/plugins/watsyn/aam_inactive.png similarity index 100% rename from plugins/wtsynth/aam_inactive.png rename to plugins/watsyn/aam_inactive.png diff --git a/plugins/wtsynth/amix_active.png b/plugins/watsyn/amix_active.png similarity index 100% rename from plugins/wtsynth/amix_active.png rename to plugins/watsyn/amix_active.png diff --git a/plugins/wtsynth/amix_inactive.png b/plugins/watsyn/amix_inactive.png similarity index 100% rename from plugins/wtsynth/amix_inactive.png rename to plugins/watsyn/amix_inactive.png diff --git a/plugins/wtsynth/apm_active.png b/plugins/watsyn/apm_active.png similarity index 100% rename from plugins/wtsynth/apm_active.png rename to plugins/watsyn/apm_active.png diff --git a/plugins/wtsynth/apm_inactive.png b/plugins/watsyn/apm_inactive.png similarity index 100% rename from plugins/wtsynth/apm_inactive.png rename to plugins/watsyn/apm_inactive.png diff --git a/plugins/wtsynth/arm_active.png b/plugins/watsyn/arm_active.png similarity index 100% rename from plugins/wtsynth/arm_active.png rename to plugins/watsyn/arm_active.png diff --git a/plugins/wtsynth/arm_inactive.png b/plugins/watsyn/arm_inactive.png similarity index 100% rename from plugins/wtsynth/arm_inactive.png rename to plugins/watsyn/arm_inactive.png diff --git a/plugins/wtsynth/artwork.png b/plugins/watsyn/artwork.png similarity index 100% rename from plugins/wtsynth/artwork.png rename to plugins/watsyn/artwork.png diff --git a/plugins/wtsynth/b1_active.png b/plugins/watsyn/b1_active.png similarity index 100% rename from plugins/wtsynth/b1_active.png rename to plugins/watsyn/b1_active.png diff --git a/plugins/wtsynth/b1_inactive.png b/plugins/watsyn/b1_inactive.png similarity index 100% rename from plugins/wtsynth/b1_inactive.png rename to plugins/watsyn/b1_inactive.png diff --git a/plugins/wtsynth/b2_active.png b/plugins/watsyn/b2_active.png similarity index 100% rename from plugins/wtsynth/b2_active.png rename to plugins/watsyn/b2_active.png diff --git a/plugins/wtsynth/b2_inactive.png b/plugins/watsyn/b2_inactive.png similarity index 100% rename from plugins/wtsynth/b2_inactive.png rename to plugins/watsyn/b2_inactive.png diff --git a/plugins/wtsynth/bam_active.png b/plugins/watsyn/bam_active.png similarity index 100% rename from plugins/wtsynth/bam_active.png rename to plugins/watsyn/bam_active.png diff --git a/plugins/wtsynth/bam_inactive.png b/plugins/watsyn/bam_inactive.png similarity index 100% rename from plugins/wtsynth/bam_inactive.png rename to plugins/watsyn/bam_inactive.png diff --git a/plugins/wtsynth/bmix_active.png b/plugins/watsyn/bmix_active.png similarity index 100% rename from plugins/wtsynth/bmix_active.png rename to plugins/watsyn/bmix_active.png diff --git a/plugins/wtsynth/bmix_inactive.png b/plugins/watsyn/bmix_inactive.png similarity index 100% rename from plugins/wtsynth/bmix_inactive.png rename to plugins/watsyn/bmix_inactive.png diff --git a/plugins/wtsynth/bpm_active.png b/plugins/watsyn/bpm_active.png similarity index 100% rename from plugins/wtsynth/bpm_active.png rename to plugins/watsyn/bpm_active.png diff --git a/plugins/wtsynth/bpm_inactive.png b/plugins/watsyn/bpm_inactive.png similarity index 100% rename from plugins/wtsynth/bpm_inactive.png rename to plugins/watsyn/bpm_inactive.png diff --git a/plugins/wtsynth/brm_active.png b/plugins/watsyn/brm_active.png similarity index 100% rename from plugins/wtsynth/brm_active.png rename to plugins/watsyn/brm_active.png diff --git a/plugins/wtsynth/brm_inactive.png b/plugins/watsyn/brm_inactive.png similarity index 100% rename from plugins/wtsynth/brm_inactive.png rename to plugins/watsyn/brm_inactive.png diff --git a/plugins/wtsynth/inv_active.png b/plugins/watsyn/inv_active.png similarity index 100% rename from plugins/wtsynth/inv_active.png rename to plugins/watsyn/inv_active.png diff --git a/plugins/wtsynth/inv_inactive.png b/plugins/watsyn/inv_inactive.png similarity index 100% rename from plugins/wtsynth/inv_inactive.png rename to plugins/watsyn/inv_inactive.png diff --git a/plugins/wtsynth/load_active.png b/plugins/watsyn/load_active.png similarity index 100% rename from plugins/wtsynth/load_active.png rename to plugins/watsyn/load_active.png diff --git a/plugins/wtsynth/load_inactive.png b/plugins/watsyn/load_inactive.png similarity index 100% rename from plugins/wtsynth/load_inactive.png rename to plugins/watsyn/load_inactive.png diff --git a/plugins/watsyn/logo.png b/plugins/watsyn/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..3e77966ff7431d50d581506636e01d9f0af828ea GIT binary patch literal 4425 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 P00000NkvXXu0mjf6lriw literal 0 HcmV?d00001 diff --git a/plugins/wtsynth/norm_active.png b/plugins/watsyn/norm_active.png similarity index 100% rename from plugins/wtsynth/norm_active.png rename to plugins/watsyn/norm_active.png diff --git a/plugins/wtsynth/norm_inactive.png b/plugins/watsyn/norm_inactive.png similarity index 100% rename from plugins/wtsynth/norm_inactive.png rename to plugins/watsyn/norm_inactive.png diff --git a/plugins/wtsynth/phl_active.png b/plugins/watsyn/phl_active.png similarity index 100% rename from plugins/wtsynth/phl_active.png rename to plugins/watsyn/phl_active.png diff --git a/plugins/wtsynth/phl_inactive.png b/plugins/watsyn/phl_inactive.png similarity index 100% rename from plugins/wtsynth/phl_inactive.png rename to plugins/watsyn/phl_inactive.png diff --git a/plugins/wtsynth/phr_active.png b/plugins/watsyn/phr_active.png similarity index 100% rename from plugins/wtsynth/phr_active.png rename to plugins/watsyn/phr_active.png diff --git a/plugins/wtsynth/phr_inactive.png b/plugins/watsyn/phr_inactive.png similarity index 100% rename from plugins/wtsynth/phr_inactive.png rename to plugins/watsyn/phr_inactive.png diff --git a/plugins/wtsynth/saw_active.png b/plugins/watsyn/saw_active.png similarity index 100% rename from plugins/wtsynth/saw_active.png rename to plugins/watsyn/saw_active.png diff --git a/plugins/wtsynth/saw_inactive.png b/plugins/watsyn/saw_inactive.png similarity index 100% rename from plugins/wtsynth/saw_inactive.png rename to plugins/watsyn/saw_inactive.png diff --git a/plugins/wtsynth/sin_active.png b/plugins/watsyn/sin_active.png similarity index 100% rename from plugins/wtsynth/sin_active.png rename to plugins/watsyn/sin_active.png diff --git a/plugins/wtsynth/sin_inactive.png b/plugins/watsyn/sin_inactive.png similarity index 100% rename from plugins/wtsynth/sin_inactive.png rename to plugins/watsyn/sin_inactive.png diff --git a/plugins/wtsynth/smooth_active.png b/plugins/watsyn/smooth_active.png similarity index 100% rename from plugins/wtsynth/smooth_active.png rename to plugins/watsyn/smooth_active.png diff --git a/plugins/wtsynth/smooth_inactive.png b/plugins/watsyn/smooth_inactive.png similarity index 100% rename from plugins/wtsynth/smooth_inactive.png rename to plugins/watsyn/smooth_inactive.png diff --git a/plugins/wtsynth/sqr_active.png b/plugins/watsyn/sqr_active.png similarity index 100% rename from plugins/wtsynth/sqr_active.png rename to plugins/watsyn/sqr_active.png diff --git a/plugins/wtsynth/sqr_inactive.png b/plugins/watsyn/sqr_inactive.png similarity index 100% rename from plugins/wtsynth/sqr_inactive.png rename to plugins/watsyn/sqr_inactive.png diff --git a/plugins/wtsynth/tri_active.png b/plugins/watsyn/tri_active.png similarity index 100% rename from plugins/wtsynth/tri_active.png rename to plugins/watsyn/tri_active.png diff --git a/plugins/wtsynth/tri_inactive.png b/plugins/watsyn/tri_inactive.png similarity index 100% rename from plugins/wtsynth/tri_inactive.png rename to plugins/watsyn/tri_inactive.png diff --git a/plugins/wtsynth/wavegraph.png b/plugins/watsyn/wavegraph.png similarity index 100% rename from plugins/wtsynth/wavegraph.png rename to plugins/watsyn/wavegraph.png diff --git a/plugins/wtsynth/CMakeLists.txt b/plugins/wtsynth/CMakeLists.txt deleted file mode 100644 index eb50e0544..000000000 --- a/plugins/wtsynth/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -INCLUDE(BuildPlugin) - -BUILD_PLUGIN( wtsynth WTSynth.cpp WTSynth.h MOCFILES WTSynth.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png) diff --git a/plugins/wtsynth/logo.png b/plugins/wtsynth/logo.png deleted file mode 100644 index 4378e3ab4d2db625a31a9ebd03f040c28b72e924..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={WI14-?iy0WWg+Z8+Vb&Z8pdfpR zr>`sfJ!TP66_agUlKDU($r9Iy66gHf+|;}h2Ir#G#FEq$h4Rdj3