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

Make the audio play commands stop the video like in 2.1.x

Browse source 
Originally committed to SVN as r5737.
This commit is contained in:
Thomas Goyne 2011-10-12 23:08:20 +00:00
parent bf5e504c59
commit bb4c10a140
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
aegisub/src/command/audio.cpp
View file

@ -224,6 +224,7 @@ struct audio_play_selection : public validate_audio_open {
STR_HELP("Play selection") STR_HELP("Play selection")
void operator()(agi::Context *c) { void operator()(agi::Context *c) {
c->videoController->Stop();
c->audioController->PlayPrimaryRange(); c->audioController->PlayPrimaryRange();
} }
}; };
@ -253,6 +254,7 @@ struct audio_play_before : public validate_audio_open {
STR_HELP("Play 500 ms before selection") STR_HELP("Play 500 ms before selection")
void operator()(agi::Context *c) { void operator()(agi::Context *c) {
c->videoController->Stop();
SampleRange times(c->audioController->GetPrimaryPlaybackRange()); SampleRange times(c->audioController->GetPrimaryPlaybackRange());
c->audioController->PlayRange(SampleRange( c->audioController->PlayRange(SampleRange(
times.begin() - c->audioController->SamplesFromMilliseconds(500), times.begin() - c->audioController->SamplesFromMilliseconds(500),
@ -268,6 +270,7 @@ struct audio_play_after : public validate_audio_open {
STR_HELP("Play 500 ms after selection") STR_HELP("Play 500 ms after selection")
void operator()(agi::Context *c) { void operator()(agi::Context *c) {
c->videoController->Stop();
SampleRange times(c->audioController->GetPrimaryPlaybackRange()); SampleRange times(c->audioController->GetPrimaryPlaybackRange());
c->audioController->PlayRange(SampleRange( c->audioController->PlayRange(SampleRange(
times.end(), times.end(),
@ -283,6 +286,7 @@ struct audio_play_end : public validate_audio_open {
STR_HELP("Play last 500 ms of selection") STR_HELP("Play last 500 ms of selection")
void operator()(agi::Context *c) { void operator()(agi::Context *c) {
c->videoController->Stop();
SampleRange times(c->audioController->GetPrimaryPlaybackRange()); SampleRange times(c->audioController->GetPrimaryPlaybackRange());
c->audioController->PlayRange(SampleRange( c->audioController->PlayRange(SampleRange(
times.end() - std::min( times.end() - std::min(
@ -300,6 +304,7 @@ struct audio_play_begin : public validate_audio_open {
STR_HELP("Play first 500 ms of selection") STR_HELP("Play first 500 ms of selection")
void operator()(agi::Context *c) { void operator()(agi::Context *c) {
c->videoController->Stop();
SampleRange times(c->audioController->GetPrimaryPlaybackRange()); SampleRange times(c->audioController->GetPrimaryPlaybackRange());
c->audioController->PlayRange(SampleRange( c->audioController->PlayRange(SampleRange(
times.begin(), times.begin(),
@ -317,6 +322,7 @@ struct audio_play_to_end : public validate_audio_open {
STR_HELP("Play from selection start to end of file") STR_HELP("Play from selection start to end of file")
void operator()(agi::Context *c) { void operator()(agi::Context *c) {
c->videoController->Stop();
c->audioController->PlayToEnd(c->audioController->GetPrimaryPlaybackRange().begin()); c->audioController->PlayToEnd(c->audioController->GetPrimaryPlaybackRange().begin());
} }
}; };