Version Update: 0.7.0

This commit is contained in:
Souryo 2016-12-30 18:32:45 -05:00
parent 146baad8d3
commit f468b0502b
11 changed files with 60 additions and 13 deletions

View file

@ -2,10 +2,10 @@
#include "EmulationSettings.h"
#include "VsControlManager.h"
//Version 0.6.1
//Version 0.7.0
uint16_t EmulationSettings::_versionMajor = 0;
uint8_t EmulationSettings::_versionMinor = 6;
uint8_t EmulationSettings::_versionRevision = 1;
uint8_t EmulationSettings::_versionMinor = 7;
uint8_t EmulationSettings::_versionRevision = 0;
Language EmulationSettings::_displayLanguage = Language::English;

View file

@ -13,7 +13,7 @@ namespace Mesen.GUI.Config
private const int MaxRecentFiles = 10;
private bool _needToSave = false;
public string MesenVersion = "0.6.1";
public string MesenVersion = "0.7.0";
public PreferenceInfo PreferenceInfo;
public AudioInfo AudioInfo;
public VideoInfo VideoInfo;

View file

@ -450,7 +450,7 @@
<Control ID="labelCopyright">© 2016 M. Bibaud (aka Sour)</Control>
<Control ID="lblWebsite">Sitio web:</Control>
<Control ID="lblLink">www.mesen.ca</Control>
<Control ID="labelVersion">Versión: 0.6.1 (Beta)</Control>
<Control ID="labelVersion">Versión: 0.7.0 (Beta)</Control>
<Control ID="lblDonate">Si deseas colaborar con Mesen, por favor considera hacer una donación.&#xA;¡Gracias por tu colaboración!</Control>
<Control ID="okButton">&amp;OK</Control>
</Form>

View file

@ -463,7 +463,7 @@
<Control ID="labelCopyright">© 2016 M. Bibaud (aka Sour)</Control>
<Control ID="lblWebsite">Site web:</Control>
<Control ID="lblLink">www.mesen.ca</Control>
<Control ID="labelVersion">Version: 0.6.1 (Beta)</Control>
<Control ID="labelVersion">Version: 0.7.0 (Beta)</Control>
<Control ID="lblDonate">Si vous voulez supporter le développement de Mesen, vous pouvez faire une donation. Merci de votre support!</Control>
<Control ID="okButton">&amp;OK</Control>
</Form>

View file

@ -450,7 +450,7 @@
<Control ID="labelCopyright">© 2016 M. Bibaud (aka Sour)</Control>
<Control ID="lblWebsite">サイト:</Control>
<Control ID="lblLink">www.mesen.ca</Control>
<Control ID="labelVersion">バージョン: 0.6.1 (ベータ版)</Control>
<Control ID="labelVersion">バージョン: 0.7.0 (ベータ版)</Control>
<Control ID="lblDonate">応援ありがとうございます!</Control>
<Control ID="okButton">&amp;OK</Control>
</Form>

View file

@ -450,7 +450,7 @@
<Control ID="labelCopyright">© 2016 M. Bibaud (aka Sour)</Control>
<Control ID="lblWebsite">Site:</Control>
<Control ID="lblLink">www.mesen.ca</Control>
<Control ID="labelVersion">Versão: 0.6.1 (Beta)</Control>
<Control ID="labelVersion">Versão: 0.7.0 (Beta)</Control>
<Control ID="lblDonate">Caso queira apoiar Mesen, por favor considere fazer uma doação ao projeto.&#xA;Obrigado pelo seu apoio!</Control>
<Control ID="okButton">&amp;OK</Control>
</Form>

View file

@ -454,7 +454,7 @@
<Control ID="labelCopyright">© 2016 M. Bibaud (aka Sour)</Control>
<Control ID="lblWebsite">Сайт:</Control>
<Control ID="lblLink">www.mesen.ca</Control>
<Control ID="labelVersion">Версия: 0.6.1 (Beta)</Control>
<Control ID="labelVersion">Версия: 0.7.0 (Beta)</Control>
<Control ID="lblDonate">If you want to support Mesen, please consider donating.&#xA;Thank you for your support!</Control>
<Control ID="okButton">&amp;OK</Control>
</Form>

View file

@ -453,7 +453,7 @@
<Control ID="labelCopyright">© 2016 M. Bibaud (aka Sour)</Control>
<Control ID="lblWebsite">Сайт:</Control>
<Control ID="lblLink">www.mesen.ca</Control>
<Control ID="labelVersion">Версiя: 0.6.1 (Beta)</Control>
<Control ID="labelVersion">Версiя: 0.7.0 (Beta)</Control>
<Control ID="lblDonate">If you want to support Mesen, please consider donating.&#xA;Thank you for your support!</Control>
<Control ID="okButton">&amp;OK</Control>
</Form>

View file

@ -152,7 +152,7 @@
this.labelVersion.Name = "labelVersion";
this.labelVersion.Size = new System.Drawing.Size(146, 17);
this.labelVersion.TabIndex = 0;
this.labelVersion.Text = "Version: 0.6.1 (Beta)";
this.labelVersion.Text = "Version: 0.7.0 (Beta)";
this.labelVersion.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// okButton

View file

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.6.1.0")]
[assembly: AssemblyFileVersion("0.6.1.0")]
[assembly: AssemblyVersion("0.7.0.0")]
[assembly: AssemblyFileVersion("0.7.0.0")]

View file

@ -3,7 +3,36 @@
#include <vector>
#include <string>
enum class VideoFilterType
{
None = 0,
NTSC = 1,
BisqwitNtscQuarterRes = 2,
BisqwitNtscHalfRes = 3,
BisqwitNtsc = 4,
xBRZ2x = 5,
xBRZ3x = 6,
xBRZ4x = 7,
xBRZ5x = 8,
xBRZ6x = 9,
HQ2x = 10,
HQ3x = 11,
HQ4x = 12,
Scale2x = 13,
Scale3x = 14,
Scale4x = 15,
_2xSai = 16,
Super2xSai = 17,
SuperEagle = 18,
Prescale2x = 19,
Prescale3x = 20,
Prescale4x = 21,
HdPack = 999
};
extern "C" {
void __stdcall SetVideoFilter(VideoFilterType filter);
void __stdcall InitializeEmu(char* homeFolder, void*, void*, bool, bool, bool);
void __stdcall LoadROM(const char* filename, int32_t archiveFileIndex, char* ipsFile);
void __stdcall Run();
@ -35,10 +64,28 @@ int main(int argc, char* argv[])
InitializeEmu("C:\\Windows\\Temp\\Mesen", nullptr, nullptr, false, false, false);
LoadROM(testRoms[0], -1, "");
std::cout << "Running: " << testRoms[0] << std::endl;
thread testThread([testRoms] {
VideoFilterType filterTypes[13] = {
VideoFilterType::BisqwitNtscQuarterRes,
VideoFilterType::HQ2x,
VideoFilterType::HQ3x,
VideoFilterType::HQ4x,
VideoFilterType::NTSC,
VideoFilterType::Scale2x,
VideoFilterType::Scale3x,
VideoFilterType::Scale4x,
VideoFilterType::xBRZ2x,
VideoFilterType::xBRZ3x,
VideoFilterType::xBRZ4x,
VideoFilterType::xBRZ5x,
VideoFilterType::xBRZ6x,
};
for(size_t i = 1; i < testRoms.size(); i++) {
std::this_thread::sleep_for(std::chrono::duration<int, std::milli>(5000));
std::cout << "Running: " << testRoms[i] << std::endl;
SetVideoFilter(filterTypes[i % 13]);
LoadROM(testRoms[i], -1, "");
}
std::this_thread::sleep_for(std::chrono::duration<int, std::milli>(5000));