Update Mednafen to 1.23.0

OpenEmu · Oct 23, 2019 · 4e7e67c · 4e7e67c
1 parent 2deb975
commit 4e7e67c
Show file tree

Hide file tree

Showing 126 changed files with 15,249 additions and 3,249 deletions.
diff --git a/Info.plist b/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.22.2</string>
+	<string>1.23.0</string>
 	<key>NSPrincipalClass</key>
 	<string>OEGameCoreController</string>
 	<key>OEGameCoreClass</key>

diff --git a/Mednafen.xcodeproj/project.pbxproj b/Mednafen.xcodeproj/project.pbxproj
@@ -4747,9 +4747,9 @@
 				OTHER_CFLAGS = (
 					"-fwrapv",
 					"-DHAVE_MKDIR",
-					"-DMEDNAFEN_VERSION=\\\"1.22.2\\\"",
+					"-DMEDNAFEN_VERSION=\\\"1.23.0-UNSTABLE\\\"",
 					"-DPACKAGE=\\\"mednafen\\\"",
-					"-DMEDNAFEN_VERSION_NUMERIC=0x00102202",
+					"-DMEDNAFEN_VERSION_NUMERIC=0x00102300",
 					"-DPSS_STYLE=1",
 					"-DMPC_FIXED_POINT",
 					"-DARCH_X86",
@@ -4813,9 +4813,9 @@
 				OTHER_CFLAGS = (
 					"-fwrapv",
 					"-DHAVE_MKDIR",
-					"-DMEDNAFEN_VERSION=\\\"1.22.2\\\"",
+					"-DMEDNAFEN_VERSION=\\\"1.23.0-UNSTABLE\\\"",
 					"-DPACKAGE=\\\"mednafen\\\"",
-					"-DMEDNAFEN_VERSION_NUMERIC=0x00102202",
+					"-DMEDNAFEN_VERSION_NUMERIC=0x00102300",
 					"-DPSS_STYLE=1",
 					"-DMPC_FIXED_POINT",
 					"-DARCH_X86",

diff --git a/mednafen/Makefile.in b/mednafen/Makefile.in
diff --git a/mednafen/apple2/apple2.cpp b/mednafen/apple2/apple2.cpp
@@ -2,7 +2,7 @@
 /* Mednafen Apple II Emulation Module                                         */
 /******************************************************************************/
 /* apple2.cpp:
-**  Copyright (C) 2018 Mednafen Team
+**  Copyright (C) 2018-2019 Mednafen Team
 **
 ** This program is free software; you can redistribute it and/or
 ** modify it under the terms of the GNU General Public License
@@ -493,6 +493,8 @@ static void Emulate(EmulateSpecStruct* espec)
   s.mono_lumafilter = MDFN_GetSettingI("apple2.video.mono_lumafilter");
   s.color_lumafilter = MDFN_GetSettingI("apple2.video.color_lumafilter");
 
+  s.mode = MDFN_GetSettingUI("apple2.video.mode");
+
   s.matrix = MDFN_GetSettingUI("apple2.video.matrix");
 
   for(unsigned cc_i = 0; cc_i < 3; cc_i++) 
@@ -512,7 +514,7 @@ static void Emulate(EmulateSpecStruct* espec)
   //
   //
   //
-  Video::SetFormat(surface->format, s);
+  Video::SetFormat(surface->format, s, espec->CustomPalette, espec->CustomPaletteNumEntries);
   //
   VideoSettingChanged = false;
  }
@@ -521,11 +523,7 @@ static void Emulate(EmulateSpecStruct* espec)
   Sound::SetParams(espec->SoundRate, 0.00004, 3);
  //
  Video::surface = espec->surface;
-
- espec->DisplayRect.x = 0;
- espec->DisplayRect.y = 0;
- espec->DisplayRect.w = 560 + 12*2;
- espec->DisplayRect.h = 192;
+ espec->DisplayRect = Video::surface_dr;
 
  MDFNMP_ApplyPeriodicCheats();
 
@@ -1678,6 +1676,16 @@ static const MDFNSetting_EnumList Matrix_List[] =
  { nullptr, 0 },
 };
 
+static const MDFNSetting_EnumList Mode_List[] =
+{
+ { "composite", Video::Settings::MODE_COMPOSITE, "Composite", gettext_noop("Internal video dimensions of 584x192.") },
+ { "rgb", Video::Settings::MODE_RGB, "RGB", gettext_noop("Internal video dimensions of 292x192; suitable for use with scalers like hq2x.") },
+ { "rgb_alt1", Video::Settings::MODE_RGB_ALT1, "RGB (alternate algorithm 1)", gettext_noop("Internal video dimensions of 584x192.") },
+ { "rgb_alt2", Video::Settings::MODE_RGB_ALT2, "RGB (alternate algorithm 2)", gettext_noop("Internal video dimensions of 584x192.") },
+
+ { nullptr, 0 }
+};
+
 static const MDFNSetting Settings[] =
 {
  { "apple2.video.hue",		MDFNSF_CAT_VIDEO, gettext_noop("Color video hue/tint."),   nullptr, MDFNST_FLOAT, "0.0", "-1.0", "1.0", nullptr, VideoChangeNotif },
@@ -1701,6 +1709,8 @@ static const MDFNSetting Settings[] =
  { "apple2.video.matrix.blue.i", MDFNSF_CAT_VIDEO, gettext_noop("Custom color decoder matrix; blue, I."), gettext_noop("Only used if \"apple2.video.matrix\" is set to \"custom\"."), MDFNST_FLOAT, "-1.11", "-4.00", "4.00", nullptr, VideoChangeNotif  },
  { "apple2.video.matrix.blue.q", MDFNSF_CAT_VIDEO, gettext_noop("Custom color decoder matrix; blue, Q."), gettext_noop("Only used if \"apple2.video.matrix\" is set to \"custom\"."), MDFNST_FLOAT, "1.70", "-4.00", "4.00", nullptr, VideoChangeNotif  },
 
+ { "apple2.video.mode", MDFNSF_CAT_VIDEO, gettext_noop("Video rendering mode."), gettext_noop("When an RGB mode is enabled, settings \"apple2.video.force_mono\", \"apple2.video.mixed_text_mono\", \"apple2.video.mono_lumafilter\", \"apple2.video.color_lumafilter\", and \"apple2.video.color_smooth\" are effectively ignored."), MDFNST_ENUM, "composite", nullptr, nullptr, nullptr, VideoChangeNotif, Mode_List },
+
  { NULL },
 };
 
@@ -1731,6 +1741,13 @@ static const CheatInfoStruct CheatInfo =
  false
 };
 
+static const CustomPalette_Spec CPInfo[] =
+{
+ { gettext_noop("RGB mode 16-color palette.  The presence of a custom palette will automatically enable RGB video mode."), NULL, { 16, 0 } },
+
+ { NULL, NULL }
+};
+
 }
 
 using namespace MDFN_IEN_APPLE2;
@@ -1747,6 +1764,7 @@ MDFNGI EmulatedApple2 =
  NULL,
  //#endif
  A2PortInfo,
+ NULL,
  Load,
  TestMagic,
  nullptr,
@@ -1759,8 +1777,8 @@ MDFNGI EmulatedApple2 =
  nullptr,
  nullptr,
 
- nullptr,
- 0,
+ CPInfo,
+ 1,
 
  CheatInfo,