Update Mednafen to 1.22.1

Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.22.0</string>
+	<string>1.22.1</string>
 	<key>NSPrincipalClass</key>
 	<string>OEGameCoreController</string>
 	<key>OEGameCoreClass</key>

Mednafen.xcodeproj/project.pbxproj

@@ -64,6 +64,7 @@
 		872FC2D622A9790F00AF67DE /* SwiftResampler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 872FC2D522A9790E00AF67DE /* SwiftResampler.cpp */; };
 		872FC2E022A97A9C00AF67DE /* Deinterlacer_Simple.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 872FC2DE22A97A9B00AF67DE /* Deinterlacer_Simple.cpp */; };
 		872FC2E122A97A9C00AF67DE /* Deinterlacer_Blend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 872FC2DF22A97A9C00AF67DE /* Deinterlacer_Blend.cpp */; };
+		872FC2F222A981DB00AF67DE /* idct.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 872FC2F022A981DA00AF67DE /* idct.cpp */; };
 		8759F08E1F5673F3009CBC01 /* ar4mp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8759F08C1F5673F3009CBC01 /* ar4mp.cpp */; };
 		877661671E772FC1009252B0 /* keyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 877661631E772FC1009252B0 /* keyboard.cpp */; };
 		877661681E772FC1009252B0 /* mission.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 877661651E772FC1009252B0 /* mission.cpp */; };
@@ -134,7 +135,6 @@
 		8CB3DE7717F1DE5E0090372A /* mouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CB3D84F17F1DE5C0090372A /* mouse.cpp */; };
 		8CB3DE7817F1DE5E0090372A /* input.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CB3D85117F1DE5C0090372A /* input.cpp */; };
 		8CB3DE7917F1DE5E0090372A /* interrupt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CB3D85317F1DE5C0090372A /* interrupt.cpp */; };
-		8CB3DE7B17F1DE5E0090372A /* jrevdct.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CB3D85617F1DE5C0090372A /* jrevdct.cpp */; };
 		8CB3DE7E17F1DE5E0090372A /* king.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CB3D85A17F1DE5C0090372A /* king.cpp */; };
 		8CB3DE8317F1DE5E0090372A /* pcfx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CB3D86017F1DE5C0090372A /* pcfx.cpp */; };
 		8CB3DE8417F1DE5E0090372A /* rainbow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CB3D86217F1DE5C0090372A /* rainbow.cpp */; };
@@ -466,6 +466,8 @@
 		872FC2ED22A97E9C00AF67DE /* disk2.inc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.pascal; path = disk2.inc; sourceTree = "<group>"; };
 		872FC2EE22A97E9C00AF67DE /* video.inc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.pascal; path = video.inc; sourceTree = "<group>"; };
 		872FC2EF22A97E9C00AF67DE /* apple2.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = apple2.cpp; sourceTree = "<group>"; };
+		872FC2F022A981DA00AF67DE /* idct.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = idct.cpp; sourceTree = "<group>"; };
+		872FC2F122A981DA00AF67DE /* idct.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = idct.h; sourceTree = "<group>"; };
 		8759F08C1F5673F3009CBC01 /* ar4mp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ar4mp.cpp; sourceTree = "<group>"; };
 		8759F08D1F5673F3009CBC01 /* ar4mp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ar4mp.h; sourceTree = "<group>"; };
 		877661631E772FC1009252B0 /* keyboard.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = keyboard.cpp; path = ss/input/keyboard.cpp; sourceTree = "<group>"; };
@@ -1164,8 +1166,6 @@
 		8CB3D85317F1DE5C0090372A /* interrupt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = interrupt.cpp; sourceTree = "<group>"; };
 		8CB3D85417F1DE5C0090372A /* interrupt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = interrupt.h; sourceTree = "<group>"; };
 		8CB3D85517F1DE5C0090372A /* io-handler.inc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; path = "io-handler.inc"; sourceTree = "<group>"; };
-		8CB3D85617F1DE5C0090372A /* jrevdct.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jrevdct.cpp; sourceTree = "<group>"; };
-		8CB3D85717F1DE5C0090372A /* jrevdct.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jrevdct.h; sourceTree = "<group>"; };
 		8CB3D85817F1DE5C0090372A /* king-bgfast-blit.inc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; path = "king-bgfast-blit.inc"; sourceTree = "<group>"; };
 		8CB3D85917F1DE5C0090372A /* king-bgfast.inc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; path = "king-bgfast.inc"; sourceTree = "<group>"; };
 		8CB3D85A17F1DE5C0090372A /* king.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = king.cpp; sourceTree = "<group>"; };
@@ -3150,14 +3150,14 @@
 				8CB3D84917F1DE5C0090372A /* gamedb.inc */,
 				8CB3D84A17F1DE5C0090372A /* huc6273.cpp */,
 				8CB3D84B17F1DE5C0090372A /* huc6273.h */,
+				872FC2F022A981DA00AF67DE /* idct.cpp */,
+				872FC2F122A981DA00AF67DE /* idct.h */,
 				8CB3D84C17F1DE5C0090372A /* input */,
 				8CB3D85117F1DE5C0090372A /* input.cpp */,
 				8CB3D85217F1DE5C0090372A /* input.h */,
 				8CB3D85317F1DE5C0090372A /* interrupt.cpp */,
 				8CB3D85417F1DE5C0090372A /* interrupt.h */,
 				8CB3D85517F1DE5C0090372A /* io-handler.inc */,
-				8CB3D85617F1DE5C0090372A /* jrevdct.cpp */,
-				8CB3D85717F1DE5C0090372A /* jrevdct.h */,
 				8CB3D85817F1DE5C0090372A /* king-bgfast-blit.inc */,
 				8CB3D85917F1DE5C0090372A /* king-bgfast.inc */,
 				8CB3D85A17F1DE5C0090372A /* king.cpp */,
@@ -4561,6 +4561,7 @@
 				8CB3DE9D17F1DE5E0090372A /* multitap.cpp in Sources */,
 				8CB3DD6417F1DE5E0090372A /* memmap.cpp in Sources */,
 				94CFB65B1A75DC7C001F174F /* state_rewind.cpp in Sources */,
+				872FC2F222A981DB00AF67DE /* idct.cpp in Sources */,
 				8CB3DD6017F1DE5E0090372A /* cart.cpp in Sources */,
 				8CB3DD6617F1DE5E0090372A /* ram.cpp in Sources */,
 				8CB3DD6517F1DE5E0090372A /* mikie.cpp in Sources */,
@@ -4633,7 +4634,6 @@
 				8CB3E04417F1DE5E0090372A /* floor1.c in Sources */,
 				8CB3E10C17F216B60090372A /* main.cpp in Sources */,
 				8CB3DD6817F1DE5E0090372A /* susie.cpp in Sources */,
-				8CB3DE7B17F1DE5E0090372A /* jrevdct.cpp in Sources */,
 				8CB3DE5717F1DE5E0090372A /* gamepad.cpp in Sources */,
 				8CB3E0F317F215C90090372A /* escape.cpp in Sources */,
 				8CB3E05D17F1DE5E0090372A /* input.cpp in Sources */,
@@ -4747,9 +4747,9 @@
 				OTHER_CFLAGS = (
 					"-fwrapv",
 					"-DHAVE_MKDIR",
-					"-DMEDNAFEN_VERSION=\\\"1.22.0-UNSTABLE\\\"",
+					"-DMEDNAFEN_VERSION=\\\"1.22.1\\\"",
 					"-DPACKAGE=\\\"mednafen\\\"",
-					"-DMEDNAFEN_VERSION_NUMERIC=0x00102200",
+					"-DMEDNAFEN_VERSION_NUMERIC=0x00102201",
 					"-DPSS_STYLE=1",
 					"-DMPC_FIXED_POINT",
 					"-DARCH_X86",
@@ -4777,6 +4777,8 @@
 					"-DSIZEOF_VOID_P=8",
 					"-DSIZEOF_DOUBLE=8",
 					"-DHAVE_LIBSNDFILE",
+					"-DHAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE_NP",
+					"-DMDFN_PCE_VCE_AWESOMEMODE",
 					"-mllvm",
 					"-disable-lsr",
 				);
@@ -4811,9 +4813,9 @@
 				OTHER_CFLAGS = (
 					"-fwrapv",
 					"-DHAVE_MKDIR",
-					"-DMEDNAFEN_VERSION=\\\"1.22.0-UNSTABLE\\\"",
+					"-DMEDNAFEN_VERSION=\\\"1.22.1\\\"",
 					"-DPACKAGE=\\\"mednafen\\\"",
-					"-DMEDNAFEN_VERSION_NUMERIC=0x00102200",
+					"-DMEDNAFEN_VERSION_NUMERIC=0x00102201",
 					"-DPSS_STYLE=1",
 					"-DMPC_FIXED_POINT",
 					"-DARCH_X86",
@@ -4841,6 +4843,8 @@
 					"-DSIZEOF_VOID_P=8",
 					"-DSIZEOF_DOUBLE=8",
 					"-DHAVE_LIBSNDFILE",
+					"-DHAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE_NP",
+					"-DMDFN_PCE_VCE_AWESOMEMODE",
 					"-mllvm",
 					"-disable-lsr",
 				);

mednafen/Makefile.in

@@ -233,7 +233,7 @@ DIST_COMMON = $(srcdir)/cdplay/Makefile.am.inc \
 @WANT_PCFX_EMU_TRUE@am__append_27 = pcfx/king.cpp pcfx/soundbox.cpp \
 @WANT_PCFX_EMU_TRUE@	pcfx/pcfx.cpp pcfx/interrupt.cpp \
 @WANT_PCFX_EMU_TRUE@	pcfx/input.cpp pcfx/timer.cpp \
-@WANT_PCFX_EMU_TRUE@	pcfx/rainbow.cpp pcfx/jrevdct.cpp \
+@WANT_PCFX_EMU_TRUE@	pcfx/rainbow.cpp pcfx/idct.cpp \
 @WANT_PCFX_EMU_TRUE@	pcfx/huc6273.cpp pcfx/fxscsi.cpp \
 @WANT_PCFX_EMU_TRUE@	pcfx/input/gamepad.cpp \
 @WANT_PCFX_EMU_TRUE@	pcfx/input/mouse.cpp
@@ -565,7 +565,7 @@ am__mednafen_SOURCES_DIST = debug.cpp error.cpp mempatcher.cpp \
 	pce_fast/hes.cpp pce_fast/pcecd.cpp pce_fast/pcecd_drive.cpp \
 	pce_fast/psg.cpp pcfx/king.cpp pcfx/soundbox.cpp pcfx/pcfx.cpp \
 	pcfx/interrupt.cpp pcfx/input.cpp pcfx/timer.cpp \
-	pcfx/rainbow.cpp pcfx/jrevdct.cpp pcfx/huc6273.cpp \
+	pcfx/rainbow.cpp pcfx/idct.cpp pcfx/huc6273.cpp \
 	pcfx/fxscsi.cpp pcfx/input/gamepad.cpp pcfx/input/mouse.cpp \
 	pcfx/debug.cpp psx/psx.cpp psx/cpu.cpp psx/gte.cpp psx/irq.cpp \
 	psx/timer.cpp psx/dma.cpp psx/mdec.cpp psx/sio.cpp psx/cdc.cpp \
@@ -812,8 +812,7 @@ am__mednafen_SOURCES_DIST = debug.cpp error.cpp mempatcher.cpp \
 @WANT_PCFX_EMU_TRUE@	pcfx/pcfx.$(OBJEXT) \
 @WANT_PCFX_EMU_TRUE@	pcfx/interrupt.$(OBJEXT) \
 @WANT_PCFX_EMU_TRUE@	pcfx/input.$(OBJEXT) pcfx/timer.$(OBJEXT) \
-@WANT_PCFX_EMU_TRUE@	pcfx/rainbow.$(OBJEXT) \
-@WANT_PCFX_EMU_TRUE@	pcfx/jrevdct.$(OBJEXT) \
+@WANT_PCFX_EMU_TRUE@	pcfx/rainbow.$(OBJEXT) pcfx/idct.$(OBJEXT) \
 @WANT_PCFX_EMU_TRUE@	pcfx/huc6273.$(OBJEXT) \
 @WANT_PCFX_EMU_TRUE@	pcfx/fxscsi.$(OBJEXT) \
 @WANT_PCFX_EMU_TRUE@	pcfx/input/gamepad.$(OBJEXT) \
@@ -2444,7 +2443,7 @@ pcfx/timer.$(OBJEXT): pcfx/$(am__dirstamp) \
 	pcfx/$(DEPDIR)/$(am__dirstamp)
 pcfx/rainbow.$(OBJEXT): pcfx/$(am__dirstamp) \
 	pcfx/$(DEPDIR)/$(am__dirstamp)
-pcfx/jrevdct.$(OBJEXT): pcfx/$(am__dirstamp) \
+pcfx/idct.$(OBJEXT): pcfx/$(am__dirstamp) \
 	pcfx/$(DEPDIR)/$(am__dirstamp)
 pcfx/huc6273.$(OBJEXT): pcfx/$(am__dirstamp) \
 	pcfx/$(DEPDIR)/$(am__dirstamp)
@@ -3316,9 +3315,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@pcfx/$(DEPDIR)/debug.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@pcfx/$(DEPDIR)/fxscsi.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@pcfx/$(DEPDIR)/huc6273.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@pcfx/$(DEPDIR)/idct.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@pcfx/$(DEPDIR)/input.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@pcfx/$(DEPDIR)/interrupt.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@pcfx/$(DEPDIR)/jrevdct.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@pcfx/$(DEPDIR)/king.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@pcfx/$(DEPDIR)/pcfx.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@pcfx/$(DEPDIR)/rainbow.Po@am__quote@

mednafen/apple2/apple2.cpp

@@ -1686,7 +1686,7 @@ static const MDFNSetting Settings[] =
  { "apple2.video.brightness",	MDFNSF_CAT_VIDEO, gettext_noop("Video brightness."), nullptr, MDFNST_FLOAT, "0.0", "-1.0", "1.0", nullptr, VideoChangeNotif  },
  { "apple2.video.force_mono",   MDFNSF_CAT_VIDEO, gettext_noop("Force monochrome graphics color."), gettext_noop("Force monochrome graphics if non-zero, with the specified color."), MDFNST_UINT, "0x000000", "0x000000", "0xFFFFFF", nullptr, VideoChangeNotif  },
  { "apple2.video.mixed_text_mono",MDFNSF_CAT_VIDEO,gettext_noop("Enable hack to treat mixed-mode text as monochrome."), nullptr, MDFNST_BOOL, "0", nullptr, nullptr, nullptr, VideoChangeNotif },
- { "apple2.video.mono_lumafilter",MDFNSF_CAT_VIDEO,gettext_noop("Monochrome video luma filter."), gettext_noop("Filters numbered closer to 0 have a stronger lowpass effect.  Negative-numbered filters have ringing."), MDFNST_INT, "5", "-2", "7", nullptr, VideoChangeNotif  },
+ { "apple2.video.mono_lumafilter",MDFNSF_CAT_VIDEO,gettext_noop("Monochrome video luma filter."), gettext_noop("Filters numbered closer to 0 have a stronger lowpass effect.  Negative-numbered filters have ringing."), MDFNST_INT, "5", "-3", "7", nullptr, VideoChangeNotif  },
  { "apple2.video.color_lumafilter",MDFNSF_CAT_VIDEO,gettext_noop("Color video luma filter."), gettext_noop("Filters numbered closer to 0 have a stronger lowpass effect.  Negative-numbered filters have ringing."), MDFNST_INT, "-3", "-3", "3", nullptr, VideoChangeNotif  },
  { "apple2.video.color_smooth",	MDFNSF_CAT_VIDEO, gettext_noop("Enable color video smoothing."), gettext_noop("Reduces vertical stripes without making video blurrier, at the cost of some pixel irregularities.  May make small text illegible in graphics mode."), MDFNST_BOOL, "0", nullptr, nullptr, nullptr, VideoChangeNotif  },
 

mednafen/apple2/video.inc

@@ -71,7 +71,7 @@ struct Settings
  uint32 force_mono = 0x000000;
  bool mixed_text_mono = false;
 
- int mono_lumafilter = 6;
+ int mono_lumafilter = 5;
  int color_lumafilter = -3;
 
  enum

mednafen/cdrom/scsicd.cpp

@@ -1,19 +1,26 @@
-/* Mednafen - Multi-system Emulator
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
+/******************************************************************************/
+/* Mednafen - Multi-system Emulator                                           */
+/******************************************************************************/
+/* scsicd.cpp:
+**  Copyright (C) 2006-2018 Mednafen Team
+**
+**  DoNEC_*() functions additionally:
+**   Copyright (C) 2004 Ki
+**
+** This program is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License
+** as published by the Free Software Foundation; either version 2
+** of the License, or (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software Foundation, Inc.,
+** 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
 
 #include <mednafen/mednafen.h>
 #include <mednafen/cdrom/CDInterface.h>

mednafen/drivers/memdebugger.cpp

@@ -769,13 +769,17 @@ int MemDebugger::Event(const SDL_Event *event)
 
 	if(event->key.keysym.mod & KMOD_LALT)
 	 break;
+	//
+	//
+	//
+	const unsigned ks = event->key.keysym.sym;
 
         if(InPrompt)
         {
          myprompt->Event(event);
         }
-	else if(InEditMode && !InTextArea && ((event->key.keysym.sym >= SDLK_0 && event->key.keysym.sym <= SDLK_9)	|| 
-	   (event->key.keysym.sym >= SDLK_a && event->key.keysym.sym <= SDLK_f)))
+	else if(InEditMode && !InTextArea && ((ks >= SDLK_0 && ks <= SDLK_9)	|| 
+	   (ks >= SDLK_a && ks <= SDLK_f)))
 	{
          uint8 tc = 0;
          uint8 meowbyte = 0;
@@ -795,7 +799,12 @@ int MemDebugger::Event(const SDL_Event *event)
          LowNib = !LowNib;
          if(!LowNib)
 	  ChangePos(1);
-        }
+	}
+	else if(InEditMode && InTextArea && ks != SDLK_TAB && ks != SDLK_RETURN && ks != SDLK_INSERT && ks != SDLK_END && ks != SDLK_HOME &&
+		ks != SDLK_PAGEUP && ks != SDLK_PAGEDOWN && ks != SDLK_UP && ks != SDLK_DOWN && ks != SDLK_LEFT && ks != SDLK_RIGHT)
+	{
+	 //
+	}
 	else switch(event->key.keysym.sym)
 	{
 	 default: break;

mednafen/drivers_libxxx/Makefile.am

@@ -2,6 +2,6 @@ AUTOMAKE_OPTIONS = subdir-objects
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 DEFAULT_INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_builddir)/intl
 
-noinst_LIBRARIES	=	libmdfnxxx.a
-libmdfnxxx_a_SOURCES    =	interface.cpp CDInterface_EXT.cpp main.cpp
-
+noinst_LIBRARIES	=	libmdfnxxx.a libmdfnxxx_extra.a
+libmdfnxxx_a_SOURCES    =	main.cpp
+libmdfnxxx_extra_a_SOURCES =	interface.cpp CDInterface_EXT.cpp

mednafen/drivers_libxxx/Makefile.in

@@ -115,9 +115,13 @@ am__v_AR_0 = @echo "  AR      " $@;
 am__v_AR_1 = 
 libmdfnxxx_a_AR = $(AR) $(ARFLAGS)
 libmdfnxxx_a_LIBADD =
-am_libmdfnxxx_a_OBJECTS = interface.$(OBJEXT) \
-	CDInterface_EXT.$(OBJEXT) main.$(OBJEXT)
+am_libmdfnxxx_a_OBJECTS = main.$(OBJEXT)
 libmdfnxxx_a_OBJECTS = $(am_libmdfnxxx_a_OBJECTS)
+libmdfnxxx_extra_a_AR = $(AR) $(ARFLAGS)
+libmdfnxxx_extra_a_LIBADD =
+am_libmdfnxxx_extra_a_OBJECTS = interface.$(OBJEXT) \
+	CDInterface_EXT.$(OBJEXT)
+libmdfnxxx_extra_a_OBJECTS = $(am_libmdfnxxx_extra_a_OBJECTS)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -146,8 +150,8 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
 am__v_CXXLD_0 = @echo "  CXXLD   " $@;
 am__v_CXXLD_1 = 
-SOURCES = $(libmdfnxxx_a_SOURCES)
-DIST_SOURCES = $(libmdfnxxx_a_SOURCES)
+SOURCES = $(libmdfnxxx_a_SOURCES) $(libmdfnxxx_extra_a_SOURCES)
+DIST_SOURCES = $(libmdfnxxx_a_SOURCES) $(libmdfnxxx_extra_a_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -356,8 +360,9 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = subdir-objects
 DEFAULT_INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_builddir)/intl
-noinst_LIBRARIES = libmdfnxxx.a
-libmdfnxxx_a_SOURCES = interface.cpp CDInterface_EXT.cpp main.cpp
+noinst_LIBRARIES = libmdfnxxx.a libmdfnxxx_extra.a
+libmdfnxxx_a_SOURCES = main.cpp
+libmdfnxxx_extra_a_SOURCES = interface.cpp CDInterface_EXT.cpp
 all: all-am
 
 .SUFFIXES:
@@ -401,6 +406,11 @@ libmdfnxxx.a: $(libmdfnxxx_a_OBJECTS) $(libmdfnxxx_a_DEPENDENCIES) $(EXTRA_libmd
 	$(AM_V_AR)$(libmdfnxxx_a_AR) libmdfnxxx.a $(libmdfnxxx_a_OBJECTS) $(libmdfnxxx_a_LIBADD)
 	$(AM_V_at)$(RANLIB) libmdfnxxx.a
 
+libmdfnxxx_extra.a: $(libmdfnxxx_extra_a_OBJECTS) $(libmdfnxxx_extra_a_DEPENDENCIES) $(EXTRA_libmdfnxxx_extra_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libmdfnxxx_extra.a
+	$(AM_V_AR)$(libmdfnxxx_extra_a_AR) libmdfnxxx_extra.a $(libmdfnxxx_extra_a_OBJECTS) $(libmdfnxxx_extra_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libmdfnxxx_extra.a
+
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 

mednafen/hw_video/huc6270/vdc.cpp

@@ -413,13 +413,13 @@ void VDC::IncRCR(void)
 		    {
 		     if(sat_dma_counter > 0)
 		     {
-		      printf("SAT DMA cancelled???\n");
+		      //printf("SAT DMA cancelled???\n");
 		      sat_dma_counter = 0;
 		      CheckAndCommitPending();
 		     }
 		     if(DMARunning)
 		     {
-		      printf("DMA Running Cancelled\n");
+		      //printf("DMA Running Cancelled\n");
 		      DMARunning = false;
 		      CheckAndCommitPending();
 		     }

mednafen/mednafen.cpp

@@ -770,6 +770,7 @@ static MDFN_COLD void LoadCommonPost(VirtualFS* vfs, const char* path)
 	DMStatus.resize(MDFNGameInfo->RMD->Drives.size());
         DMStatusSaveStateTemp.resize(DMStatus.size());
 
+	DMSNoMedia.clear();
 	for(uint32 drive_idx = 0; drive_idx < MDFNGameInfo->RMD->Drives.size(); drive_idx++)
 	{
          const RMD_Drive& drive = MDFNGameInfo->RMD->Drives[drive_idx];
@@ -1048,7 +1049,7 @@ static MDFNGI *LoadCD(const char *force_module, VirtualFS* vfs, const char *path
 
 MDFNGI *MDFNI_LoadExternalCD(const char* force_module, const char* path_hint, CDInterface* cdif)
 {
- return LoadCD(force_module, nullptr, path_hint, cdif);
+ return LoadCD(force_module, &::Mednafen::NVFS, path_hint, cdif);
 }
 
 static MDFN_COLD void LoadIPS(MDFNFILE* mfgf, const std::string& path)