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

Just call Next/PrevFrame now that the audio playing behavior is implemented inside those methods.

Browse source 
Originally committed to SVN as r4122.
This commit is contained in:
Kevin Ollivier 2010-02-17 19:07:37 +00:00
parent 3a58a48e1a
commit 5cafad1d81
1 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
aegisub/src/frame_main_events.cpp
View file

@ -1779,13 +1779,6 @@ void FrameMain::OnStatusClear(wxTimerEvent &event) {
/// ///
void FrameMain::OnNextFrame(wxCommandEvent &event) { void FrameMain::OnNextFrame(wxCommandEvent &event) {
videoBox->videoSlider->NextFrame(); videoBox->videoSlider->NextFrame();
// FIXME: This is probably not the best place to put this, but I was told
// this code is all undergoing a rewrite, so I consider this a temporary solution.
if (audioBox && Options.AsBool(_T("Audio Plays When Stepping Video"))) {
int start = VFR_Output.GetTimeAtFrame(videoBox->videoDisplay->GetFrame());
int end = VFR_Output.GetTimeAtFrame(videoBox->videoDisplay->GetFrame() + 1);
audioBox->audioDisplay->Play(start,end);
}
} }
@ -1795,13 +1788,6 @@ void FrameMain::OnNextFrame(wxCommandEvent &event) {
/// ///
void FrameMain::OnPrevFrame(wxCommandEvent &event) { void FrameMain::OnPrevFrame(wxCommandEvent &event) {
videoBox->videoSlider->PrevFrame(); videoBox->videoSlider->PrevFrame();
// FIXME: This is probably not the best place to put this, but I was told
// this code is all undergoing a rewrite, so I consider this a temporary solution.
if (audioBox && Options.AsBool(_T("Audio Plays When Stepping Video"))) {
int start = VFR_Output.GetTimeAtFrame(videoBox->videoDisplay->GetFrame() - 1);
int end = VFR_Output.GetTimeAtFrame(videoBox->videoDisplay->GetFrame());
audioBox->audioDisplay->Play(start,end);
}
} }