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

Play Movie - fixes so that .mc2 & .fm2 get the right system ID on load, and fix the rounding of the fractional part of the movie time

This commit is contained in:
andres.delikat 2011-05-15 23:25:25 +00:00
parent 229852d06c
commit a91e7007a7
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.MultiClient/PlayMovie.cs
View File

@ -101,6 +101,10 @@ namespace BizHawk.MultiClient
Movie m = new Movie(path.FullName, MOVIEMODE.INACTIVE); Movie m = new Movie(path.FullName, MOVIEMODE.INACTIVE);
//m.PreLoadText(); //m.PreLoadText();
m.LoadMovie(); m.LoadMovie();
if (path.Extension.ToUpper() == ".FM2")
m.SetHeaderLine(MovieHeader.PLATFORM, "NES");
else if (path.Extension.ToUpper() == ".MC2")
m.SetHeaderLine(MovieHeader.PLATFORM, "PCE");
MovieList.Add(m); MovieList.Add(m);
} }

10
BizHawk.MultiClient/movie/Movie.cs
View File

@ -331,9 +331,9 @@ namespace BizHawk.MultiClient
MovieMode = MOVIEMODE.FINISHED; MovieMode = MOVIEMODE.FINISHED;
} }
public bool SetHeaderLine(string key, string value) public void SetHeaderLine(string key, string value)
{ {
return Header.SetHeaderLine(key, value); Header.SetHeaderLine(key, value);
} }
public string GetTime() public string GetTime()
@ -346,7 +346,7 @@ namespace BizHawk.MultiClient
if (hours > 0) if (hours > 0)
time += MakeDigits(hours) + ":"; time += MakeDigits(hours) + ":";
time += MakeDigits(minutes) + ":"; time += MakeDigits(minutes) + ":";
time += Math.Round(sec, 2).ToString(); time += Math.Round((decimal)sec, 2).ToString();
return time; return time;
} }
@ -369,7 +369,7 @@ namespace BizHawk.MultiClient
private double GetSeconds() private double GetSeconds()
{ {
const double NES_PAL = 50.006977968268290849; const double NES_PAL = 50.006977968268290849;
const double NES_NTSC = 60.098813897440515532; const double NES_NTSC = (double)60.098813897440515532;
const double PCE_PAL = 50.0; //TODO ? const double PCE_PAL = 50.0; //TODO ?
const double PCE_NTSC = (7159090.90909090 / 455 / 263); //~59.826 const double PCE_NTSC = (7159090.90909090 / 455 / 263); //~59.826
const double SMS_PAL = 60.0; const double SMS_PAL = 60.0;
@ -383,7 +383,7 @@ namespace BizHawk.MultiClient
const double LYNX = 59.8; const double LYNX = 59.8;
const double WSWAN = (3072000.0 / (159 * 256)); const double WSWAN = (3072000.0 / (159 * 256));
double seconds = 0; double seconds = 0;
double frames = Log.Length(); double frames = (double)Log.Length();
if (frames < 1) if (frames < 1)
return seconds; return seconds;

8
BizHawk.MultiClient/movie/MovieHeader.cs
View File

@ -81,15 +81,9 @@ namespace BizHawk.MultiClient
return value; return value;
} }
public bool SetHeaderLine(string key, string value) public void SetHeaderLine(string key, string value)
{ {
string test = "";
if (!(HeaderParams.TryGetValue(test, out value)))
return false;
HeaderParams[key] = value; HeaderParams[key] = value;
return true;
} }
} }
} }