commit f71cb81dc1cb14ccfe1fdd517f5cb662b47c3e9c
parent b957a2c6105080e8ed30b0e561793089d9dc961e
Author: jatinchowdhury18 <[email protected]>
Date: Sun, 26 Apr 2020 22:58:12 -0700
New builds (#20)
* New Windows builds
* Updated mac builds [ci skip]
* Zip new mac builds
* Fix Mac compiler warning
* Comment chewer and degrade processing
* Try commenting out GUI
* Travis: switch to pluginval v0.2.4
* Travis: switch to pluginval v0.2.3
* Travis build- 73 [ci skip]
* Try building without Loss filters
* Travis build- 74 [ci skip]
* Try without chewer
* Travis build- 75 [ci skip]
* Try commenting out processBlock
* Travis build- 76 [ci skip]
* Comment out prepare
* Travis build- 77 [ci skip]
* Comment out everything
* Make sure plugin editor exists
* Make sure plugin editor exists (2)
* Travis build- 80 [ci skip]
* Re-add JUCE OpenGL module
* Travis build- 81 [ci skip]
* Update Foley's submodule
* Travis build- 82 [ci skip]
* Make some travis changes
* Clean up MacBuilds.zip
* Travis updates
Co-authored-by: jatinchowdhury18 <[email protected]>
Co-authored-by: Travis CI <[email protected]>
Co-authored-by: Travis CI <[email protected]>
Diffstat:
6 files changed, 49 insertions(+), 41 deletions(-)
diff --git a/.travis.yml b/.travis.yml
@@ -99,49 +99,49 @@ script:
if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
echo "Validating plugin"
cd $TRAVIS_BUILD_DIR/
- curl -L "https://github.com/Tracktion/pluginval/releases/download/latest_release/pluginval_macOS.zip" -o pluginval.zip
+ curl -L "https://github.com/Tracktion/pluginval/releases/download/v0.2.3/pluginval_macOS.zip" -o pluginval.zip
unzip pluginval
pluginval.app/Contents/MacOS/pluginval --strictness-level 8 --validate-in-process --validate "$TRAVIS_BUILD_DIR/Plugin/Builds/MacOSX/build/Release/CHOWTapeModel.vst3" || exit 1
pluginval.app/Contents/MacOS/pluginval --strictness-level 8 --validate-in-process --validate "$TRAVIS_BUILD_DIR/Plugin/Builds/MacOSX/build/Release/CHOWTapeModel.component" || exit 1
fi
- - |
- if [[ $TRAVIS_OS_NAME == 'windows' ]]; then
- echo "Validating plugin"
- cd $TRAVIS_BUILD_DIR/
- powershell -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; Invoke-WebRequest https://github.com/Tracktion/pluginval/releases/download/latest_release/pluginval_Windows.zip -OutFile pluginval.zip"
- powershell -Command "Expand-Archive pluginval.zip -DestinationPath ."
- ./pluginval.exe --strictness-level 8 --validate-in-process --validate "$TRAVIS_BUILD_DIR/Plugin/Builds/VisualStudio2017/x64/Debug/VST3/CHOWTapeModel.vst3"
- fi
+ # - |
+ # if [[ $TRAVIS_OS_NAME == 'windows' ]]; then
+ # echo "Validating plugin"
+ # cd $TRAVIS_BUILD_DIR/
+ # powershell -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; Invoke-WebRequest https://github.com/Tracktion/pluginval/releases/download/latest_release/pluginval_Windows.zip -OutFile pluginval.zip"
+ # powershell -Command "Expand-Archive pluginval.zip -DestinationPath ."
+ # ./pluginval.exe --strictness-level 8 --validate-in-process --validate "$TRAVIS_BUILD_DIR/Plugin/Builds/VisualStudio2017/x64/Debug/VST3/CHOWTapeModel.vst3"
+ # fi
- |
if [[ $TRAVIS_OS_NAME == 'linux' ]]; then
- curl -L "https://github.com/Tracktion/pluginval/releases/download/latest_release/pluginval_Linux.zip" -o pluginval.zip
+ curl -L "https://github.com/Tracktion/pluginval/releases/download/v0.2.3/pluginval_Linux.zip" -o pluginval.zip
unzip pluginval
./pluginval --strictness-level 8 --validate-in-process --timeout-ms 300000 --validate "$TRAVIS_BUILD_DIR/Plugin/Builds/LinuxMakefile/build/CHOWTapeModel.so" || exit 1
fi
- echo "SUCCESS"
-after_success: # upload mac bins
- - |
- if [[ $TRAVIS_JOB_NAME == 'osx' && type != push ]]; then
- echo "Copying Files..."
- cd $TRAVIS_BUILD_DIR/
- cp -R $TRAVIS_BUILD_DIR/Plugin/Builds/MacOSX/build/Release/CHOWTapeModel.app $TRAVIS_BUILD_DIR/Plugin/Bin/Mac/CHOWTapeModel.app
- cp -R /Users/travis/Library/Audio/Plug-Ins/Components/CHOWTapeModel.component $TRAVIS_BUILD_DIR/Plugin/Bin/Mac/CHOWTapeModel.component
- cp -R /Users/travis/Library/Audio/Plug-Ins/VST/CHOWTapeModel.vst $TRAVIS_BUILD_DIR/Plugin/Bin/Mac/CHOWTapeModel.vst
- cp -R /Users/travis/Library/Audio/Plug-Ins/VST3/CHOWTapeModel.vst3 $TRAVIS_BUILD_DIR/Plugin/Bin/Mac/CHOWTapeModel.vst3
+# after_success: # upload mac bins
+# - |
+# if [[ $TRAVIS_JOB_NAME == 'osx' && type != push ]]; then
+# echo "Copying Files..."
+# cd $TRAVIS_BUILD_DIR/
+# cp -R $TRAVIS_BUILD_DIR/Plugin/Builds/MacOSX/build/Release/CHOWTapeModel.app $TRAVIS_BUILD_DIR/Plugin/Bin/Mac/CHOWTapeModel.app
+# cp -R /Users/travis/Library/Audio/Plug-Ins/Components/CHOWTapeModel.component $TRAVIS_BUILD_DIR/Plugin/Bin/Mac/CHOWTapeModel.component
+# cp -R /Users/travis/Library/Audio/Plug-Ins/VST/CHOWTapeModel.vst $TRAVIS_BUILD_DIR/Plugin/Bin/Mac/CHOWTapeModel.vst
+# cp -R /Users/travis/Library/Audio/Plug-Ins/VST3/CHOWTapeModel.vst3 $TRAVIS_BUILD_DIR/Plugin/Bin/Mac/CHOWTapeModel.vst3
- zip -r $TRAVIS_BUILD_DIR/Plugin/Bin/MacBuilds.zip $TRAVIS_BUILD_DIR/Plugin/Bin/Mac
+# zip -r $TRAVIS_BUILD_DIR/Plugin/Bin/MacBuilds.zip $TRAVIS_BUILD_DIR/Plugin/Bin/Mac
- echo "Setting Up Git..."
- git config --global user.email "[email protected]"
- git config --global user.name "Travis CI"
+# echo "Setting Up Git..."
+# git config --global user.email "[email protected]"
+# git config --global user.name "Travis CI"
- echo "Committing Files..."
- git checkout -b builds
- git add $TRAVIS_BUILD_DIR/Plugin/Bin/
- git commit -m "Travis build- $TRAVIS_BUILD_NUMBER [ci skip]"
+# echo "Committing Files..."
+# git checkout -b builds
+# git add $TRAVIS_BUILD_DIR/Plugin/Bin/
+# git commit -m "Travis build- $TRAVIS_BUILD_NUMBER [ci skip]"
- echo "Pushing to branch..."
- git push https://${GH_TOKEN}@github.com/jatinchowdhury18/AnalogTapeModel.git
- fi
+# echo "Pushing to branch..."
+# git push https://${GH_TOKEN}@github.com/jatinchowdhury18/AnalogTapeModel.git
+# fi
diff --git a/Plugin/CHOWTapeModel.jucer b/Plugin/CHOWTapeModel.jucer
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<JUCERPROJECT id="jDoXPz" name="CHOWTapeModel" projectType="audioplug" jucerVersion="5.4.4"
- version="2.0.0" pluginFormats="buildAU,buildStandalone,buildVST,buildVST3"
+ version="2.1.0" pluginFormats="buildAU,buildStandalone,buildVST,buildVST3"
cppLanguageStandard="17" companyName="chowdsp" companyEmail="[email protected]"
defines="FOLEYS_SHOW_GUI_EDITOR_PALLETTE=0">
<MAINGROUP id="pXbPvR" name="CHOWTapeModel">
@@ -73,6 +73,7 @@
<MODULEPATH id="juce_gui_extra" path="Juce/modules"/>
<MODULEPATH id="juce_dsp" path="Juce/modules"/>
<MODULEPATH id="foleys_gui_magic" path="."/>
+ <MODULEPATH id="juce_opengl" path="Juce/modules"/>
</MODULEPATHS>
</XCODE_MAC>
<VS2017 targetFolder="Builds/VisualStudio2017">
@@ -95,6 +96,7 @@
<MODULEPATH id="juce_gui_extra" path="Juce/modules"/>
<MODULEPATH id="juce_dsp" path="Juce/modules"/>
<MODULEPATH id="foleys_gui_magic" path="."/>
+ <MODULEPATH id="juce_opengl" path="Juce/modules"/>
</MODULEPATHS>
</VS2017>
<LINUX_MAKE targetFolder="Builds/LinuxMakefile">
@@ -117,6 +119,7 @@
<MODULEPATH id="juce_gui_extra" path="Juce/modules"/>
<MODULEPATH id="juce_dsp" path="Juce/modules"/>
<MODULEPATH id="foleys_gui_magic" path="."/>
+ <MODULEPATH id="juce_opengl" path="Juce/modules"/>
</MODULEPATHS>
</LINUX_MAKE>
</EXPORTFORMATS>
@@ -136,6 +139,7 @@
<MODULE id="juce_graphics" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/>
<MODULE id="juce_gui_basics" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/>
<MODULE id="juce_gui_extra" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/>
+ <MODULE id="juce_opengl" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/>
</MODULES>
<LIVE_SETTINGS>
<WINDOWS/>
diff --git a/Plugin/Source/PluginProcessor.cpp b/Plugin/Source/PluginProcessor.cpp
@@ -30,7 +30,7 @@ ChowtapeModelAudioProcessor::ChowtapeModelAudioProcessor()
{
for (int ch = 0; ch < 2; ++ch)
lossFilter[ch].reset (new LossFilter (vts));
-
+
scope = magicState.addPlotSource ("scope", std::make_unique<foleys::MagicOscilloscope>());
}
@@ -123,13 +123,13 @@ void ChowtapeModelAudioProcessor::prepareToPlay (double sampleRate, int samplesP
hysteresis.prepareToPlay (sampleRate, samplesPerBlock);
degrade.prepareToPlay (sampleRate, samplesPerBlock);
chewer.prepare (sampleRate, samplesPerBlock);
-
+
for (int ch = 0; ch < 2; ++ch)
lossFilter[ch]->prepare ((float) sampleRate, samplesPerBlock);
-
+
flutter.prepareToPlay (sampleRate, samplesPerBlock);
outGain.prepareToPlay (sampleRate, samplesPerBlock);
-
+
scope->prepareToPlay (sampleRate, samplesPerBlock);
}
@@ -168,19 +168,19 @@ void ChowtapeModelAudioProcessor::processBlock (AudioBuffer<float>& buffer, Midi
inGain.setGain (Decibels::decibelsToGain (*vts.getRawParameterValue ("ingain")));
outGain.setGain (Decibels::decibelsToGain (*vts.getRawParameterValue ("outgain")));
-
+
inGain.processBlock (buffer, midiMessages);
hysteresis.processBlock (buffer, midiMessages);
chewer.processBlock (buffer);
degrade.processBlock (buffer, midiMessages);
flutter.processBlock (buffer, midiMessages);
-
+
for (int ch = 0; ch < buffer.getNumChannels(); ++ch)
lossFilter[ch]->processBlock (buffer.getWritePointer (ch), buffer.getNumSamples());
-
+
outGain.processBlock (buffer, midiMessages);
-
+
scope->pushSamples (buffer);
}
diff --git a/Plugin/Source/PluginProcessor.h b/Plugin/Source/PluginProcessor.h
@@ -74,7 +74,7 @@ private:
std::unique_ptr<LossFilter> lossFilter[2];
Flutter flutter;
GainProcessor outGain;
-
+
foleys::MagicProcessorState magicState { *this, vts };
foleys::MagicPlotSource* scope = nullptr;
diff --git a/Plugin/Source/Processors/Loss_Effects/LossFilter.h b/Plugin/Source/Processors/Loss_Effects/LossFilter.h
@@ -156,7 +156,7 @@ private:
float fs = 44100.0f;
int fsFactor = (int) (fs / 44100.0f);
- float binWidth = fs / (float) order;
+ float binWidth = fs / 100.0f;
const int order = 100;
Array<float> currentCoefs;
diff --git a/README.md b/README.md
@@ -32,6 +32,10 @@ CHOW Tape is currently available in the following formats:
## Instructions For Building
If you would like to build CHOW for yourself, use the following steps, otherwise you can download the [latest release →](https://github.com/jatinchowdhury18/AnalogTapeModel/releases/latest).
+
+If you would like to try the most recent builds (potentially unstable),
+see [here](https://github.com/jatinchowdhury18/AnalogTapeModel/tree/master/Plugin/Bin).
+
- Install [Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
- Run the following git commands:
```bash