From f6c8c83f5a17f6ed338c626fc25563c3a8ca1e2d Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Tue, 25 Oct 2011 19:01:41 +0000 Subject: [PATCH] Obey the option to disable the keyframe markers in the audio display Originally committed to SVN as r5778. --- aegisub/src/audio_controller.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/aegisub/src/audio_controller.cpp b/aegisub/src/audio_controller.cpp index 961d2c9b8..3c46cb352 100644 --- a/aegisub/src/audio_controller.cpp +++ b/aegisub/src/audio_controller.cpp @@ -80,6 +80,7 @@ class AudioMarkerProviderKeyframes : public AudioMarkerProvider { agi::signal::Connection keyframe_slot; agi::signal::Connection audio_open_slot; agi::signal::Connection timecode_slot; + agi::signal::Connection enabled_slot; std::vector keyframe_samples; AudioController *controller; @@ -91,14 +92,13 @@ class AudioMarkerProviderKeyframes : public AudioMarkerProvider { std::vector const& keyframes = vc->GetKeyFrames(); agi::vfr::Framerate const& timecodes = vc->FPS(); - if (keyframes.empty() || !timecodes.IsLoaded()) + if (keyframes.empty() || !timecodes.IsLoaded() || !OPT_GET("Audio/Display/Draw/Keyframes")->GetBool()) { - if (keyframe_samples.empty()) + if (!keyframe_samples.empty()) { - return; + keyframe_samples.clear(); + AnnounceMarkerMoved(); } - keyframe_samples.clear(); - AnnounceMarkerMoved(); return; } @@ -118,6 +118,7 @@ public: , keyframe_slot(vc->AddKeyframesListener(&AudioMarkerProviderKeyframes::Update, this)) , audio_open_slot(controller->AddAudioOpenListener(&AudioMarkerProviderKeyframes::Update, this)) , timecode_slot(vc->AddTimecodesListener(&AudioMarkerProviderKeyframes::Update, this)) + , enabled_slot(OPT_SUB("Audio/Display/Draw/Keyframes", &AudioMarkerProviderKeyframes::Update, this)) , controller(controller) , style("Colour/Audio Display/Keyframe") {