From a6773bf84295f6b2a32cdb1690fb5abc2821e80b Mon Sep 17 00:00:00 2001 From: Niels Martin Hansen Date: Sun, 7 Jan 2007 07:28:39 +0000 Subject: [PATCH] Additional sanity check in spectrum code Changed default settings for spectrum (no reason to throw away 32 perfectly good bands!) Originally committed to SVN as r735. --- aegisub/audio_spectrum.cpp | 2 ++ aegisub/options.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/aegisub/audio_spectrum.cpp b/aegisub/audio_spectrum.cpp index 7fb1bc43c..fa8ff1fe6 100644 --- a/aegisub/audio_spectrum.cpp +++ b/aegisub/audio_spectrum.cpp @@ -271,6 +271,8 @@ void AudioSpectrum::RenderRange(__int64 range_start, __int64 range_end, bool sel } #define WRITE_PIXEL \ + if (intensity < 0) intensity = 0; \ + if (intensity > 255) intensity = 255; \ img[((imgheight-y-1)*imgpitch+x)*3 + 0] = palette[intensity*3+0]; \ img[((imgheight-y-1)*imgpitch+x)*3 + 1] = palette[intensity*3+1]; \ img[((imgheight-y-1)*imgpitch+x)*3 + 2] = palette[intensity*3+2]; diff --git a/aegisub/options.cpp b/aegisub/options.cpp index 91bc0f31f..514cde028 100644 --- a/aegisub/options.cpp +++ b/aegisub/options.cpp @@ -156,8 +156,8 @@ void OptionsManager::LoadDefaults() { SetText(_T("Audio Downmixer"),_T("ConvertToMono")); SetText(_T("Audio HD Cache Location"),_T("default")); SetText(_T("Audio HD Cache Name"),_T("audio%02i.tmp")); - SetInt(_T("Audio Spectrum Cutoff"),32); - SetInt(_T("Audio Spectrum Window"),11); + SetInt(_T("Audio Spectrum Cutoff"),0); + SetInt(_T("Audio Spectrum Window"),8); // Automation SetModificationType(MOD_RESTART);