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

Remove Fps from IMovie

This commit is contained in:
adelikat 2014-06-29 00:48:36 +00:00
parent d12a16db45
commit 055e88fea3
5 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BizHawk.Client.Common/lua/EmuLuaLibrary.Movie.cs
View File

@ -165,7 +165,12 @@ namespace BizHawk.Client.Common
{ {
if (Global.MovieSession.Movie.IsActive) if (Global.MovieSession.Movie.IsActive)
{ {
return Global.MovieSession.Movie.Fps; var movie = Global.MovieSession.Movie;
var system = movie.HeaderEntries[HeaderKeys.PLATFORM];
var pal = movie.HeaderEntries.ContainsKey(HeaderKeys.PAL) &&
movie.HeaderEntries[HeaderKeys.PAL] == "1";
return new PlatformFrameRates()[system, pal];
} }
return 0.0; return 0.0;

2
BizHawk.Client.Common/movie/bk2/Bk2Movie.cs
View File

@ -60,7 +60,7 @@ namespace BizHawk.Client.Common
} }
} }
public double Fps private double Fps
{ {
get get
{ {

2
BizHawk.Client.Common/movie/bkm/BkmMovie.cs
View File

@ -73,7 +73,7 @@ namespace BizHawk.Client.Common
get { return _changes; } get { return _changes; }
} }
public double Fps private double Fps
{ {
get get
{ {

5
BizHawk.Client.Common/movie/interfaces/IMovie.cs
View File

@ -29,11 +29,6 @@ namespace BizHawk.Client.Common
/// Possibly (but unlikely different from InputLogLength (could be infinity, or maybe an implementation automatically discounts empty frames at the end of a movie, etc) /// Possibly (but unlikely different from InputLogLength (could be infinity, or maybe an implementation automatically discounts empty frames at the end of a movie, etc)
/// </summary> /// </summary>
double FrameCount { get; } double FrameCount { get; }
/// <summary>
/// Gets the Fps used to calculate the time of the movie
/// </summary>
double Fps { get; }
/// <summary> /// <summary>
/// Gets the time calculation based on FrameCount and Fps /// Gets the time calculation based on FrameCount and Fps

12
BizHawk.Client.EmuHawk/movie/PlayMovie.cs
View File

@ -481,7 +481,7 @@ namespace BizHawk.Client.EmuHawk
} }
var FpsItem = new ListViewItem("Fps"); var FpsItem = new ListViewItem("Fps");
FpsItem.SubItems.Add(string.Format("{0:0.#######}", _movieList[firstIndex].Fps)); FpsItem.SubItems.Add(string.Format("{0:0.#######}", Fps(_movieList[firstIndex])));
DetailsView.Items.Add(FpsItem); DetailsView.Items.Add(FpsItem);
var FramesItem = new ListViewItem("Frames"); var FramesItem = new ListViewItem("Frames");
@ -491,6 +491,16 @@ namespace BizHawk.Client.EmuHawk
SubtitlesBtn.Enabled = _movieList[firstIndex].Subtitles.Any(); SubtitlesBtn.Enabled = _movieList[firstIndex].Subtitles.Any();
} }
public double Fps(IMovie movie)
{
var system = movie.HeaderEntries[HeaderKeys.PLATFORM];
var pal = movie.HeaderEntries.ContainsKey(HeaderKeys.PAL) &&
movie.HeaderEntries[HeaderKeys.PAL] == "1";
return new PlatformFrameRates()[system, pal];
}
private void EditMenuItem_Click(object sender, EventArgs e) private void EditMenuItem_Click(object sender, EventArgs e)
{ {
MovieView.SelectedIndices MovieView.SelectedIndices