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

Only connect to signals in AudioDisplay when audio is actually open

Browse source 
Originally committed to SVN as r5885.
This commit is contained in:
Thomas Goyne 2011-11-18 22:57:54 +00:00
parent 725a334860
commit e3b15bf587
2 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
aegisub/src/audio_display.cpp
View file

@ -545,6 +545,7 @@ public:
AudioDisplay::AudioDisplay(wxWindow *parent, AudioController *controller, agi::Context *context) AudioDisplay::AudioDisplay(wxWindow *parent, AudioController *controller, agi::Context *context)
: wxWindow(parent, -1, wxDefaultPosition, wxDefaultSize, wxWANTS_CHARS|wxBORDER_SIMPLE) : wxWindow(parent, -1, wxDefaultPosition, wxDefaultSize, wxWANTS_CHARS|wxBORDER_SIMPLE)
, audio_open_connection(controller->AddAudioOpenListener(&AudioDisplay::OnAudioOpen, this))
, context(context) , context(context)
, audio_renderer(new AudioRenderer) , audio_renderer(new AudioRenderer)
, provider(0) , provider(0)
@ -561,17 +562,6 @@ AudioDisplay::AudioDisplay(wxWindow *parent, AudioController *controller, agi::C
track_cursor_pos = -1; track_cursor_pos = -1;
slots.push_back(controller->AddAudioOpenListener(&AudioDisplay::OnAudioOpen, this));
slots.push_back(controller->AddAudioCloseListener(&AudioDisplay::OnAudioOpen, this, (AudioProvider*)0));
slots.push_back(controller->AddPlaybackPositionListener(&AudioDisplay::OnPlaybackPosition, this));
slots.push_back(controller->AddPlaybackStopListener(&AudioDisplay::RemoveTrackCursor, this));
slots.push_back(controller->AddTimingControllerListener(&AudioDisplay::Refresh, this, true, (const wxRect*)0));
slots.push_back(controller->AddMarkerMovedListener(&AudioDisplay::OnMarkerMoved, this));
slots.push_back(controller->AddSelectionChangedListener(&AudioDisplay::OnSelectionChanged, this));
slots.push_back(controller->AddStyleRangesChangedListener(&AudioDisplay::OnStyleRangesChanged, this));
OPT_SUB("Audio/Spectrum", &AudioDisplay::ReloadRenderingSettings, this);
audio_renderer->SetAmplitudeScale(scale_amplitude); audio_renderer->SetAmplitudeScale(scale_amplitude);
SetZoomLevel(0); SetZoomLevel(0);
@ -1195,6 +1185,25 @@ void AudioDisplay::OnAudioOpen(AudioProvider *_provider)
SetZoomLevel(zoom_level); SetZoomLevel(zoom_level);
Refresh(); Refresh();
if (provider)
{
if (connections.empty())
{
connections.push_back(controller->AddAudioCloseListener(&AudioDisplay::OnAudioOpen, this, (AudioProvider*)0));
connections.push_back(controller->AddPlaybackPositionListener(&AudioDisplay::OnPlaybackPosition, this));
connections.push_back(controller->AddPlaybackStopListener(&AudioDisplay::RemoveTrackCursor, this));
connections.push_back(controller->AddTimingControllerListener(&AudioDisplay::Refresh, this, true, (const wxRect*)0));
connections.push_back(controller->AddMarkerMovedListener(&AudioDisplay::OnMarkerMoved, this));
connections.push_back(controller->AddSelectionChangedListener(&AudioDisplay::OnSelectionChanged, this));
connections.push_back(controller->AddStyleRangesChangedListener(&AudioDisplay::OnStyleRangesChanged, this));
connections.push_back(OPT_SUB("Audio/Spectrum", &AudioDisplay::ReloadRenderingSettings, this));
}
}
else
{
connections.clear();
}
} }
void AudioDisplay::OnPlaybackPosition(int64_t sample_position) void AudioDisplay::OnPlaybackPosition(int64_t sample_position)

3
aegisub/src/audio_display.h
View file

@ -98,8 +98,9 @@ public:
/// timing controller. The audio display also renders audio according to the audio controller /// timing controller. The audio display also renders audio according to the audio controller
/// and the timing controller, using an audio renderer instance. /// and the timing controller, using an audio renderer instance.
class AudioDisplay: public wxWindow { class AudioDisplay: public wxWindow {
agi::signal::Connection audio_open_connection;
std::list<agi::signal::Connection> slots; std::list<agi::signal::Connection> connections;
agi::Context *context; agi::Context *context;
/// The audio renderer manager /// The audio renderer manager