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

when loading a movie via commandline, check for importable movie types and import them

This commit is contained in:
adelikat 2015-08-01 10:55:19 -04:00
parent ad821c90d5
commit f487a1f937
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -330,7 +330,9 @@ namespace BizHawk.Client.EmuHawk
{ {
OpenRom(); OpenRom();
} }
else
// If user picked a game, then do the commandline logic
if (!Global.Game.IsNullInstance)
{ {
var movie = MovieService.Get(cmdMovie); var movie = MovieService.Get(cmdMovie);
Global.MovieSession.ReadOnly = true; Global.MovieSession.ReadOnly = true;
@ -341,8 +343,31 @@ namespace BizHawk.Client.EmuHawk
_autoDumpLength = movie.InputLogLength; _autoDumpLength = movie.InputLogLength;
} }
StartNewMovie(movie, false); // Copy pasta from drag & drop
Global.Config.RecentMovies.Add(cmdMovie); string errorMsg;
string warningMsg;
if (MovieImport.IsValidMovieExtension(Path.GetExtension(cmdMovie)))
{
var imported = MovieImport.ImportFile(cmdMovie, out errorMsg, out warningMsg);
if (!string.IsNullOrEmpty(errorMsg))
{
MessageBox.Show(errorMsg, "Conversion error", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
else
{
// fix movie extension to something palatable for these purposes.
// for instance, something which doesnt clobber movies you already may have had.
// i'm evenly torn between this, and a file in %TEMP%, but since we dont really have a way to clean up this tempfile, i choose this:
StartNewMovie(imported, false);
}
GlobalWin.OSD.AddMessage(warningMsg);
}
else
{
StartNewMovie(movie, false);
Global.Config.RecentMovies.Add(cmdMovie);
}
} }
} }
else if (Global.Config.RecentMovies.AutoLoad && !Global.Config.RecentMovies.Empty) else if (Global.Config.RecentMovies.AutoLoad && !Global.Config.RecentMovies.Empty)