mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Delay creation of the audio renderer until audio is actually opened

Browse source 
Originally committed to SVN as r5940.
This commit is contained in:
Thomas Goyne 2011-11-30 00:40:22 +00:00
parent 8632d5ce75
commit c6b97612ae
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
aegisub/src/audio_display.cpp
View file

@ -565,8 +565,6 @@ AudioDisplay::AudioDisplay(wxWindow *parent, AudioController *controller, agi::C
audio_renderer->SetAmplitudeScale(scale_amplitude); audio_renderer->SetAmplitudeScale(scale_amplitude);
SetZoomLevel(0); SetZoomLevel(0);
ReloadRenderingSettings();
SetMinClientSize(wxSize(-1, 70)); SetMinClientSize(wxSize(-1, 70));
SetBackgroundStyle(wxBG_STYLE_PAINT); SetBackgroundStyle(wxBG_STYLE_PAINT);
SetThemeEnabled(false); SetThemeEnabled(false);
@ -1172,9 +1170,12 @@ void AudioDisplay::OnFocus(wxFocusEvent &event)
} }
void AudioDisplay::OnAudioOpen(AudioProvider *_provider) void AudioDisplay::OnAudioOpen(AudioProvider *provider)
{ {
provider = _provider; this->provider = provider;
if (!audio_renderer_provider)
ReloadRenderingSettings();
audio_renderer->SetAudioProvider(provider); audio_renderer->SetAudioProvider(provider);
audio_renderer->SetCacheMaxSize(OPT_GET("Audio/Renderer/Spectrum/Memory Max")->GetInt() * 1024 * 1024); audio_renderer->SetCacheMaxSize(OPT_GET("Audio/Renderer/Spectrum/Memory Max")->GetInt() * 1024 * 1024);