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

Move the logic to play the audio on stepping through video into video_context so that the VideoSlider's Next/PrevFrame can behave consistently regardless of where they're called from.

Browse source 
Originally committed to SVN as r4121.
This commit is contained in:
Kevin Ollivier 2010-02-17 19:04:41 +00:00
parent 3082838aa1
commit 3a58a48e1a
3 changed files with 35 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
aegisub/src/video_context.cpp
View file

@ -468,6 +468,34 @@ void VideoContext::GetScriptSize(int &sw,int &sh) {
grid->ass->GetResolution(sw,sh); grid->ass->GetResolution(sw,sh);
} }
/// @brief Play the next frame, possibly with audio
/// @return
///
void VideoContext::PlayNextFrame() {
if (isPlaying)
return;
int thisFrame = frame_n;
JumpToFrame(frame_n + 1);
// Start playing audio
if (Options.AsBool(_T("Audio Plays When Stepping Video")))
audio->Play(VFR_Output.GetTimeAtFrame(thisFrame),VFR_Output.GetTimeAtFrame(thisFrame + 1));
}
/// @brief Play the previous frame, possibly with audio
/// @return
///
void VideoContext::PlayPrevFrame() {
if (isPlaying)
return;
int thisFrame = frame_n;
JumpToFrame(frame_n -1);
// Start playing audio
if (Options.AsBool(_T("Audio Plays When Stepping Video")))
audio->Play(VFR_Output.GetTimeAtFrame(thisFrame - 1),VFR_Output.GetTimeAtFrame(thisFrame));
}
/// @brief Play /// @brief Play
/// @return /// @return
/// ///
@ -494,6 +522,9 @@ void VideoContext::Play() {
playback.Start(10); playback.Start(10);
} }
/// @brief Play line /// @brief Play line
/// @return /// @return
/// ///

2
aegisub/src/video_context.h
View file

@ -271,6 +271,8 @@ public:
wxString GetTempWorkFile (); wxString GetTempWorkFile ();
void Play(); void Play();
void PlayNextFrame();
void PlayPrevFrame();
void PlayLine(); void PlayLine();
void Stop(); void Stop();

4
aegisub/src/video_slider.cpp
View file

@ -154,7 +154,7 @@ void VideoSlider::NextFrame() {
if (VideoContext::Get()->IsPlaying()) return; if (VideoContext::Get()->IsPlaying()) return;
//don't request out of range frames //don't request out of range frames
if (GetValue() < max) VideoContext::Get()->JumpToFrame(GetValue()+1); if (GetValue() < max) VideoContext::Get()->PlayNextFrame();
Refresh(false); Refresh(false);
Update(); Update();
} }
@ -168,7 +168,7 @@ void VideoSlider::PrevFrame() {
if (VideoContext::Get()->IsPlaying()) return; if (VideoContext::Get()->IsPlaying()) return;
//don't request out of range frames //don't request out of range frames
if (GetValue() > min) VideoContext::Get()->JumpToFrame(GetValue()-1); if (GetValue() > min) VideoContext::Get()->PlayPrevFrame();
Refresh(false); Refresh(false);
Update(); Update();
} }