shawn/op-pedal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split IO dialog fixes.

Browse Source
This commit is contained in:
Robin E. R. Davies
2025-09-09 15:25:26 -04:00
parent c5a8345192
commit 367394843a
6 changed files with 443 additions and 474 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/AlsaDriver.cpp
+10 -3
View File
@@ -271,7 +271,7 @@ namespace pipedal
auto inAvail = snd_pcm_avail_update(this->captureHandle);
auto outAvail = snd_pcm_avail_update(this->playbackHandle);
auto total = inAvail + outAvail + framesInBuffer;
auto total = (inAvail >= 0? inAvail: 0) + (outAvail >= 0 ? outAvail: 0) + framesInBuffer;
bufferTraces[bufferTraceIndex++] = {
time,
inAvail,
@@ -1180,11 +1180,13 @@ namespace pipedal
throw std::runtime_error("Unable to restart the audio stream.");
}
int err;
if ((err = snd_pcm_start(captureHandle)) < 0)
{
Lv2Log::error(SS("Unable to restart ALSA capture: " << snd_strerror(err)));
throw PiPedalStateException("Unable to restart ALSA capture.");
}
TraceBufferPositions(0,'+');
audioRunning = true;
}
@@ -1518,9 +1520,11 @@ namespace pipedal
}
snd_pcm_drain(capture_handle);
FillOutputBuffer();
TraceBufferPositions(framesRead, 'x');
}
else
{
TraceBufferPositions(framesRead, 'z');
Lv2Log::error(SS("Can't recover from ALSA output underrun. (" << snd_strerror(err) << ")"));
throw PiPedalStateException(SS("Can't recover from ALSA output error. (" << snd_strerror(err) << ")"));
}
@@ -1621,7 +1625,7 @@ namespace pipedal
// expand running status if neccessary.
// deal with regular and sysex messages split across
// buffer boundaries (but discard them)
snd_pcm_sframes_t framesRead;
snd_pcm_sframes_t framesRead = 0;
auto state = snd_pcm_state(handle);
auto frame_bytes = this->captureFrameSize;
@@ -2369,6 +2373,8 @@ namespace pipedal
{
auto&bufferTrace = bufferTraces[ix];
if (bufferTrace.time != 0)
{
int64_t dt = (int64_t)bufferTrace.time - (int64_t)t0;
@@ -2376,9 +2382,10 @@ namespace pipedal
<< fixed << setprecision(3) << dt*0.001
<< " " << "inAvail: " << bufferTrace.inAvail
<< " " << "outAvail: " << bufferTrace.outAvail
<< " " << "bufferd: " << bufferTrace.buffered
<< " " << "buffered: " << bufferTrace.buffered
<< " " << "total: " << bufferTrace.total
<< endl;
}
++ix;
if (ix == bufferTraces.size())
src/PiPedalAlsa.cpp
+17 -10
View File
@@ -108,10 +108,25 @@ std::vector<AlsaDeviceInfo> PiPedalAlsaDevices::GetAlsaDevices()
info.cardId_ = cardNum;
info.id_ = std::string("hw:") + snd_ctl_card_info_get_id(alsaInfo);
const char *driver = snd_ctl_card_info_get_driver(alsaInfo);
(void)driver;
info.name_ = snd_ctl_card_info_get_name(alsaInfo);
info.longName_ = snd_ctl_card_info_get_longname(alsaInfo);
// we can't read our own device if it's open so use data that gets
// cached before we open audio devices.
AlsaDeviceInfo cachedInfo;
if (getCachedDevice(info.name_, &cachedInfo))
{
// may have been plugged into a different USB connector.
cachedInfo.cardId_ = info.cardId_;
cachedInfo.id_ = info.id_;
result.push_back(cachedInfo);
}
else
{
snd_pcm_t *captureDevice = nullptr;
snd_pcm_t *playbackDevice = nullptr;
bool captureOk = snd_pcm_open(&captureDevice, cardId.c_str(), SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK) == 0;
@@ -194,16 +209,6 @@ std::vector<AlsaDeviceInfo> PiPedalAlsaDevices::GetAlsaDevices()
cacheDevice(info.name_, info);
result.push_back(info);
}
else if (getCachedDevice(info.name_, &info))
{
result.push_back(info);
}
}
else
{
if (getCachedDevice(info.name_, &info))
{
result.push_back(info);
}
}
}
@@ -528,6 +533,8 @@ JSON_MAP_REFERENCE(AlsaDeviceInfo, longName)
JSON_MAP_REFERENCE(AlsaDeviceInfo, sampleRates)
JSON_MAP_REFERENCE(AlsaDeviceInfo, minBufferSize)
JSON_MAP_REFERENCE(AlsaDeviceInfo, maxBufferSize)
JSON_MAP_REFERENCE(AlsaDeviceInfo, supportsCapture)
JSON_MAP_REFERENCE(AlsaDeviceInfo, supportsPlayback)
JSON_MAP_END()
JSON_MAP_BEGIN(AlsaMidiDeviceInfo)
src/Storage.cpp
+12 -4
View File
@@ -237,6 +237,14 @@ void Storage::MaybeCopyDefaultPresets()
}
}
static void removeFileNoThrow(const std::filesystem::path &path)
{
try {
fs::remove(path);
} catch (const std::exception&)
{
}
}
void Storage::UpgradeFactoryPresets()
{
auto presetsDirectory = this->GetPresetsDirectory();
@@ -256,11 +264,11 @@ void Storage::UpgradeFactoryPresets()
if (defaultConfigPresetsVersion.Version() > presetsVersion.Version() || defaultConfigPresetsVersion.Version() == 0)
{
// remove TooB ML README.md
fs::remove("/usr/lib/lv2/ToobAmp.lv2/models/tones/README.md");
fs::remove("/var/pipedal/audio_uploads/ToobMlModels/model.index");
removeFileNoThrow("/usr/lib/lv2/ToobAmp.lv2/models/tones/README.md");
removeFileNoThrow("/var/pipedal/audio_uploads/ToobMlModels/model.index");
fs::remove("/var/pipedal/audio_uploads/ToobMlModels/README.md");
fs::remove("/var/pipedal/audio_uploads/ToobMlModels/model.index");
removeFileNoThrow("/var/pipedal/audio_uploads/ToobMlModels/README.md");
removeFileNoThrow("/var/pipedal/audio_uploads/ToobMlModels/model.index");
std::string name = "Factory Presets";
BankFile newFactoryPresets;
vite/src/pipedal/JackServerSettings.tsx
+2 -3
View File
@@ -41,8 +41,7 @@ export default class JackServerSettings {
// this.valid = true;
// }
// }
clone(): JackServerSettings
{
clone(): JackServerSettings {
return new JackServerSettings().deserialize(this);
}
valid: boolean = false;
@@ -86,7 +85,7 @@ export default class JackServerSettings {
return inDev;
} else {
return inDev+" → "+outDev;
return inDev + "-> " + outDev;
}
}
vite/src/pipedal/JackServerSettingsDialog.tsx
+148 -199
View File
@@ -29,6 +29,7 @@ import Button from '@mui/material/Button';
import DialogActions from '@mui/material/DialogActions';
import DialogEx from './DialogEx';
import JackServerSettings from './JackServerSettings';
import JackHostStatus from './JackHostStatus';
import InputLabel from '@mui/material/InputLabel';
@@ -72,6 +73,8 @@ function sortDevices(devices: AlsaDeviceInfo[]): AlsaDeviceInfo[] {
const MIN_BUFFER_SIZE = 16;
const MAX_BUFFER_SIZE = 2048;
const valid_buffer_sizes = [16, 32, 48, 64, 128, 256, 512, 1024, 2048];
interface BufferSetting {
bufferSize: number;
@@ -80,15 +83,23 @@ interface BufferSetting {
// empty string used when no valid device is selected - the default.
const INVALID_DEVICE_ID = "";
enum WarningDialogType {
None,
Apply,
Ok,
};
interface JackServerSettingsDialogState {
latencyText: string;
jackServerSettings: JackServerSettings;
jackHostStatus?: JackHostStatus;
alsaDevices?: AlsaDeviceInfo[];
okEnabled: boolean;
fullScreen: boolean;
compactWidth: boolean;
showDeviceWarning: boolean;
dontShowWarningAgain: boolean;
warningDialogType: WarningDialogType;
suppressDeviceWarning: boolean;
windowSize: { width: number, height: number};
}
const styles = (theme: Theme) =>
@@ -124,25 +135,20 @@ function getLatencyText(settings?: JackServerSettings ): string {
return ms.toFixed(1) + "ms";
}
function getValidBufferCounts(bufferSize: number, alsaDeviceInfo?: AlsaDeviceInfo): number[]
{
if (!alsaDeviceInfo)
{
function getValidBufferCounts(bufferSize: number, alsaDeviceInfo?: AlsaDeviceInfo): number[] {
if (!alsaDeviceInfo) {
return [];
}
let result: number[] = [];
if (bufferSize * 2 >= alsaDeviceInfo.minBufferSize)
{
if (bufferSize * 2 >= alsaDeviceInfo.minBufferSize) {
result = [2, 3, 4, 5, 6];
} else {
let minBuffers = Math.ceil(alsaDeviceInfo.minBufferSize / bufferSize / 2 - 0.0001);
result = [minBuffers * 2, minBuffers * 3, minBuffers * 4, minBuffers * 5, minBuffers * 6];
}
for (let i = 0; i < result.length; ++i)
{
for (let i = 0; i < result.length; ++i) {
let selectedSize = result[i] * bufferSize;
if (selectedSize < alsaDeviceInfo.minBufferSize || selectedSize > alsaDeviceInfo.maxBufferSize)
{
if (selectedSize < alsaDeviceInfo.minBufferSize || selectedSize > alsaDeviceInfo.maxBufferSize) {
result.splice(i, 1);
--i;
}
@@ -166,18 +172,15 @@ function getValidBufferSizesMultiple(inDevice?: AlsaDeviceInfo, outDevice?: Alsa
if (!outDevice) return s1;
return intersectArrays(s1, getValidBufferSizes(outDevice));
}
function getValidBufferSizes(alsaDeviceInfo? : AlsaDeviceInfo): number[]
{
if (!alsaDeviceInfo )
{
function getValidBufferSizes(alsaDeviceInfo?: AlsaDeviceInfo): number[] {
if (!alsaDeviceInfo) {
return [];
}
let result: number[] = [];
for (let i = MIN_BUFFER_SIZE; i <= MAX_BUFFER_SIZE; i *= 2)
{
if (getValidBufferCounts(i,alsaDeviceInfo).length !== 0)
{
result.push(i);
for (let i = 0; i < valid_buffer_sizes.length; i++) {
let v = valid_buffer_sizes[i];
if (getValidBufferCounts(v, alsaDeviceInfo).length !== 0) {
result.push(v);
}
}
return result;
@@ -189,8 +192,7 @@ function getBestBuffers(
numberOfBuffers: number,
bufferSizeChanging: boolean = false
): BufferSetting {
if (!inDevice && !outDevice)
{
if (!inDevice && !outDevice) {
return { bufferSize: bufferSize, numberOfBuffers: numberOfBuffers };
}
@@ -202,22 +204,17 @@ function getBestBuffers(
let ix = validBuffercounts.indexOf(numberOfBuffers);
if (ix !== -1) {
if (bufferSize * numberOfBuffers <= maxSize
&& bufferSize*numberOfBuffers >= minSize)
{
&& bufferSize * numberOfBuffers >= minSize) {
return { bufferSize: bufferSize, numberOfBuffers: numberOfBuffers };
}
}
// if numberOfBuffers is not valid, and the user has just selected a new buffers size,
// then choose from available buffer counts.
if (bufferSizeChanging)
{
if (validBuffercounts.length !== 0)
{
if (bufferSizeChanging) {
if (validBuffercounts.length !== 0) {
// prefer the one thats divisible by 3.
for (let i = 0; i < validBuffercounts.length; ++i)
{
if (validBuffercounts[i] % 3 === 0)
{
for (let i = 0; i < validBuffercounts.length; ++i) {
if (validBuffercounts[i] % 3 === 0) {
numberOfBuffers = validBuffercounts[i];
return { bufferSize: bufferSize, numberOfBuffers: numberOfBuffers };
}
@@ -265,8 +262,7 @@ function getBestBuffers(
};
function isOkEnabled(jackServerSettings: JackServerSettings, alsaDevices?: AlsaDeviceInfo[])
{
function isOkEnabled(jackServerSettings: JackServerSettings, alsaDevices?: AlsaDeviceInfo[]) {
if (!alsaDevices) return false;
if (!jackServerSettings.alsaInputDevice || !jackServerSettings.alsaOutputDevice) return false;
@@ -293,45 +289,41 @@ const JackServerSettingsDialog = withStyles(
class extends ResizeResponsiveComponent<JackServerSettingsDialogProps, JackServerSettingsDialogState> {
model: PiPedalModel;
ignoreClose: boolean = false;
constructor(props: JackServerSettingsDialogProps) {
super(props);
this.model = PiPedalModelFactory.getInstance();
this.suppressDeviceWarning = localStorage.getItem("suppressSeparateDeviceWarning") === "1";
let suppressWarnings = true; //localStorage.getItem("suppressSeparateDeviceWarning") === "1";
this.state = {
latencyText: getLatencyText(props.jackServerSettings),
jackServerSettings: props.jackServerSettings.clone(), // invalid, but not nullish
alsaDevices: undefined,
okEnabled: false,
fullScreen: this.getFullScreen(),
compactWidth: document.documentElement.clientWidth < 600,
showDeviceWarning: false,
dontShowWarningAgain: false
compactWidth: this.windowSize.width < 600,
warningDialogType: WarningDialogType.None,
suppressDeviceWarning: suppressWarnings,
windowSize: this.windowSize,
jackHostStatus: undefined
};
}
mounted: boolean = false;
suppressDeviceWarning: boolean;
/**
* Copy of the settings when the dialog is opened. Pressing Apply only tests these settings temporarily. Closing the dialog without OK re-applies the saved copy so the audio driver returns to its previous configuration.
*/
originalJackServerSettings?: JackServerSettings;
getFullScreen() {
return document.documentElement.clientWidth < 420 ||
document.documentElement.clientHeight < 700;
return false;
// return document.documentElement.clientWidth < 420 ||
// document.documentElement.clientHeight < 700;
}
onWindowSizeChanged(width: number, height: number): void {
super.onWindowSizeChanged(width, height);
const fullScreen = this.getFullScreen();
// super.onWindowSizeChanged(width, height);
// const fullScreen = this.getFullScreen();
const compactWidth = width < 600;
if (fullScreen !== this.state.fullScreen || compactWidth !== this.state.compactWidth) {
this.setState({ fullScreen, compactWidth });
}
this.setState({ compactWidth: compactWidth, windowSize: { width: width, height: height } });
}
requestAlsaInfo() {
@@ -357,59 +349,6 @@ const JackServerSettingsDialog = withStyles(
});
}
/** Persist the current settings to permanent storage. */
saveSettings(settings?: JackServerSettings): void {
const s = (settings ?? this.state.jackServerSettings).clone();
// Fire and forget. Errors will be handled by PiPedalModel's internal error handling (e.g., showAlert).
this.model.setJackServerSettings(s);
}
/**
* Save the current settings temporarily so they can be restored if the
* dialog is cancelled.
*/
saveSettingsTemporary(settings?: JackServerSettings) {
this.originalJackServerSettings = (settings ?? this.state.jackServerSettings).clone();
}
/**
* Apply the provided settings to the audio system without persisting
* them. Falls back to the regular setter if the temporary apply API is
* unavailable.
*/
applySettings(settings?: JackServerSettings): void {
const s = (settings ?? this.state.jackServerSettings).clone();
s.valid = true;
const ws = this.model.webSocket;
if (ws) {
ws.request<void>("applyJackServerSettings", s)
.catch(() => { }); // Fire and forget
} else {
this.model.setJackServerSettings(s);
}
}
/**
* Revert the dialog state to the persisted settings. The reverted
* settings are applied immediately as well.
*/
revertSettings() {
this.model.getJackServerSettings()
.then((s) => {
const applied = this.applyAlsaDevices(s.clone(), this.state.alsaDevices);
this.setState({
jackServerSettings: applied,
latencyText: getLatencyText(applied),
okEnabled: isOkEnabled(applied, this.state.alsaDevices)
});
this.applySettings(s);
})
.catch(() => { });
}
applyAlsaDevices(jackServerSettings: JackServerSettings, alsaDevices?: AlsaDeviceInfo[]) {
let result = jackServerSettings.clone();
if (!alsaDevices || alsaDevices.length === 0) {
@@ -463,48 +402,70 @@ const JackServerSettingsDialog = withStyles(
return result;
}
tick() {
this.model.getJackStatus()
.then((jackStatus) =>
this.setState(
{
jackHostStatus: jackStatus
})
)
.catch((error) => { });
}
componentDidMount() {
super.componentDidMount();
this.mounted = true;
this.ignoreClose = false;
if (this.props.open) {
this.requestAlsaInfo();
this.saveSettingsTemporary(this.props.jackServerSettings);
}
this.updateActive();
}
componentDidUpdate(oldProps: JackServerSettingsDialogProps) {
if ((this.props.open && !oldProps.open) && this.mounted) {
this.ignoreClose = false;
this.saveSettingsTemporary(this.props.jackServerSettings);
// When opening, preserve the current settings until ALSA device
// information is loaded. If we don't have device info yet, just
// clone the provided settings without applying device defaults.
let settings = this.state.alsaDevices
? this.applyAlsaDevices(this.props.jackServerSettings.clone(), this.state.alsaDevices)
: this.props.jackServerSettings.clone();
private active: boolean = false;
private timerHandle: number | null = null;
updateActive() {
let active = this.mounted && this.props.open;
if (active !== this.active) {
this.active = active;
if (this.active) {
this.setState({
jackServerSettings: settings,
latencyText: getLatencyText(settings),
okEnabled: isOkEnabled(settings, this.state.alsaDevices)
jackServerSettings: this.props.jackServerSettings.clone(),
alsaDevices: undefined,
latencyText: "",
jackHostStatus: undefined,
okEnabled: false
});
if (!this.state.alsaDevices) {
this.requestAlsaInfo();
}
} else if (!this.props.open && oldProps.open) {
this.originalJackServerSettings = undefined;
this.timerHandle = setInterval(() => this.tick(), 1000);
} else {
if (this.timerHandle !== null) {
clearInterval(this.timerHandle);
this.timerHandle = null;
}
}
}
}
componentDidUpdate(oldProps: JackServerSettingsDialogProps) {
this.updateActive();
}
componentWillUnmount() {
super.componentWillUnmount();
this.mounted = false;
if (this.originalJackServerSettings) {
// Revert any unapplied changes when the dialog is unmounted
this.applySettings(this.originalJackServerSettings);
this.originalJackServerSettings = undefined;
}
this.updateActive();
}
getSelectedDevice(deviceId: string): AlsaDeviceInfo | undefined {
@@ -569,62 +530,53 @@ const JackServerSettingsDialog = withStyles(
});
}
handleApply() {
if (this.state.okEnabled) {
this.applySettings(); // Fire and forget
applySettings() {
const settings = this.state.jackServerSettings.clone();
settings.valid = true;
this.props.onApply(settings);
}
handleApply() {
if (!this.state.okEnabled) return;
if (this.state.jackServerSettings.alsaInputDevice !== this.state.jackServerSettings.alsaOutputDevice
&& this.state.suppressDeviceWarning === false) {
this.setState({ warningDialogType: WarningDialogType.Apply });
} else {
this.applySettings();
};
}
handleOk() {
if (!this.state.okEnabled) return;
const proceedWithOk = () => {
const settings = this.state.jackServerSettings.clone();
settings.valid = true;
this.ignoreClose = true; // Indicate that the closing is intentional
this.applySettings(settings); // Fire and forget
this.saveSettings(settings); // Fire and forget
this.originalJackServerSettings = undefined;
if (this.props.onApply) {
this.props.onApply(settings.clone());
}
this.props.onClose(); // Close the dialog
};
if (this.state.jackServerSettings.alsaInputDevice !== this.state.jackServerSettings.alsaOutputDevice
&& !this.suppressDeviceWarning) {
this.setState({ showDeviceWarning: true });
return;
&& this.state.suppressDeviceWarning === false) {
this.setState({ warningDialogType: WarningDialogType.Ok });
} else {
this.applySettings();
this.props.onClose(); // Close the dialog
}
proceedWithOk();
};
handleWarningProceed() {
if (this.state.dontShowWarningAgain) {
localStorage.setItem("suppressSeparateDeviceWarning", "1");
this.suppressDeviceWarning = true;
}
this.setState({ showDeviceWarning: false, dontShowWarningAgain: false }, () => {
const settings = this.state.jackServerSettings.clone();
settings.valid = true;
this.ignoreClose = true;
this.applySettings(settings); // Fire and forget
this.saveSettings(settings); // Fire and forget
this.originalJackServerSettings = undefined;
if (this.props.onApply) {
this.props.onApply(settings.clone());
}
this.setState({ warningDialogType: WarningDialogType.None });
if (this.state.warningDialogType === WarningDialogType.Ok) {
this.applySettings();
this.props.onClose(); // Close the dialog after the warning
});
} else if (this.state.warningDialogType === WarningDialogType.Apply) {
this.applySettings();
}
}
handleWarningCancel() {
this.setState({ showDeviceWarning: false, dontShowWarningAgain: false });
this.setState({ warningDialogType: WarningDialogType.None });
}
handleWarningCheck(e: any, checked: boolean) {
this.setState({ dontShowWarningAgain: checked });
this.setState({ suppressDeviceWarning: checked });
localStorage.setItem("suppressSeparateDeviceWarning", checked ? "1" : "0");
}
handleInputDeviceChanged(e: any) {
const d = e.target.value as string;
@@ -652,24 +604,14 @@ const JackServerSettingsDialog = withStyles(
});
}
handleClose() {
this.props.onClose();
};
render() {
const classes = withStyles.getClasses(this.props);
const { onClose, open } = this.props;
//Ignore close rutine if the ignoreclose is true. (After OK or Proceed or Multi Device Warning)
const handleClose = () => {
if (this.ignoreClose) {
return;
} else {
if (this.originalJackServerSettings) {
// Revert any applied settings
this.applySettings(this.originalJackServerSettings); // Fire and forget
this.originalJackServerSettings = undefined;
}
}
onClose();
};
const sortedDevices = sortDevices(this.state.alsaDevices ?? []);
@@ -688,10 +630,10 @@ const JackServerSettingsDialog = withStyles(
intersectArrays(selectedInputDevice.sampleRates, selectedOutputDevice.sampleRates)
: [];
let sampleRateOptions = sampleRates.length === 0 && this.state.jackServerSettings.sampleRate ? [this.state.jackServerSettings.sampleRate] : sampleRates;
let ultraCompact = this.windowSize.width < 500;
return (
<>
<DialogEx tag="jack" onClose={handleClose} aria-labelledby="select-channels-title" open={open}
<DialogEx tag="jack" onClose={() => { this.handleClose(); }} aria-labelledby="select-channels-title" open={this.props.open}
onEnterKey={() => {
this.handleOk();
}}
@@ -748,17 +690,18 @@ const JackServerSettingsDialog = withStyles(
inputProps={{
id: 'jsd_sampleRate',
style: {
textAlign: "right"
textAlign: "right",
}
}}
>
{sampleRateOptions.map((sr) => {
return (<MenuItem value={sr}>{sr}</MenuItem> );
return (<MenuItem key={sr} value={sr}>{sr}</MenuItem>);
})}
</Select>
</FormControl>
<div style={{ display: "inline", whiteSpace: "nowrap" }}>
<FormControl variant="standard" className={classes.formControl}>
<div style={{ display: "flex", flexFlow: "row wrap", justifyContent: "start" }}>
<FormControl variant="standard" className={classes.formControl}
>
<InputLabel shrink className={classes.inputLabel} htmlFor="bufferSize">Buffer size</InputLabel>
<Select variant="standard"
onChange={(e) => this.handleSizeChanged(e)}
@@ -789,8 +732,7 @@ const JackServerSettingsDialog = withStyles(
}}
>
{
bufferCounts.map((bufferCount)=>
{
bufferCounts.map((bufferCount) => {
return (
<MenuItem key={bufferCount} value={bufferCount}>{bufferCount.toString()}</MenuItem>
@@ -801,14 +743,21 @@ const JackServerSettingsDialog = withStyles(
</FormControl>
</div>
</div>
<Typography display="block" variant="caption" style={{ textAlign: "left", marginTop: 8, marginLeft: 24 }}
<Typography display="block" variant="caption" style={{ textAlign: "left", marginTop: 12, marginLeft: 24 }}
color="textSecondary">
Latency: {this.state.latencyText}
</Typography>
<Typography display="block" variant="caption" style={{ textAlign: "left", marginTop: 0, marginLeft: 24 }}
color="textSecondary">
{
JackHostStatus.getDisplayView("Status: ", this.state.jackHostStatus)
}
</Typography>
</DialogContent>
<DialogActions>
<Button variant="dialogSecondary" onClick={handleClose}>
<Button variant="dialogSecondary" onClick={() => { this.handleClose(); }}>
Cancel
</Button>
<Button variant="dialogSecondary" onClick={() => this.handleApply()} disabled={!this.state.okEnabled}>Apply</Button>
@@ -818,19 +767,19 @@ const JackServerSettingsDialog = withStyles(
</DialogActions>
</DialogEx>
{this.state.showDeviceWarning && (
<DialogEx open={this.state.showDeviceWarning} tag="ioWarning"
{this.state.warningDialogType !== WarningDialogType.None && (
<DialogEx open={true} tag="ioWarning"
onEnterKey={() => this.handleWarningProceed()}
onClose={() => this.handleWarningCancel()}
style={{ userSelect: "none" }}
>
<DialogContent>
<Typography variant="body2" color="textPrimary" gutterBottom>
Using different input and output devices may cause issues when streaming audio.
<Typography display="block" variant="body2" color="textSecondary" style={{ fontSize: 16, fontWeight: 400 }} gutterBottom>
For best results, you should the same device for both audio input and output.
Are you sure you want to continue?
</Typography>
<FormControlLabel
control={<Checkbox checked={this.state.dontShowWarningAgain} onChange={(e,c)=>this.handleWarningCheck(e,c)} />}
control={<Checkbox checked={this.state.suppressDeviceWarning} onChange={(e, c) => this.handleWarningCheck(e, c)} />}
label="Don't show me this message again"
/>
</DialogContent>
vite/src/pipedal/SettingsDialog.tsx
-1
View File
@@ -702,7 +702,6 @@ const SettingsDialog = withStyles(
onClose={() => this.setState({ showJackServerSettingsDialog: false })}
onApply={(jackServerSettings) => {
this.setState({
showJackServerSettingsDialog: false,
jackServerSettings: jackServerSettings
});
this.model.setJackServerSettings(jackServerSettings);