ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix non-bk2 movie loading

This commit is contained in:
adelikat 2014-06-19 01:47:22 +00:00
parent 19feaaa3ba
commit ac2ea9f6e0
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Client.Common/movie/MovieService.cs
View File

@ -31,8 +31,8 @@ namespace BizHawk.Client.Common
if (VersionInfo.DeveloperBuild) if (VersionInfo.DeveloperBuild)
{ {
movie.Load(); //movie.Load();
return movie.ToBk2(); return movie; //.ToBk2();
} }
else else
{ {

2
BizHawk.Client.Common/movie/MovieSession.cs
View File

@ -18,7 +18,7 @@ namespace BizHawk.Client.Common
} }
public MultitrackRecording MultiTrack { get { return _multiTrack; } } public MultitrackRecording MultiTrack { get { return _multiTrack; } }
public IMovieController MovieControllerAdapter { get; private set; } public IMovieController MovieControllerAdapter{ get; set; }
public IMovie Movie { get; set; } public IMovie Movie { get; set; }
public bool ReadOnly { get; set; } public bool ReadOnly { get; set; }

1
BizHawk.Client.EmuHawk/MainForm.Movie.cs
View File

@ -25,6 +25,7 @@ namespace BizHawk.Client.EmuHawk
Global.MovieSession = new MovieSession Global.MovieSession = new MovieSession
{ {
Movie = movie, Movie = movie,
MovieControllerAdapter = movie.LogGeneratorInstance().MovieControllerAdapter,
MessageCallback = GlobalWin.OSD.AddMessage, MessageCallback = GlobalWin.OSD.AddMessage,
AskYesNoCallback = StateErrorAskUser AskYesNoCallback = StateErrorAskUser
}; };

1
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -79,6 +79,7 @@ namespace BizHawk.Client.EmuHawk
Global.MovieSession = new MovieSession Global.MovieSession = new MovieSession
{ {
Movie = MovieService.DefaultInstance, Movie = MovieService.DefaultInstance,
MovieControllerAdapter = MovieService.DefaultInstance.LogGeneratorInstance().MovieControllerAdapter,
MessageCallback = GlobalWin.OSD.AddMessage, MessageCallback = GlobalWin.OSD.AddMessage,
AskYesNoCallback = StateErrorAskUser AskYesNoCallback = StateErrorAskUser
}; };