iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Obey the option to disable the keyframe markers in the audio display 

Originally committed to SVN as r5778.
This commit is contained in:
Thomas Goyne 2011-10-25 19:01:41 +00:00
parent 7476dfd9c6
commit f6c8c83f5a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
aegisub/src/audio_controller.cpp
View File

@ -80,6 +80,7 @@ class AudioMarkerProviderKeyframes : public AudioMarkerProvider {
agi::signal::Connection keyframe_slot; agi::signal::Connection keyframe_slot;
agi::signal::Connection audio_open_slot; agi::signal::Connection audio_open_slot;
agi::signal::Connection timecode_slot; agi::signal::Connection timecode_slot;
agi::signal::Connection enabled_slot;
std::vector<AudioMarkerKeyframe> keyframe_samples; std::vector<AudioMarkerKeyframe> keyframe_samples;
AudioController *controller; AudioController *controller;
@ -91,14 +92,13 @@ class AudioMarkerProviderKeyframes : public AudioMarkerProvider {
std::vector<int> const& keyframes = vc->GetKeyFrames(); std::vector<int> const& keyframes = vc->GetKeyFrames();
agi::vfr::Framerate const& timecodes = vc->FPS(); 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; return;
} }
@ -118,6 +118,7 @@ public:
, keyframe_slot(vc->AddKeyframesListener(&AudioMarkerProviderKeyframes::Update, this)) , keyframe_slot(vc->AddKeyframesListener(&AudioMarkerProviderKeyframes::Update, this))
, audio_open_slot(controller->AddAudioOpenListener(&AudioMarkerProviderKeyframes::Update, this)) , audio_open_slot(controller->AddAudioOpenListener(&AudioMarkerProviderKeyframes::Update, this))
, timecode_slot(vc->AddTimecodesListener(&AudioMarkerProviderKeyframes::Update, this)) , timecode_slot(vc->AddTimecodesListener(&AudioMarkerProviderKeyframes::Update, this))
, enabled_slot(OPT_SUB("Audio/Display/Draw/Keyframes", &AudioMarkerProviderKeyframes::Update, this))
, controller(controller) , controller(controller)
, style("Colour/Audio Display/Keyframe") , style("Colour/Audio Display/Keyframe")
{ {