File -> MOvie -> Import movies menu item
This commit is contained in:
parent
e178f0449e
commit
5d44836c92
|
@ -671,6 +671,7 @@
|
||||||
<None Include="images\Bug.png" />
|
<None Include="images\Bug.png" />
|
||||||
<None Include="images\console32x32.png" />
|
<None Include="images\console32x32.png" />
|
||||||
<None Include="images\console16x16.png" />
|
<None Include="images\console16x16.png" />
|
||||||
|
<None Include="images\Import.png" />
|
||||||
<Content Include="images\logo.ico" />
|
<Content Include="images\logo.ico" />
|
||||||
<Content Include="output\gamedb.txt" />
|
<Content Include="output\gamedb.txt" />
|
||||||
<Content Include="output\gamedb_neshomebrew.txt" />
|
<Content Include="output\gamedb_neshomebrew.txt" />
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -2477,5 +2477,42 @@ namespace BizHawk.MultiClient
|
||||||
RamPoke r = new RamPoke();
|
RamPoke r = new RamPoke();
|
||||||
r.Show();
|
r.Show();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void importMovieToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
var ofd = new OpenFileDialog();
|
||||||
|
ofd.InitialDirectory = PathManager.GetRomsPath(Global.Emulator.SystemId);
|
||||||
|
ofd.Multiselect = true;
|
||||||
|
ofd.Filter = FormatFilter(
|
||||||
|
"Movie Files", "*.fm2;*.mc2;*.mmv;*.fmv;",
|
||||||
|
"FCEUX", "*.fm2",
|
||||||
|
"PCEjin", "*.mc2",
|
||||||
|
"Dega", "*mmv",
|
||||||
|
"Famtasia", "*fmv",
|
||||||
|
"All Files", "*.*");
|
||||||
|
|
||||||
|
ofd.RestoreDirectory = false;
|
||||||
|
|
||||||
|
Global.Sound.StopSound();
|
||||||
|
var result = ofd.ShowDialog();
|
||||||
|
Global.Sound.StartSound();
|
||||||
|
if (result != DialogResult.OK)
|
||||||
|
return;
|
||||||
|
|
||||||
|
foreach (string fn in ofd.FileNames)
|
||||||
|
{
|
||||||
|
var file = new FileInfo(fn);
|
||||||
|
|
||||||
|
string errorMsg = "";
|
||||||
|
string warningMsg = "";
|
||||||
|
Movie m = MovieImport.ImportFile(fn, out errorMsg, out warningMsg);
|
||||||
|
if (errorMsg.Length > 0)
|
||||||
|
MessageBox.Show(errorMsg, "Conversion error", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||||
|
if (warningMsg.Length > 0)
|
||||||
|
Global.RenderPanel.AddMessage(warningMsg);
|
||||||
|
else
|
||||||
|
Global.RenderPanel.AddMessage(Path.GetFileName(fn) + " imported as .tas");
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -1,7 +1,7 @@
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// This code was generated by a tool.
|
// This code was generated by a tool.
|
||||||
// Runtime Version:4.0.30319.239
|
// Runtime Version:4.0.30319.261
|
||||||
//
|
//
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
// Changes to this file may cause incorrect behavior and will be lost if
|
||||||
// the code is regenerated.
|
// the code is regenerated.
|
||||||
|
@ -326,6 +326,13 @@ namespace BizHawk.MultiClient.Properties {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
internal static System.Drawing.Bitmap Import {
|
||||||
|
get {
|
||||||
|
object obj = ResourceManager.GetObject("Import", resourceCulture);
|
||||||
|
return ((System.Drawing.Bitmap)(obj));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
internal static System.Drawing.Bitmap InsertSeparator {
|
internal static System.Drawing.Bitmap InsertSeparator {
|
||||||
get {
|
get {
|
||||||
object obj = ResourceManager.GetObject("InsertSeparator", resourceCulture);
|
object obj = ResourceManager.GetObject("InsertSeparator", resourceCulture);
|
||||||
|
|
|
@ -810,4 +810,7 @@
|
||||||
<data name="console32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="console32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\images\console32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\images\console32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="Import" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\images\Import.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
Binary file not shown.
After Width: | Height: | Size: 733 B |
Loading…
Reference in New Issue