merge again
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -3,3 +3,4 @@ JuceLibraryCode/
|
|||||||
Builds/
|
Builds/
|
||||||
*bak
|
*bak
|
||||||
*jucer
|
*jucer
|
||||||
|
*RPP
|
||||||
|
@@ -58,6 +58,8 @@ void PeteAudioProcessor::changeProgramName (int index, const String& newName)
|
|||||||
void PeteAudioProcessor::prepareToPlay (double sampleRate, int samplesPerBlock)
|
void PeteAudioProcessor::prepareToPlay (double sampleRate, int samplesPerBlock)
|
||||||
{
|
{
|
||||||
myYin = Yin(sampleRate, samplesPerBlock);
|
myYin = Yin(sampleRate, samplesPerBlock);
|
||||||
|
aFilter = (filter_svf_t*)malloc(sizeof(filter_svf_t));
|
||||||
|
svf_init(aFilter, 0, sampleRate);
|
||||||
}
|
}
|
||||||
void PeteAudioProcessor::releaseResources()
|
void PeteAudioProcessor::releaseResources()
|
||||||
{
|
{
|
||||||
@@ -92,11 +94,13 @@ void PeteAudioProcessor::processBlock (AudioSampleBuffer& buffer, MidiBuffer& mi
|
|||||||
static float myPitch;
|
static float myPitch;
|
||||||
if(pitch > 0) { myPitch = pitch; }
|
if(pitch > 0) { myPitch = pitch; }
|
||||||
|
|
||||||
|
svf_set_freq(aFilter, myPitch);
|
||||||
|
|
||||||
float* channel1Data = buffer.getWritePointer (0);
|
float* channel1Data = buffer.getWritePointer (0);
|
||||||
float* channel2Data = buffer.getWritePointer (1);
|
float* channel2Data = buffer.getWritePointer (1);
|
||||||
for(int i=0; i < buffer.getNumSamples(); i++){
|
for(int i=0; i < buffer.getNumSamples(); i++){
|
||||||
incrementer += (myPitch / 4000);
|
incrementer += (myPitch / 4000);
|
||||||
channel1Data[i] = sin(incrementer) * 0.1;
|
channel1Data[i] = svf_step(aFilter, channel1Data[i]);
|
||||||
channel2Data[i] = channel1Data[i];
|
channel2Data[i] = channel1Data[i];
|
||||||
}
|
}
|
||||||
printf("%f\n",channel1Data[0]);
|
printf("%f\n",channel1Data[0]);
|
||||||
|
@@ -1 +1,47 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include "../JuceLibraryCode/JuceHeader.h"
|
||||||
|
#include "Yin.h"
|
||||||
|
extern "C" {
|
||||||
|
#include "../wrDsp/wrFilter.h"
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
class PeteAudioProcessor : public AudioProcessor
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
PeteAudioProcessor();
|
||||||
|
~PeteAudioProcessor();
|
||||||
|
|
||||||
|
void prepareToPlay (double sampleRate, int samplesPerBlock) override;
|
||||||
|
void releaseResources() override;
|
||||||
|
|
||||||
|
#ifndef JucePlugin_PreferredChannelConfigurations
|
||||||
|
bool isBusesLayoutSupported (const BusesLayout& layouts) const override;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
void processBlock (AudioSampleBuffer&, MidiBuffer&) override;
|
||||||
|
|
||||||
|
AudioProcessorEditor* createEditor() override;
|
||||||
|
bool hasEditor() const override;
|
||||||
|
|
||||||
|
const String getName() const override;
|
||||||
|
|
||||||
|
bool acceptsMidi() const override;
|
||||||
|
bool producesMidi() const override;
|
||||||
|
double getTailLengthSeconds() const override;
|
||||||
|
|
||||||
|
int getNumPrograms() override;
|
||||||
|
int getCurrentProgram() override;
|
||||||
|
void setCurrentProgram (int index) override;
|
||||||
|
const String getProgramName (int index) override;
|
||||||
|
void changeProgramName (int index, const String& newName) override;
|
||||||
|
|
||||||
|
void getStateInformation (MemoryBlock& destData) override;
|
||||||
|
void setStateInformation (const void* data, int sizeInBytes) override;
|
||||||
|
|
||||||
|
private:
|
||||||
|
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (PeteAudioProcessor)
|
||||||
|
Yin myYin;
|
||||||
|
filter_svf_t* aFilter;
|
||||||
|
};
|
||||||
|
Binary file not shown.
BIN
test Project/Samples/Recorded/0002 3-Audio-1.wav.asd
Normal file
BIN
test Project/Samples/Recorded/0002 3-Audio-1.wav.asd
Normal file
Binary file not shown.
BIN
test Project/Samples/Recorded/0002 3-Audio-1.wav.reapeaks
Normal file
BIN
test Project/Samples/Recorded/0002 3-Audio-1.wav.reapeaks
Normal file
Binary file not shown.
0
test Project/Samples/Recorded/0003 3-Audio.wav
Normal file
0
test Project/Samples/Recorded/0003 3-Audio.wav
Normal file
161
test.RPP
161
test.RPP
@@ -1,161 +0,0 @@
|
|||||||
<REAPER_PROJECT 0.1 "5.40/OSX64" 1498539720
|
|
||||||
RIPPLE 0
|
|
||||||
GROUPOVERRIDE 0 0 0
|
|
||||||
AUTOXFADE 1
|
|
||||||
ENVATTACH 1
|
|
||||||
MIXERUIFLAGS 11 48
|
|
||||||
PEAKGAIN 1
|
|
||||||
FEEDBACK 0
|
|
||||||
PANLAW 1
|
|
||||||
PROJOFFS 0 0
|
|
||||||
MAXPROJLEN 0 600
|
|
||||||
GRID 3199 8 1 8 1 0 0 0
|
|
||||||
TIMEMODE 1 5 -1 30 0
|
|
||||||
VIDEO_CONFIG 0 0 256
|
|
||||||
PANMODE 3
|
|
||||||
CURSOR 0
|
|
||||||
ZOOM 100 0 0
|
|
||||||
VZOOMEX 6
|
|
||||||
USE_REC_CFG 0
|
|
||||||
RECMODE 1
|
|
||||||
SMPTESYNC 0 30 100 40 1000 300 0 0 1 0 0
|
|
||||||
LOOP 0
|
|
||||||
LOOPGRAN 0 4
|
|
||||||
RECORD_PATH "" ""
|
|
||||||
<RECORD_CFG
|
|
||||||
>
|
|
||||||
<APPLYFX_CFG
|
|
||||||
>
|
|
||||||
RENDER_FILE ""
|
|
||||||
RENDER_PATTERN ""
|
|
||||||
RENDER_FMT 0 2 0
|
|
||||||
RENDER_1X 0
|
|
||||||
RENDER_RANGE 1 0 0 18 1000
|
|
||||||
RENDER_RESAMPLE 3 0 1
|
|
||||||
RENDER_ADDTOPROJ 0
|
|
||||||
RENDER_STEMS 0
|
|
||||||
RENDER_DITHER 0
|
|
||||||
TIMELOCKMODE 1
|
|
||||||
TEMPOENVLOCKMODE 1
|
|
||||||
ITEMMIX 0
|
|
||||||
DEFPITCHMODE 589824
|
|
||||||
TAKELANE 0
|
|
||||||
SAMPLERATE 44100 0 0
|
|
||||||
<RENDER_CFG
|
|
||||||
>
|
|
||||||
LOCK 16385
|
|
||||||
<METRONOME 6 2
|
|
||||||
VOL 0.25 0.125
|
|
||||||
FREQ 800 1600 1
|
|
||||||
BEATLEN 4
|
|
||||||
SAMPLES "" ""
|
|
||||||
PATTERN 2863311530 2863311529
|
|
||||||
>
|
|
||||||
GLOBAL_AUTO -1
|
|
||||||
TEMPO 120 4 4
|
|
||||||
PLAYRATE 1 0 0.25 4
|
|
||||||
SELECTION 0 0
|
|
||||||
SELECTION2 0 0
|
|
||||||
MASTERAUTOMODE 0
|
|
||||||
MASTERTRACKHEIGHT 0
|
|
||||||
MASTERPEAKCOL 16576
|
|
||||||
MASTERMUTESOLO 0
|
|
||||||
MASTERTRACKVIEW 0 0.6667 0.5 0.5 0 0 0
|
|
||||||
MASTERHWOUT 0 0 1 0 0 0 0 -1
|
|
||||||
MASTER_NCH 2 2
|
|
||||||
MASTER_VOLUME 1 0 -1 -1 1
|
|
||||||
MASTER_FX 1
|
|
||||||
MASTER_SEL 0
|
|
||||||
<MASTERFXLIST
|
|
||||||
WNDRECT 34 69 839 676
|
|
||||||
SHOW 0
|
|
||||||
LASTSEL 0
|
|
||||||
DOCKED 0
|
|
||||||
BYPASS 0 0 0
|
|
||||||
<VST "VST: pete (yourcompany)" pete.vst 0 "" 1382378611
|
|
||||||
c2xlUu5e7f4CAAAAAQAAAAAAAAACAAAAAAAAAAIAAAABAAAAAAAAAAIAAAAAAAAACAAAAAAAAAAAABAA
|
|
||||||
776t3g3wrd4=
|
|
||||||
AAAQAAAA
|
|
||||||
>
|
|
||||||
FLOATPOS 0 0 0 0
|
|
||||||
FXID {C1E4684A-C510-DB43-B7BE-A481A4F2525D}
|
|
||||||
WAK 0
|
|
||||||
>
|
|
||||||
<MASTERPLAYSPEEDENV
|
|
||||||
ACT 0
|
|
||||||
VIS 0 1 1
|
|
||||||
LANEHEIGHT 0 0
|
|
||||||
ARM 0
|
|
||||||
DEFSHAPE 0 -1 -1
|
|
||||||
>
|
|
||||||
<TEMPOENVEX
|
|
||||||
ACT 0
|
|
||||||
VIS 1 0 1
|
|
||||||
LANEHEIGHT 0 0
|
|
||||||
ARM 0
|
|
||||||
DEFSHAPE 1 -1 -1
|
|
||||||
>
|
|
||||||
<PROJBAY
|
|
||||||
>
|
|
||||||
<TRACK {0285AA2F-2341-854C-BBEE-985C6E7A9ADD}
|
|
||||||
NAME "0001 3-Audio"
|
|
||||||
PEAKCOL 16576
|
|
||||||
BEAT -1
|
|
||||||
AUTOMODE 0
|
|
||||||
VOLPAN 1 0 -1 -1 1
|
|
||||||
MUTESOLO 0 0 0
|
|
||||||
IPHASE 0
|
|
||||||
ISBUS 0 0
|
|
||||||
BUSCOMP 0 0
|
|
||||||
SHOWINMIX 1 0.6667 0.5 1 0.5 0 0 0
|
|
||||||
FREEMODE 0
|
|
||||||
SEL 0
|
|
||||||
REC 0 0 0 0 0 0 0
|
|
||||||
VU 2
|
|
||||||
TRACKHEIGHT 0 0
|
|
||||||
INQ 0 0 0 0.5 100 0 0 100
|
|
||||||
NCHAN 2
|
|
||||||
FX 1
|
|
||||||
TRACKID {0285AA2F-2341-854C-BBEE-985C6E7A9ADD}
|
|
||||||
PERF 0
|
|
||||||
MIDIOUT -1
|
|
||||||
MAINSEND 1 0
|
|
||||||
<FXCHAIN
|
|
||||||
WNDRECT 125 169 839 676
|
|
||||||
SHOW 0
|
|
||||||
LASTSEL 0
|
|
||||||
DOCKED 0
|
|
||||||
BYPASS 0 0 0
|
|
||||||
<VST "VST: lampshade (yourcompany)" lampshade.vst 0 "" 1382378611
|
|
||||||
c2xlUu5e7f4CAAAAAQAAAAAAAAACAAAAAAAAAAIAAAABAAAAAAAAAAIAAAAAAAAACAAAAAAAAAAAABAA
|
|
||||||
776t3g3wrd4=
|
|
||||||
AAAQAAAA
|
|
||||||
>
|
|
||||||
FLOATPOS 0 0 0 0
|
|
||||||
FXID {B7DD42FB-8D0E-C24C-924A-407EC4334EB7}
|
|
||||||
WAK 0
|
|
||||||
>
|
|
||||||
<ITEM
|
|
||||||
POSITION 0
|
|
||||||
SNAPOFFS 0
|
|
||||||
LENGTH 2.368
|
|
||||||
LOOP 1
|
|
||||||
ALLTAKES 0
|
|
||||||
FADEIN 1 0.01 0 1 0 0
|
|
||||||
FADEOUT 1 0.01 0 1 0 0
|
|
||||||
MUTE 0
|
|
||||||
SEL 0
|
|
||||||
IGUID {40DBFCD1-92BE-4748-9291-13EFE644D598}
|
|
||||||
IID 1
|
|
||||||
NAME "0001 3-Audio.wav"
|
|
||||||
VOLPAN 1 0 1 -1
|
|
||||||
SOFFS 0
|
|
||||||
PLAYRATE 1 1 0 -1 0 0.0025
|
|
||||||
CHANMODE 0
|
|
||||||
GUID {76289E0D-F3CA-8942-B926-B9E354D05BC9}
|
|
||||||
<SOURCE WAVE
|
|
||||||
FILE "test Project/Samples/Recorded/0001 3-Audio.wav"
|
|
||||||
>
|
|
||||||
>
|
|
||||||
>
|
|
||||||
>
|
|
Reference in New Issue
Block a user