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

Reverting waits

Browse Source 
Waits are still overlapping. Will discuss with Robin for advice on how he wants to manage them. My attempt stopped the over lap but broke the loading.
This commit is contained in:
Extremesecrecy
2025-07-26 12:56:30 -07:00
parent d2e489cdf4
commit c7bcc7c240
3 changed files with 27 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/AudioHost.cpp
+2 -2
View File
@@ -2086,8 +2086,8 @@ public:
virtual void UpdateServerConfiguration(const JackServerSettings &jackServerSettings, virtual void UpdateServerConfiguration(const JackServerSettings &jackServerSettings,
std::function<void(bool success, const std::string &errorMessage)> onComplete) std::function<void(bool success, const std::string &errorMessage)> onComplete)
{ {
// Only allow one restart operation at a time.
CleanRestartThreads(true);
std::lock_guard guard(restart_mutex); std::lock_guard guard(restart_mutex);
RestartThread *pShutdown = new RestartThread(this, jackServerSettings, onComplete); RestartThread *pShutdown = new RestartThread(this, jackServerSettings, onComplete);
restartThreads.push_back(pShutdown); restartThreads.push_back(pShutdown);
src/PiPedalModel.cpp
+4 -54
View File
@@ -1377,31 +1377,6 @@ void PiPedalModel::RestartAudio(bool useDummyAudioDriver)
jackServerSettings.UseDummyAudioDevice(); jackServerSettings.UseDummyAudioDevice();
} }
auto jackConfiguration = this->jackConfiguration; auto jackConfiguration = this->jackConfiguration;
jackConfiguration.AlsaInitialize(jackServerSettings); jackConfiguration.AlsaInitialize(jackServerSettings);
if (!jackConfiguration.isValid()) if (!jackConfiguration.isValid())
@@ -2772,31 +2747,6 @@ static bool HasAlsaDevice(const std::vector<AlsaDeviceInfo> devices, const std::
return false; return false;
} }
void PiPedalModel::StartHotspotMonitoring() void PiPedalModel::StartHotspotMonitoring()
{ {
this->avahiService = std::make_unique<AvahiService>(); this->avahiService = std::make_unique<AvahiService>();
@@ -3065,15 +3015,15 @@ void PiPedalModel::OnAlsaDriverTerminatedAbnormally()
auto now = clock::now(); auto now = clock::now();
clock::duration timeSinceLastRetry = now-this->lastRestartTime; clock::duration timeSinceLastRetry = now-this->lastRestartTime;
this->lastRestartTime = now; this->lastRestartTime = now;
if (timeSinceLastRetry > std::chrono::duration_cast<clock::duration>(std::chrono::seconds(6))) { if (timeSinceLastRetry > std::chrono::duration_cast<clock::duration>(std::chrono::milliseconds(1000))) {
audioRestartRetries = 0; audioRestartRetries = 0;
} }
CancelAudioRetry(); CancelAudioRetry();
if (audioRestartRetries == 0) if (audioRestartRetries == 0)
{ {
this->audioRetryPostHandle = this->PostDelayed( this->audioRetryPostHandle = this->Post(
std::chrono::seconds(5),
// No lock to avoid deadlocks! // No lock to avoid deadlocks!
[this]() { [this]() {
Lv2Log::info("Restarting audio."); Lv2Log::info("Restarting audio.");
@@ -3083,7 +3033,7 @@ void PiPedalModel::OnAlsaDriverTerminatedAbnormally()
} else if (audioRestartRetries < 3) } else if (audioRestartRetries < 3)
{ {
this->audioRetryPostHandle = this->PostDelayed( this->audioRetryPostHandle = this->PostDelayed(
std::chrono::seconds(5), std::chrono::milliseconds(100 * audioRestartRetries),
[this]() { [this]() {
if (closed) { if (closed) {
return; return;
vite/src/pipedal/JackServerSettingsDialog.tsx
+9 -9
View File
@@ -472,11 +472,11 @@ const JackServerSettingsDialog = withStyles(
componentWillUnmount() { componentWillUnmount() {
super.componentWillUnmount(); super.componentWillUnmount();
this.mounted = false; this.mounted = false;
this.stopStatusTimer(); this.stopStatusTimer();
if (this.originalJackServerSettings) {
this.model.setJackServerSettings(this.originalJackServerSettings);
this.originalJackServerSettings = undefined;
}
} }
getSelectedDevice(deviceId: string): AlsaDeviceInfo | undefined { getSelectedDevice(deviceId: string): AlsaDeviceInfo | undefined {
@@ -562,9 +562,9 @@ const JackServerSettingsDialog = withStyles(
let s = this.state.jackServerSettings.clone(); let s = this.state.jackServerSettings.clone();
s.valid = true; s.valid = true;
this.props.onApply(s); this.props.onApply(s);
// Prevent componentWillUnmount from reverting after the
// settings have been saved.
this.originalJackServerSettings = undefined;
}; };
handleWarningProceed() { handleWarningProceed() {
@@ -619,7 +619,7 @@ const JackServerSettingsDialog = withStyles(
const handleClose = () => { const handleClose = () => {
if (this.originalJackServerSettings) { if (this.originalJackServerSettings) {
this.model.setJackServerSettings(this.originalJackServerSettings); this.model.setJackServerSettings(this.originalJackServerSettings);
this.originalJackServerSettings = undefined;
} }
onClose(); onClose();
}; };