Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

movie: Add clock init time to CTM header #4267

Merged
merged 2 commits into from Oct 5, 2018

Conversation

Projects
None yet
3 participants
@zhaowenlan1779
Copy link
Member

zhaowenlan1779 commented Sep 26, 2018

This adds a clock init time field to the CTM header. The clock settings would be overridden when playing a movie. And when recording a movie, if the clock is set to System Time, it would be set to fixed init time at the current moment as well. In this way this keeps consistency with the RNG even if the user does just no setting.


This change is Reviewable

@zhaowenlan1779 zhaowenlan1779 force-pushed the zhaowenlan1779:movie branch from 3dfb346 to eb0e389 Sep 26, 2018

movie: Add clock init time to CTM header
This adds a clock init time field to the CTM header. The clock settings would be overridden when playing a movie. And when recording a movie, if the clock is set to System Time, it would be set to fixed init time at the current moment as well. In this way this keeps consistency with the RNG even if the user does just no setting.

@zhaowenlan1779 zhaowenlan1779 force-pushed the zhaowenlan1779:movie branch from eb0e389 to ae5c658 Sep 27, 2018

@InfamousKnight

This comment has been minimized.

Copy link

InfamousKnight commented Sep 28, 2018

Nice! Has frame advance been added yet? Could be useful for segmented runs while save states are unavailable.

@@ -332,7 +339,7 @@ int main(int argc, char** argv) {
}

if (!movie_play.empty()) {
Core::Movie::GetInstance().StartPlayback(movie_play);
Core::Movie::GetInstance().StartPlayback(movie_play, [] {});

This comment has been minimized.

Copy link
@wwylele

wwylele Sep 30, 2018

Member

You should change the default param for StartPlayback or its internal logic if the current default isn't a meaningful value.

This comment has been minimized.

Copy link
@zhaowenlan1779
@wwylele

wwylele approved these changes Oct 4, 2018

@zhaowenlan1779

This comment has been minimized.

Copy link
Member Author

zhaowenlan1779 commented Oct 5, 2018

I'll merge this in 6 hours if no more comments.

@zhaowenlan1779 zhaowenlan1779 merged commit 2a90426 into citra-emu:master Oct 5, 2018

1 of 2 checks passed

continuous-integration/appveyor/pr AppVeyor build failed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@zhaowenlan1779 zhaowenlan1779 deleted the zhaowenlan1779:movie branch Oct 5, 2018

sickc added a commit to sickc/citra that referenced this pull request Oct 8, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.