Skip to content

Commit 01a2a86

Browse files
vvvarvvvar
authored
Add visualiser for clipping algo (#54)
1 parent acbc3ff commit 01a2a86

18 files changed

+452
-203
lines changed

‎.github/workflows/execute_merge_checks.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Execute nmerger checks
2-
run-name: 'Merge checks for PR #${{ github.event.number }}'
2+
run-name: "Merge checks for PR #${{ github.event.number }}"
33
on: pull_request
44
env:
55
BUILD_TYPE: Release
@@ -8,8 +8,8 @@ env:
88
LV2_TARGET_NAME: PeakEater_LV2
99
CLAP_TARGET_NAME: PeakEater_CLAP
1010
JUCE_REVISION: 4e68af7
11-
VERSION: 0.3.5
12-
BUILD_ID: '${{ github.run_id }}.${{ github.run_number }}.${{ github.run_attempt }}'
11+
VERSION: 0.4.0
12+
BUILD_ID: "${{ github.run_id }}.${{ github.run_number }}.${{ github.run_attempt }}"
1313
jobs:
1414
macos:
1515
name: macOS
@@ -31,7 +31,7 @@ jobs:
3131
npm --version
3232
which npm
3333
- name: Install Python Dependencies
34-
run: python -m pip install -r ${{github.workspace}}/requirements.txt
34+
run: python -m pip install -r ${{github.workspace}}/requirements.txt
3535
- name: Init Git Submodules
3636
run: git submodule update --init --recursive
3737
- name: Checkout JUCE
@@ -63,7 +63,7 @@ jobs:
6363
run: git submodule update --init --recursive
6464
- name: Checkout JUCE
6565
run: cd ${{github.workspace}}\Dependencies\JUCE && git checkout ${{env.JUCE_REVISION}}
66-
- name: Configure CMake
66+
- name: Configure CMake
6767
run: cmake . -B ${{github.workspace}}\build -G 'Visual Studio 17 2022' -A x64 -DCMAKE_EXPORT_COMPILE_COMMANDS=TRUE -DJUCE_BUILD_EXAMPLES=OFF -DJUCE_BUILD_EXTRAS=ON
6868
- name: Build VST3
6969
run: cmake --build ${{github.workspace}}\build --config ${{env.BUILD_TYPE}} --target ${{env.VST_TARGET_NAME}}
@@ -94,7 +94,7 @@ jobs:
9494
sudo apt-get install libwebkit2gtk-4.0-37 libwebkit2gtk-4.0-dev
9595
- name: Checkout JUCE
9696
run: cd ${{github.workspace}}/Dependencies/JUCE && git checkout ${{env.JUCE_REVISION}}
97-
- name: Configure CMake
97+
- name: Configure CMake
9898
run: cmake . -B ${{github.workspace}}/build -DCMAKE_EXPORT_COMPILE_COMMANDS=TRUE -DJUCE_BUILD_EXAMPLES=OFF -DJUCE_BUILD_EXTRAS=ON
9999
- name: Build VST3
100100
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target ${{env.VST_TARGET_NAME}}

‎.github/workflows/publish_release_draft.yml

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Publish Release Draft
2-
run-name: Create release draft for v0.3.5
2+
run-name: Create release draft for v0.4.0
33
on:
44
push:
55
branches:
@@ -12,9 +12,9 @@ env:
1212
LV2_TARGET_NAME: PeakEater_LV2
1313
CLAP_TARGET_NAME: PeakEater_CLAP
1414
JUCE_REVISION: 4e68af7
15-
MACOS_RELEASE_NAME: PeakEater_v0.3.5_macOS
16-
WINDOWS_RELEASE_NAME: PeakEater_v0.3.5_Windows
17-
LINUX_RELEASE_NAME: PeakEater_v0.3.5_Linux
15+
MACOS_RELEASE_NAME: PeakEater_v0.4.0_macOS
16+
WINDOWS_RELEASE_NAME: PeakEater_v0.4.0_Windows
17+
LINUX_RELEASE_NAME: PeakEater_v0.4.0_Linux
1818
jobs:
1919
macos:
2020
name: macOS
@@ -81,12 +81,12 @@ jobs:
8181
MACOS_APPLE_ID: ${{ secrets.MACOS_APPLE_ID }}
8282
MACOS_APPLE_PASSWORD: ${{ secrets.MACOS_APPLE_PASSWORD }}
8383
MACOS_APPLE_TEAM_ID: ${{ secrets.MACOS_APPLE_TEAM_ID }}
84-
run: python ${{github.workspace}}/Scripts/Release/MacOS.py --release_type=${{env.BUILD_TYPE}} --sign_and_notarize=True --release_version=0.3.5
84+
run: python ${{github.workspace}}/Scripts/Release/MacOS.py --release_type=${{env.BUILD_TYPE}} --sign_and_notarize=True --release_version=0.4.0
8585
- name: Upload Artifacts
8686
uses: actions/upload-artifact@v3
8787
with:
8888
name: ${{ env.MACOS_RELEASE_NAME }}
89-
path: ${{github.workspace}}/build/release/PeakEater-0.3.5.dmg
89+
path: ${{github.workspace}}/build/release/PeakEater-0.4.0.dmg
9090

9191
windows:
9292
name: Windows
@@ -97,7 +97,7 @@ jobs:
9797
run: git submodule update --init --recursive
9898
- name: Checkout JUCE
9999
run: cd ${{github.workspace}}\Dependencies\JUCE && git checkout ${{env.JUCE_REVISION}}
100-
- name: Configure CMake
100+
- name: Configure CMake
101101
run: cmake . -B ${{github.workspace}}\build -G 'Visual Studio 17 2022' -A x64 -DCMAKE_EXPORT_COMPILE_COMMANDS=TRUE -DJUCE_BUILD_EXAMPLES=OFF -DJUCE_BUILD_EXTRAS=ON
102102
- name: Build VST3
103103
run: cmake --build ${{github.workspace}}\build --config ${{env.BUILD_TYPE}} --target ${{env.VST_TARGET_NAME}}
@@ -128,7 +128,7 @@ jobs:
128128
sudo apt-get install libwebkit2gtk-4.0-37 libwebkit2gtk-4.0-dev
129129
- name: Checkout JUCE
130130
run: cd ${{github.workspace}}/Dependencies/JUCE && git checkout ${{env.JUCE_REVISION}}
131-
- name: Configure CMake
131+
- name: Configure CMake
132132
run: cmake . -B ${{github.workspace}}/build -DCMAKE_EXPORT_COMPILE_COMMANDS=TRUE -DJUCE_BUILD_EXAMPLES=OFF -DJUCE_BUILD_EXTRAS=ON
133133
- name: Build VST3
134134
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target ${{env.VST_TARGET_NAME}}
@@ -146,7 +146,7 @@ jobs:
146146
${{github.workspace}}/build/PeakEater_artefacts/CLAP/PeakEater.clap
147147
148148
release:
149-
name: Publish Release Draft
149+
name: Publish Release Draft
150150
runs-on: ubuntu-latest
151151
needs: [macos, windows, linux]
152152
steps:
@@ -168,6 +168,11 @@ jobs:
168168
- name: Archive Artifacts
169169
run: |
170170
zip -r ${{ env.MACOS_RELEASE_NAME }}{.zip,}
171+
mkdir ${{ env.WINDOWS_RELEASE_NAME }}/tmp
172+
mv ${{ env.WINDOWS_RELEASE_NAME }}/VST3/PeakEater.vst3/Contents/x86_64-win/PeakEater.vst3 ${{ env.WINDOWS_RELEASE_NAME }}/tmp
173+
rm -rf ${{ env.WINDOWS_RELEASE_NAME }}/VST3/PeakEater.vst3
174+
mv ${{ env.WINDOWS_RELEASE_NAME }}/tmp/PeakEater.vst3 ${{ env.WINDOWS_RELEASE_NAME }}/VST3
175+
rm -rf ${{ env.WINDOWS_RELEASE_NAME }}/tmp
171176
zip -r ${{ env.WINDOWS_RELEASE_NAME }}{.zip,}
172177
zip -r ${{ env.LINUX_RELEASE_NAME }}{.zip,}
173178
- name: Display structure of downloaded files
@@ -178,5 +183,5 @@ jobs:
178183
draft: true
179184
removeArtifacts: true
180185
makeLatest: true
181-
tag: "v0.3.5"
186+
tag: "v0.4.0"
182187
artifacts: "${{ env.MACOS_RELEASE_NAME }}.zip,${{ env.WINDOWS_RELEASE_NAME }}.zip,${{ env.LINUX_RELEASE_NAME }}.zip"

‎CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.15)
2-
project(PeakEater VERSION 0.3.5)
2+
project(PeakEater VERSION 0.4.0)
33
set(CMAKE_CXX_STANDARD 20)
44

55
add_subdirectory(Dependencies/JUCE)
@@ -31,6 +31,9 @@ target_sources(PeakEater
3131
Source/GUIv2/linkinout/LinkInOut.cpp
3232
Source/GUIv2/bypass/BypassButton.cpp
3333
Source/GUIv2/levelmeter/LevelMeterComponent.cpp
34+
Source/GUIv2/analyser/peakanalyzer/PeakMeter.cpp
35+
Source/GUIv2/analyser/peakanalyzer/PeakAnalyzerComponent.cpp
36+
Source/GUIv2/analyser/cliptype/ClipTypeComponent.cpp
3437
Source/GUIv2/analyser/AnalyserComponent.cpp
3538
Source/GUIv2/ControlPanel.cpp
3639
Source/GUIv2/LinkingPanel.cpp

‎README.md

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<p align="center">Free open-source VST3/AU/LV2/CLAP wave shaping plugin for macOS, Windows and Linux.</p>
66
<p align="center">
77
<a href="https://github.com/vvvar/PeakEater/releases/latest"><b>Download</b></a>
8-
· <a target="_blank" href="https://github.com/vvvar/PeakEater/issues/new/choose"><b>Report Bug</b></a>
8+
· <a target="_blank" href="https://github.com/vvvar/PeakEater/issues/new?assignees=&labels=Feature+Request&template=feature_request.md&title="><b>Request Feature</b></a> · <a target="_blank" href="https://github.com/vvvar/PeakEater/issues/new?assignees=&labels=Bug&template=bug_report.md&title=%5BBug%5D"><b>Report Bug</b></a>
99
</p>
1010

1111
![screenshot](Resources/screenshots/screenshot-mac.png)
@@ -33,18 +33,23 @@
3333
<li><a href="#available-on-all-major-platforms">macOS, Windows and Linux Support</a></li>
3434
</ul>
3535
</li>
36-
<li><a href="#installation">Installation</a></li>
3736
<li>
38-
<a href="#getting-started">Getting Started</a>
37+
<a href="#installation">Installation</a>
38+
<ul>
39+
<li><a href="#macos">macOS</a></li>
40+
<li><a href="#windows">Windows</a></li>
41+
<li><a href="#linux">Linux</a></li>
42+
</ul>
43+
</li>
44+
<li>
45+
<a href="#building-from-sources">Building from sources</a>
3946
<ul>
4047
<li><a href="#prerequisites">Prerequisites</a></li>
41-
<li><a href="#installation">Installation</a></li>
48+
<li><a href="#build">Build</a></li>
4249
</ul>
4350
</li>
4451
<li><a href="#contributing">Contributing</a></li>
4552
<li><a href="#license">License</a></li>
46-
<li><a href="#contact">Contact</a></li>
47-
<li><a href="#donations">Donations</a></li>
4853
<li><a href="#acknowledgements">Acknowledgements</a></li>
4954
</ol>
5055
</details>
@@ -91,7 +96,7 @@ See how your peaks were eaten with visualizer.
9196

9297
<img src="Resources/screenshots/screenshot-analyzer.png" alt="clip-analyzer" height="100"/>
9398

94-
Shows approximated RMS that was cut("Eaten") in last 2 seconds. Double-click to drop it to zero and force to re-calculate.
99+
Shows approximated RMS that was cut("Eaten") in last 2 seconds and current clipping algorithm. Double-click on numbers to drop it to zero and force to re-calculate.
95100

96101
### 6 Clipping Types
97102

@@ -193,14 +198,16 @@ Extract zip and copy plugin in format of choice into folder with your plugins.
193198
194199
<!-- GETTING STARTED -->
195200

196-
## Building the project from sources
201+
## Building from sources
197202

198203
### Prerequisites
199204

200205
- [Git](https://git-scm.com) 2.39.0+
201206
- [CMake](https://cmake.org) 3.15+
202207
- [Python](https://www.python.org) 3.8.1+
203208

209+
### Build
210+
204211
Clone this repo:
205212

206213
```

‎Resources/screenshots/screenshot-analyzer.png

-7.03 KB
Loading

‎Resources/screenshots/screenshot-mac.png

109 KB
Loading

‎Scripts/Release/configs/appdmg-config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"title": "PeakEater v0.3.5",
2+
"title": "PeakEater v0.4.0",
33
"icon": "icon-mac.icns",
44
"format": "ULFO",
55
"window": {

‎Scripts/Release/configs/inno-config.iss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[Setup]
22
AppName=PeakEater
3-
AppVersion=0.3.5
3+
AppVersion=0.4.0
44
DefaultDirName={cf}
55
DefaultGroupName=PeakEater
66
OutputBaseFilename=PeakEater-windows

‎Scripts/Release/configs/wix-config.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
2-
<Product Id="*" UpgradeCode="12345678-1111-2222-3333-666666666666" Name="PeakEater" Version="0.3.5.0" Manufacturer="T-Audio" Language="1033">
2+
<Product Id="*" UpgradeCode="12345678-1111-2222-3333-666666666666" Name="PeakEater" Version="0.4.0.0" Manufacturer="T-Audio" Language="1033">
33
<Package InstallerVersion="200" InstallScope="perMachine" Compressed="yes" Comments="PeakEater is a free open-source VST3/AU waveshaper plugin"/>
44
<MediaTemplate EmbedCab="yes" />
55

‎Source/GUIv2/CentralPanel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ void CentralPanel::resized()
4141
.withTrimmedRight (toRemoveFromSides));
4242

4343
mAnalyserComponent.setBounds(localBounds
44-
.withWidth(localBounds.proportionOfWidth (0.17f))
44+
.withWidth(localBounds.proportionOfWidth (0.28f))
4545
.withHeight(localBounds.proportionOfHeight (0.155f))
4646
.withX(localBounds.proportionOfWidth (0.1f))
4747
.withY(localBounds.proportionOfHeight (0.05f)));

0 commit comments

Comments
 (0)