1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-05 22:28:57 +02:00

Merge branch 'master' into deletes

This commit is contained in:
Paul Licameli 2016-08-17 16:48:36 -04:00
commit 012ceed3ea
2 changed files with 16 additions and 15 deletions

View File

@ -86,20 +86,21 @@
(defun soft-clip-table ()
"Lookup table for soft clipping wave-shaper"
(abs-env
(Control-srate-abs *sound-srate*
(let* ((knee (- 1 (/ 1.0 pi)))
(kcurve (mult knee (osc (hz-to-step (/ (* 4 knee))) knee)))
(ikcurve (mult knee (osc (hz-to-step (/ (* 4 knee))) knee *sine-table* -90)))
(lin (pwlv -0.5 knee -0.5
(+ knee (/ 2.0 pi)) 0.5
2.0 0.5
2.0 (+ 0.5 knee)
2.1 (+ 0.5 knee))))
(mult (/ 2.0 pi)
(sim
(at-abs 0 (cue ikcurve))
(at-abs 0 (cue lin))
(at-abs (+ knee (/ 2.0 pi)) (cue kcurve))))))))
(sound-srate-abs 44100
(Control-srate-abs 44100
(let* ((knee (- 1 (/ 1.0 pi)))
(kcurve (mult knee (osc (hz-to-step (/ (* 4 knee))) knee)))
(ikcurve (mult knee (osc (hz-to-step (/ (* 4 knee))) knee *sine-table* -90)))
(lin (pwlv -0.5 knee -0.5
(+ knee (/ 2.0 pi)) 0.5
2.0 0.5
2.0 (+ 0.5 knee)
2.1 (+ 0.5 knee))))
(mult (/ 2.0 pi)
(sim
(at-abs 0 (cue ikcurve))
(at-abs 0 (cue lin))
(at-abs (+ knee (/ 2.0 pi)) (cue kcurve)))))))))
(defun soft-clip (sig)
(let* ((knee (- 1 (/ 1.0 pi)))

View File

@ -234,7 +234,7 @@ void ShuttleGuiBase::AddUnits(const wxString &Prompt)
mpWind = safenew wxStaticText(GetParent(), -1, Prompt, wxDefaultPosition, wxDefaultSize,
Style( wxALIGN_LEFT ));
mpWind->SetName(Prompt); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs)
UpdateSizersCore( false, wxALL | wxALIGN_LEFT );
UpdateSizersCore( false, wxALL | wxALIGN_CENTRE_VERTICAL );
}
/// Centred text string.