From ea34e834dd6e14fa618c0abecdec353cd72e2f83 Mon Sep 17 00:00:00 2001 From: Extremesecrecy <10959169+extremesecrecy@users.noreply.github.com> Date: Mon, 28 Jul 2025 13:40:33 -0700 Subject: [PATCH] Removed cpu/memory Removed cpu/memory display on JackServerSettingsDialog --- vite/src/pipedal/AlsaDeviceInfo.tsx | 6 ++- vite/src/pipedal/JackHostStatus.tsx | 7 --- vite/src/pipedal/JackServerSettingsDialog.tsx | 47 +++---------------- 3 files changed, 11 insertions(+), 49 deletions(-) diff --git a/vite/src/pipedal/AlsaDeviceInfo.tsx b/vite/src/pipedal/AlsaDeviceInfo.tsx index 0cd10ff..4db9532 100644 --- a/vite/src/pipedal/AlsaDeviceInfo.tsx +++ b/vite/src/pipedal/AlsaDeviceInfo.tsx @@ -9,6 +9,8 @@ export default class AlsaDeviceInfo { this.sampleRates = input.sampleRates as number[]; this.minBufferSize = input.minBufferSize; this.maxBufferSize = input.maxBufferSize; + this.supportsCapture = input.supportsCapture ? true : false; + this.supportsPlayback = input.supportsPlayback ? true : false; return this; } static deserialize_array(input: any): AlsaDeviceInfo[] @@ -62,5 +64,7 @@ export default class AlsaDeviceInfo { longName: string = ""; sampleRates: number[] = []; minBufferSize: number = 0; - maxBufferSize: number = 0; + maxBufferSize: number = 0; + supportsCapture: boolean = false; + supportsPlayback: boolean = false; }; \ No newline at end of file diff --git a/vite/src/pipedal/JackHostStatus.tsx b/vite/src/pipedal/JackHostStatus.tsx index fcccbea..67239e9 100644 --- a/vite/src/pipedal/JackHostStatus.tsx +++ b/vite/src/pipedal/JackHostStatus.tsx @@ -68,7 +68,6 @@ export default class JackHostStatus { this.errorMessage = input.errorMessage; this.underruns = input.underruns; this.cpuUsage = input.cpuUsage; - this.memoryUsage = input.memoryUsage; this.msSinceLastUnderrun = input.msSinceLastUnderrun; this.temperaturemC = input.temperaturemC; this.cpuFreqMax = input.cpuFreqMax; @@ -85,7 +84,6 @@ export default class JackHostStatus { restarting: boolean = false; underruns: number = 0; cpuUsage: number = 0; - memoryUsage: number = 0; msSinceLastUnderrun: number = -5000 * 1000; temperaturemC: number = -1000000; cpuFreqMax: number = 0; @@ -179,11 +177,6 @@ export default class JackHostStatus { CPU: {cpuDisplay(status.cpuUsage)}   - - - MEM: {cpuDisplay(status.memoryUsage)}   - - {tempDisplay(status.temperaturemC)} diff --git a/vite/src/pipedal/JackServerSettingsDialog.tsx b/vite/src/pipedal/JackServerSettingsDialog.tsx index 0deda47..2564c49 100644 --- a/vite/src/pipedal/JackServerSettingsDialog.tsx +++ b/vite/src/pipedal/JackServerSettingsDialog.tsx @@ -42,7 +42,6 @@ import IconButtonEx from './IconButtonEx'; import RefreshIcon from '@mui/icons-material/Refresh'; import Checkbox from '@mui/material/Checkbox'; import FormControlLabel from '@mui/material/FormControlLabel'; -import JackHostStatus from './JackHostStatus'; import AlsaDeviceInfo from './AlsaDeviceInfo'; import ResizeResponsiveComponent from './ResizeResponsiveComponent'; @@ -88,7 +87,6 @@ interface JackServerSettingsDialogState { okEnabled: boolean; fullScreen: boolean; compactWidth: boolean; - jackStatus?: JackHostStatus; showDeviceWarning: boolean; dontShowWarningAgain: boolean; } @@ -104,10 +102,6 @@ const styles = (theme: Theme) => }, inputLabel: { whiteSpace: "nowrap" - }, - cpuStatusColor: { - color: theme.palette.text.secondary, - opacity: 0.7 } }); export interface JackServerSettingsDialogProps extends WithStyles { @@ -314,13 +308,11 @@ const JackServerSettingsDialog = withStyles( okEnabled: false, fullScreen: this.getFullScreen(), compactWidth: document.documentElement.clientWidth < 600, - jackStatus: undefined, showDeviceWarning: false, dontShowWarningAgain: false }; } mounted: boolean = false; - statusTimer?: number = undefined; suppressDeviceWarning: boolean; /** @@ -364,28 +356,9 @@ const JackServerSettingsDialog = withStyles( // Error requesting ALSA info. }); } - - tickStatus() { - this.model.getJackStatus() - .then(status => { - if (this.mounted) { - this.setState({ jackStatus: status }); - } - }) - .catch(() => { }); - } - startStatusTimer() { - if (this.statusTimer) return; - this.tickStatus(); - this.statusTimer = window.setInterval(() => this.tickStatus(), 1000); - } - stopStatusTimer() { - if (this.statusTimer) { - clearInterval(this.statusTimer); - this.statusTimer = undefined; - } - } - + + + /** Persist the current settings to permanent storage. */ saveSettings(settings?: JackServerSettings): void { const s = (settings ?? this.state.jackServerSettings).clone(); @@ -496,7 +469,6 @@ const JackServerSettingsDialog = withStyles( this.ignoreClose = false; if (this.props.open) { this.requestAlsaInfo(); - this.startStatusTimer(); this.saveSettingsTemporary(this.props.jackServerSettings); } } @@ -520,17 +492,14 @@ const JackServerSettingsDialog = withStyles( if (!this.state.alsaDevices) { this.requestAlsaInfo(); } - this.startStatusTimer(); - } else if (!this.props.open && oldProps.open) { - this.stopStatusTimer(); - this.originalJackServerSettings = undefined; - } + } else if (!this.props.open && oldProps.open) { + this.originalJackServerSettings = undefined; + } } componentWillUnmount() { super.componentWillUnmount(); this.mounted = false; - this.stopStatusTimer(); if (this.originalJackServerSettings) { // Revert any unapplied changes when the dialog is unmounted this.applySettings(this.originalJackServerSettings); @@ -603,7 +572,6 @@ const JackServerSettingsDialog = withStyles( handleApply() { if (this.state.okEnabled) { this.applySettings(); // Fire and forget - this.startStatusTimer(); } }; @@ -837,9 +805,6 @@ const JackServerSettingsDialog = withStyles( color="textSecondary"> Latency: {this.state.latencyText} -
- {JackHostStatus.getDisplayViewNoCpu("", this.state.jackStatus)} -