Skip to content

Temp #11

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

Merged
merged 8 commits into from
Sep 21, 2025
Merged

Temp #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9971b0c
Update style.css
jasonbra1n Sep 21, 2025
f7c7add
Update main.js
jasonbra1n Sep 21, 2025
fbfdcb3
Update index.html
jasonbra1n Sep 21, 2025
4251661
Update main.js
jasonbra1n Sep 21, 2025
62402d3
Update style.css
jasonbra1n Sep 21, 2025
b992c8b
Update index.html
jasonbra1n Sep 21, 2025
46d71ba
Update index.html
jasonbra1n Sep 21, 2025
ac71f4b
Update style.css
jasonbra1n Sep 21, 2025
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
20 changes: 13 additions & 7 deletions css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,6 @@
transform: rotate(270deg);
width: 100px;
}

.slider-container.vertical > label {
margin-top: 15px;
}
Expand Down Expand Up @@ -334,21 +333,28 @@
width: 80%;
flex: 1;
background: #222;
border-radius: 2px;
border-radius: 5px;
position: relative;
overflow: hidden;
border: 1px solid rgba(0,0,0,0.5);
}

.vu-bar-stereo::after {
content: '';
.vu-bar {
position: absolute;
bottom: 0;
left: 0;
width: 100%;
height: var(--vu-level, 0%);
background: linear-gradient(to top, #00ff00 0%, #00ff00 60%, #ffff00 60%, #ffff00 85%, #ff0000 85%, #ff0000 100%);
transition: height 0.05s linear;
height: 0%;
background-color: green;
transition: height 0.05s ease-out, background-color 0.05s;
}

.vu-bar.yellow {
background-color: yellow;
}

.vu-bar.red {
background-color: red;
}

.vu-label {
Expand Down
12 changes: 6 additions & 6 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ <h1>🎧 DJ Toolkit Pro</h1>
</div>
<div class="vu-meter-stereo" id="vuMeterA">
<div class="vu-channel">
<div class="vu-bar-stereo" id="vuBarAL"></div>
<div class="vu-bar-stereo"><div id="vuBarAL" class="vu-bar"></div></div>
<div class="vu-label">L</div>
</div>
<div class="vu-channel">
<div class="vu-bar-stereo" id="vuBarAR"></div>
<div class="vu-bar-stereo"><div id="vuBarAR" class="vu-bar"></div></div>
<div class="vu-label">R</div>
</div>
</div>
Expand Down Expand Up @@ -103,11 +103,11 @@ <h1>🎧 DJ Toolkit Pro</h1>

<div class="vu-meter-stereo" id="vuMeterMaster">
<div class="vu-channel">
<div class="vu-bar-stereo" id="vuBarMasterL"></div>
<div class="vu-bar-stereo"><div id="vuBarMasterL" class="vu-bar"></div></div>
<div class="vu-label">L</div>
</div>
<div class="vu-channel">
<div class="vu-bar-stereo" id="vuBarMasterR"></div>
<div class="vu-bar-stereo"><div id="vuBarMasterR" class="vu-bar"></div></div>
<div class="vu-label">R</div>
</div>
</div>
Expand Down Expand Up @@ -163,11 +163,11 @@ <h1>🎧 DJ Toolkit Pro</h1>
</div>
<div class="vu-meter-stereo" id="vuMeterB">
<div class="vu-channel">
<div class="vu-bar-stereo" id="vuBarBL"></div>
<div class="vu-bar-stereo"><div id="vuBarBL" class="vu-bar"></div></div>
<div class="vu-label">L</div>
</div>
<div class="vu-channel">
<div class="vu-bar-stereo" id="vuBarBR"></div>
<div class="vu-bar-stereo"><div id="vuBarBR" class="vu-bar"></div></div>
<div class="vu-label">R</div>
</div>
</div>
Expand Down
30 changes: 18 additions & 12 deletions js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,12 +367,8 @@ class Deck {
const barL = document.getElementById(`vuBar${this.id}L`);
const barR = document.getElementById(`vuBar${this.id}R`);

if (barL) {
barL.style.setProperty('--vu-level', `${Math.min(peakL * 1.5 * 100, 100)}%`);
}
if (barR) {
barR.style.setProperty('--vu-level', `${Math.min(peakR * 1.5 * 100, 100)}%`);
}
updateBar(barL, peakL);
updateBar(barR, peakR);
}

play(startTimeOverride) {
Expand Down Expand Up @@ -587,6 +583,20 @@ class Deck {
}
});

function updateBar(bar, level) {
if (!bar) return;
const heightPercent = Math.min(level * 100, 100);
bar.style.height = `${heightPercent}%`;

if (level > 0.9) {
bar.className = 'vu-bar red';
} else if (level > 0.4) {
bar.className = 'vu-bar yellow';
} else {
bar.className = 'vu-bar';
}
}

function setupSpectrum() {
spectrumAnalyser = audioContext.createAnalyser();
spectrumAnalyser.fftSize = 256;
Expand Down Expand Up @@ -648,12 +658,8 @@ class Deck {
const barL = document.getElementById('vuBarMasterL');
const barR = document.getElementById('vuBarMasterR');

if (barL) {
barL.style.setProperty('--vu-level', `${Math.min(peakL * 1.5 * 100, 100)}%`);
}
if (barR) {
barR.style.setProperty('--vu-level', `${Math.min(peakR * 1.5 * 100, 100)}%`);
}
updateBar(barL, peakL);
updateBar(barR, peakR);
}

function startUpdateLoop() {
Expand Down