mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Listen for timecode load signals in AudioMarkerProviderKeyframes

Browse source 
Originally committed to SVN as r5084.
This commit is contained in:
Thomas Goyne 2010-12-31 23:53:30 +00:00
parent 4fdad923ad
commit cf89403a5b
1 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
aegisub/src/audio_controller.cpp
View file

@ -79,37 +79,46 @@ 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;
std::vector<AudioMarkerKeyframe> keyframe_samples; std::vector<AudioMarkerKeyframe> keyframe_samples;
AudioController *controller; AudioController *controller;
void OnKeyframesOpen(std::vector<int> const& raw_keyframes) void Update()
{ {
std::vector<int> const& keyframes = vc->GetKeyFrames();
agi::vfr::Framerate const& timecodes = vc->FPS();
if (keyframes.empty() || !timecodes.IsLoaded())
{
if (keyframe_samples.empty())
{
return;
}
keyframe_samples.clear();
AnnounceMarkerMoved();
return;
}
keyframe_samples.clear(); keyframe_samples.clear();
keyframe_samples.reserve(raw_keyframes.size()); keyframe_samples.reserve(keyframes.size());
for (size_t i = 0; i < raw_keyframes.size(); ++i) for (size_t i = 0; i < keyframes.size(); ++i)
{ {
keyframe_samples.push_back(AudioMarkerKeyframe( keyframe_samples.push_back(AudioMarkerKeyframe(
controller->SamplesFromMilliseconds(vc->TimeAtFrame(raw_keyframes[i])))); controller->SamplesFromMilliseconds(timecodes.TimeAtFrame(keyframes[i]))));
} }
AnnounceMarkerMoved(); AnnounceMarkerMoved();
} }
private:
// AudioControllerAudioEventListener implementation
void OnAudioOpen(AudioProvider *)
{
OnKeyframesOpen(vc->GetKeyFrames());
}
public: public:
AudioMarkerProviderKeyframes(AudioController *controller) AudioMarkerProviderKeyframes(AudioController *controller)
: vc(VideoContext::Get()) : vc(VideoContext::Get())
, keyframe_slot(vc->AddKeyframesListener(&AudioMarkerProviderKeyframes::OnKeyframesOpen, this)) , keyframe_slot(vc->AddKeyframesListener(&AudioMarkerProviderKeyframes::Update, this))
, audio_open_slot(controller->AddAudioOpenListener(&AudioMarkerProviderKeyframes::OnAudioOpen, this)) , audio_open_slot(controller->AddAudioOpenListener(&AudioMarkerProviderKeyframes::Update, this))
, timecode_slot(vc->AddTimecodesListener(&AudioMarkerProviderKeyframes::Update, this))
, controller(controller) , controller(controller)
{ {
OnKeyframesOpen(vc->GetKeyFrames()); Update();
} }
void GetMarkers(const SampleRange &range, AudioMarkerVector &out) const void GetMarkers(const SampleRange &range, AudioMarkerVector &out) const