Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core/movie: Add MovieFinished mode

Browse source 
Also mentioned in Laws of TAS.
This commit is contained in:
zhupengfei 2020-07-08 23:56:37 +08:00
parent e188f86582
commit 1780f8b5b8
No known key found for this signature in database
GPG key ID: DD129E108BD09378
5 changed files with 35 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/citra_qt/main.cpp
View file

@ -1892,7 +1892,8 @@ void GMainWindow::OnCloseMovie(bool shutting_down) {
OnPauseGame();
}
const bool was_recording = Core::Movie::GetInstance().IsRecordingInput();
const bool was_recording =
Core::Movie::GetInstance().GetPlayMode() == Core::Movie::PlayMode::Recording;
Core::Movie::GetInstance().Shutdown();
if (was_recording) {
QMessageBox::information(this, tr("Movie Saved"),
@ -1986,14 +1987,19 @@ void GMainWindow::UpdateStatusBar() {
// Update movie status
const u64 current = Core::Movie::GetInstance().GetCurrentInputIndex();
const u64 total = Core::Movie::GetInstance().GetTotalInputCount();
if (Core::Movie::GetInstance().IsRecordingInput()) {
const auto play_mode = Core::Movie::GetInstance().GetPlayMode();
if (play_mode == Core::Movie::PlayMode::Recording) {
message_label->setText(tr("Recording %1").arg(current));
message_label->setVisible(true);
message_label_used_for_movie = true;
} else if (Core::Movie::GetInstance().IsPlayingInput()) {
} else if (play_mode == Core::Movie::PlayMode::Playing) {
message_label->setText(tr("Playing %1 / %2").arg(current).arg(total));
message_label->setVisible(true);
message_label_used_for_movie = true;
} else if (play_mode == Core::Movie::PlayMode::MovieFinished) {
message_label->setText(tr("Movie Finished"));
message_label->setVisible(true);
message_label_used_for_movie = true;
} else if (message_label_used_for_movie) { // Clear the label if movie was just closed
message_label->setText(QString{});
message_label->setVisible(false);
@ -2291,7 +2297,6 @@ void GMainWindow::OnLanguageChanged(const QString& locale) {
void GMainWindow::OnMoviePlaybackCompleted() {
QMessageBox::information(this, tr("Playback Completed"), tr("Movie playback completed."));
ui->action_Close_Movie->setEnabled(false);
}
void GMainWindow::UpdateWindowTitle() {