Merge pull request #14 from ferrreo/cava-improvements
fix: tweak cava settings + improve the cava code to be more reliable
This commit is contained in:
commit
89cfd521c4
1 changed files with 70 additions and 56 deletions
|
|
@ -1,63 +1,77 @@
|
|||
import QtQuick
|
||||
import Quickshell
|
||||
import Quickshell.Io
|
||||
import qs.Components
|
||||
import qs.Services
|
||||
|
||||
Scope {
|
||||
id: root
|
||||
property int count: 32
|
||||
property int noiseReduction: 60
|
||||
property string channels: "mono" // or stereo
|
||||
property string monoOption: "average" // or left or right
|
||||
property var config: ({
|
||||
general: { bars: count },
|
||||
smoothing: { noise_reduction: noiseReduction },
|
||||
output: {
|
||||
method: "raw",
|
||||
bit_format: 8,
|
||||
channels: channels,
|
||||
mono_option: monoOption,
|
||||
}
|
||||
})
|
||||
id: root
|
||||
property int count: 32
|
||||
property int noiseReduction: 60
|
||||
property string channels: "mono"
|
||||
property string monoOption: "average"
|
||||
|
||||
property var values: Array(count).fill(0) // 0 <= value <= 1
|
||||
property var config: ({
|
||||
general: {
|
||||
bars: count,
|
||||
framerate: 30,
|
||||
autosens: 1
|
||||
},
|
||||
smoothing: {
|
||||
monstercat: 1,
|
||||
gravity: 1000000,
|
||||
noise_reduction: noiseReduction
|
||||
},
|
||||
output: {
|
||||
method: "raw",
|
||||
bit_format: 8,
|
||||
channels: channels,
|
||||
mono_option: monoOption
|
||||
}
|
||||
})
|
||||
|
||||
Process {
|
||||
property int index: 0
|
||||
id: process
|
||||
stdinEnabled: true
|
||||
running: MusicManager.isPlaying
|
||||
command: ["cava", "-p", "/dev/stdin"]
|
||||
onExited: { stdinEnabled = true; index = 0; values = []; }
|
||||
onStarted: {
|
||||
const iniParts = []
|
||||
for (const k in config) {
|
||||
if (typeof config[k] !== "object") {
|
||||
write(k + "=" + config[k] + "\n")
|
||||
continue
|
||||
}
|
||||
write("[" + k + "]\n")
|
||||
const obj = config[k]
|
||||
for (const k2 in obj) {
|
||||
write(k2 + "=" + obj[k2] + "\n")
|
||||
}
|
||||
}
|
||||
stdinEnabled = false
|
||||
}
|
||||
stdout: SplitParser {
|
||||
property var newValues: Array(count).fill(0)
|
||||
splitMarker: ""
|
||||
onRead: data => {
|
||||
if (process.index + data.length > config.general.bars) {
|
||||
process.index = 0
|
||||
}
|
||||
for (let i = 0; i < data.length; i += 1) {
|
||||
newValues[i + process.index] = Math.min(data.charCodeAt(i), 128) / 128
|
||||
}
|
||||
process.index += data.length
|
||||
values = newValues
|
||||
}
|
||||
}
|
||||
}
|
||||
property var values: Array(count).fill(0)
|
||||
|
||||
Process {
|
||||
id: process
|
||||
property int index: 0
|
||||
stdinEnabled: true
|
||||
running: MusicManager.isPlaying
|
||||
command: ["cava", "-p", "/dev/stdin"]
|
||||
onExited: {
|
||||
stdinEnabled = true;
|
||||
index = 0;
|
||||
values = Array(count).fill(0);
|
||||
}
|
||||
onStarted: {
|
||||
for (const k in config) {
|
||||
if (typeof config[k] !== "object") {
|
||||
write(k + "=" + config[k] + "\n");
|
||||
continue;
|
||||
}
|
||||
write("[" + k + "]\n");
|
||||
const obj = config[k];
|
||||
for (const k2 in obj) {
|
||||
write(k2 + "=" + obj[k2] + "\n");
|
||||
}
|
||||
}
|
||||
stdinEnabled = false;
|
||||
}
|
||||
stdout: SplitParser {
|
||||
splitMarker: ""
|
||||
onRead: data => {
|
||||
const newValues = Array(count).fill(0);
|
||||
for (let i = 0; i < values.length; i++) {
|
||||
newValues[i] = values[i];
|
||||
}
|
||||
if (process.index + data.length > count) {
|
||||
process.index = 0;
|
||||
}
|
||||
for (let i = 0; i < data.length; i += 1) {
|
||||
newValues[i + process.index] = Math.min(data.charCodeAt(i), 128) / 128;
|
||||
}
|
||||
process.index += data.length;
|
||||
values = newValues;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue