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

Play Movie - fix browse button and drag & drop

This commit is contained in:
adelikat 2012-06-09 16:28:01 +00:00
parent 0eae1a07fc
commit 45fb9571eb
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
BizHawk.MultiClient/PlayMovie.cs
View File

@ -95,7 +95,7 @@ namespace BizHawk.MultiClient
} }
} }
int x = AddMovieToList(ofd.FileName); int x = AddMovieToList(ofd.FileName, true);
if (x > 0) if (x > 0)
{ {
MovieView.SelectedIndices.Clear(); MovieView.SelectedIndices.Clear();
@ -132,7 +132,7 @@ namespace BizHawk.MultiClient
} }
} }
private int AddMovieToList(string filename) private int AddMovieToList(string filename, bool force)
{ {
using (var file = new HawkFile(filename)) using (var file = new HawkFile(filename))
{ {
@ -143,7 +143,7 @@ namespace BizHawk.MultiClient
int x = IsDuplicate(filename); int x = IsDuplicate(filename);
if (x == 0) if (x == 0)
{ {
PreLoadMovieFile(file); PreLoadMovieFile(file, force);
MovieView.ItemCount = MovieList.Count; MovieView.ItemCount = MovieList.Count;
UpdateList(); UpdateList();
@ -164,7 +164,7 @@ namespace BizHawk.MultiClient
return 0; return 0;
} }
private void PreLoadMovieFile(HawkFile path) private void PreLoadMovieFile(HawkFile path, bool force)
{ {
Movie m = new Movie(path.CanonicalFullPath, MOVIEMODE.INACTIVE); Movie m = new Movie(path.CanonicalFullPath, MOVIEMODE.INACTIVE);
m.PreLoadText(); m.PreLoadText();
@ -172,9 +172,9 @@ namespace BizHawk.MultiClient
m.Header.SetHeaderLine(MovieHeader.PLATFORM, "NES"); m.Header.SetHeaderLine(MovieHeader.PLATFORM, "NES");
else if (path.Extension == ".MC2") else if (path.Extension == ".MC2")
m.Header.SetHeaderLine(MovieHeader.PLATFORM, "PCE"); m.Header.SetHeaderLine(MovieHeader.PLATFORM, "PCE");
//Don't do this from browse
if (m.Header.GetHeaderLine(MovieHeader.GAMENAME) == Global.Game.Name || if (m.Header.GetHeaderLine(MovieHeader.GAMENAME) == Global.Game.Name ||
Global.Config.PlayMovie_MatchGameName == false) Global.Config.PlayMovie_MatchGameName == false || force)
MovieList.Add(m); MovieList.Add(m);
} }
@ -269,11 +269,11 @@ namespace BizHawk.MultiClient
Directory.CreateDirectory(d); Directory.CreateDirectory(d);
string extension = "*." + Global.Config.MovieExtension; string extension = "*." + Global.Config.MovieExtension;
foreach (string f in Directory.GetFiles(d, "*." + Global.Config.MovieExtension)) foreach (string f in Directory.GetFiles(d, "*." + Global.Config.MovieExtension))
AddMovieToList(f); AddMovieToList(f, false);
foreach (string f in Directory.GetFiles(d, "*.tas")) foreach (string f in Directory.GetFiles(d, "*.tas"))
AddMovieToList(f); AddMovieToList(f, false);
foreach (string f in Directory.GetFiles(d, "*.bkm")) foreach (string f in Directory.GetFiles(d, "*.bkm"))
AddMovieToList(f); AddMovieToList(f, false);
if (Global.Config.PlayMovie_ShowStateFiles) if (Global.Config.PlayMovie_ShowStateFiles)
{ {
foreach (string f in Directory.GetFiles(d, "*.state")) foreach (string f in Directory.GetFiles(d, "*.state"))
@ -286,7 +286,7 @@ namespace BizHawk.MultiClient
foreach (string dir in subs) foreach (string dir in subs)
{ {
foreach (string f in Directory.GetFiles(dir, "*." + Global.Config.MovieExtension)) foreach (string f in Directory.GetFiles(dir, "*." + Global.Config.MovieExtension))
AddMovieToList(f); AddMovieToList(f, false);
if (Global.Config.PlayMovie_ShowStateFiles) if (Global.Config.PlayMovie_ShowStateFiles)
{ {
foreach (string f in Directory.GetFiles(d, "*.state")) foreach (string f in Directory.GetFiles(d, "*.state"))
@ -407,7 +407,7 @@ namespace BizHawk.MultiClient
foreach (string path in filePaths) foreach (string path in filePaths)
{ {
if (Path.GetExtension(path) == "." + Global.Config.MovieExtension) if (Path.GetExtension(path) == "." + Global.Config.MovieExtension)
AddMovieToList(path); AddMovieToList(path, true);
} }
} }