Fix label for 'Download Content'

Implement labels for Input User Binds List
Move this code to net_compat.c
2026-11-08 17:28:49 -10:00 · 2016-05-02 22:17:12 +02:00 · 2016-05-02 22:15:25 +02:00 · 2016-05-02 19:44:12 +02:00 · 2016-05-02 19:36:02 +02:00 · 2016-05-02 19:30:12 +02:00
631 changed files with 94391 additions and 31099 deletions
@@ -62,6 +62,9 @@ menu/driverspzarch.c
 /media/shaders_glsl/
 /obj-w32/

+# Ctags
+/tags
+
 # Android
 /pkg/android/phoenix/obj/
 /pkg/android/phoenix/assets/
@@ -0,0 +1,6 @@
+[submodule "deps/glslang/glslang"]
+	path = deps/glslang/glslang
+	url = git://github.com/KhronosGroup/glslang.git
+[submodule "deps/spir2cross"]
+	path = deps/spir2cross
+	url = git://github.com/ARM-software/spir2cross
@@ -60,12 +60,16 @@ endif
 endif

 CFLAGS   += -Wall $(OPTIMIZE_FLAG) $(INCLUDE_DIRS) $(DEBUG_FLAG) -I.
-CXXFLAGS := $(CFLAGS) -std=c++98 -D__STDC_CONSTANT_MACROS
+
+APPEND_CFLAGS := $(CFLAGS)
+CXXFLAGS += $(APPEND_CFLAGS) -std=c++11 -D__STDC_CONSTANT_MACROS
 OBJCFLAGS :=  $(CFLAGS) -D__STDC_CONSTANT_MACROS

 ifeq ($(CXX_BUILD), 1)
   LINK = $(CXX)
-   CFLAGS := $(CXXFLAGS) -xc++
+   CFLAGS   := $(CXXFLAGS) -xc++
+	CFLAGS   += -DCXX_BUILD
+	CXXFLAGS += -DCXX_BUILD
 else
   ifeq ($(findstring Win32,$(OS)),)
      LINK = $(CC)
@@ -127,7 +131,7 @@ $(OBJDIR)/%.o: %.c config.h config.mk
 	@$(if $(Q), $(shell echo echo CC $<),)
 	$(Q)$(CC) $(CFLAGS) $(DEFINES) -MMD -c -o $@ $<

-$(OBJDIR)/%.o: %.cpp
+$(OBJDIR)/%.o: %.cpp config.h config.mk
 	@mkdir -p $(dir $@)
 	@$(if $(Q), $(shell echo echo CXX $<),)
 	$(Q)$(CXX) $(CXXFLAGS) $(DEFINES) -MMD -c -o $@ $<
@@ -19,7 +19,7 @@ ifeq ($(HAVE_LIBRETRODB),)
 endif

 ifeq ($(HAVE_LIBRETRODB), 1)
-	DEFINES += -DHAVE_LIBRETRODB
+   DEFINES += -DHAVE_LIBRETRODB
 endif

 ifeq ($(HAVE_FBO), 1)
@@ -77,12 +77,13 @@ endif
 ifneq ($(findstring Linux,$(OS)),)
   LIBS += -lrt
   OBJ += input/drivers/linuxraw_input.o \
-			 input/common/linux_common.o \
-			 input/common/epoll_common.o \
+          input/common/linux_common.o \
+          input/common/epoll_common.o \
          input/drivers_joypad/linuxraw_joypad.o \
          frontend/drivers/platform_linux.o
 endif

+
 ifeq ($(findstring Haiku,$(OS)),)
   LIBS += -lm
   DEBUG_FLAG = -g
@@ -109,7 +110,7 @@ OBJ += frontend/frontend.o \
       ui/drivers/ui_null.o \
       libretro_version_1.o \
       retroarch.o \
-		 input/input_keyboard.o \
+       input/input_keyboard.o \
       command_event.o \
       msg_hash.o \
       intl/msg_hash_de.o \
@@ -122,21 +123,23 @@ OBJ += frontend/frontend.o \
       intl/msg_hash_pt.o \
       intl/msg_hash_us.o \
       runloop.o \
-       tasks/tasks.o \
+       libretro-common/queues/task_queue.o \
+       tasks/tasks_internal.o \
+       tasks/task_content.o \
       tasks/task_file_transfer.o \
       content.o \
-		 libretro-common/encodings/encoding_utf.o \
-       libretro-common/file/file_list.o \
-       libretro-common/file/dir_list.o \
+       libretro-common/encodings/encoding_utf.o \
+       libretro-common/lists/file_list.o \
+       libretro-common/lists/dir_list.o \
       libretro-common/file/retro_dirent.o \
-       libretro-common/file/retro_file.o \
+       libretro-common/streams/file_stream.o \
+		 libretro-common/streams/interface_stream.o \
+		 libretro-common/streams/memory_stream.o \
       libretro-common/file/retro_stat.o \
-       libretro-common/string/string_list.o \
+       libretro-common/lists/string_list.o \
       libretro-common/string/stdstring.o \
       libretro-common/memmap/memalign.o \
-       dir_list_special.o \
-       string_list_special.o \
-       file_ops.o \
+       list_special.o \
       libretro-common/file/nbio/nbio_stdio.o \
       libretro-common/file/file_path.o \
       file_path_special.o \
@@ -144,7 +147,7 @@ OBJ += frontend/frontend.o \
       audio/audio_driver.o \
       input/input_driver.o \
       input/input_hid_driver.o \
-       gfx/video_common.o \
+       gfx/video_coord_array.o \
       gfx/video_driver.o \
       camera/camera_driver.o \
       location/location_driver.o \
@@ -164,14 +167,14 @@ OBJ += frontend/frontend.o \
       tasks/task_overlay.o \
       input/input_overlay.o \
       patch.o \
-       libretro-common/queues/fifo_buffer.o \
+       libretro-common/queues/fifo_queue.o \
       core_options.o \
       libretro-common/compat/compat_fnmatch.o \
-		 libretro-common/compat/compat_posix_string.o \
+       libretro-common/compat/compat_posix_string.o \
       cheats.o \
       core_info.o \
       libretro-common/file/config_file.o \
-       libretro-common/file/config_file_userdata.o \
+       config_file_userdata.o \
       screenshot.o \
       libretro-common/gfx/scaler/scaler.o \
       gfx/drivers_shader/shader_null.o \
@@ -184,8 +187,9 @@ OBJ += frontend/frontend.o \
       gfx/video_filter.o \
       audio/audio_resampler_driver.o \
       audio/audio_dsp_filter.o \
-       audio/drivers_resampler/sinc.o \
-       audio/drivers_resampler/nearest.o \
+       audio/drivers_resampler/sinc_resampler.o \
+       audio/drivers_resampler/nearest_resampler.o \
+       audio/drivers_resampler/null_resampler.o \
       audio/drivers_resampler/cc_resampler.o \
       location/drivers/nulllocation.o \
       camera/drivers/nullcamera.o \
@@ -200,7 +204,7 @@ OBJ += frontend/frontend.o \
       record/record_driver.o \
       record/drivers/record_null.o \
       performance.o \
-		 verbosity.o
+       verbosity.o

 ifneq ($(HAVE_GETOPT_LONG), 1)
 OBJ += libretro-common/compat/compat_getopt.o
@@ -214,11 +218,11 @@ ifneq ($(HAVE_STRL), 1)
 OBJ += libretro-common/compat/compat_strl.o
 endif

-OBJ += gfx/image/image.o
+OBJ += gfx/video_texture_image.o

 ifeq ($(HAVE_IMAGEVIEWER), 1)
 DEFINES += -DHAVE_IMAGEVIEWER
-OBJ += cores/image_core.o
+OBJ += cores/libretro-imageviewer/image_core.o
 endif

 # Qt
@@ -229,6 +233,10 @@ OBJ += ui/drivers/ui_qt.o
 LIBS += -lQt5Quick -lQt5Widgets -lQt5Gui -lQt5Qml -lQt5Network -lQt5Core -lglu32 -lopengl32 -L./ui/drivers/qt/wrapper/build/release -lwrapper
 endif

+ifeq ($(HAVE_SSA),1)
+LIBS += -lass
+endif
+
 # LibretroDB

 ifeq ($(HAVE_LIBRETRODB), 1)
@@ -282,7 +290,7 @@ endif

 ifeq ($(HAVE_ALSA), 1)
   OBJ += audio/drivers/alsa.o \
-			 audio/drivers/alsathread.o
+          audio/drivers/alsathread.o
   LIBS += $(ALSA_LIBS)
   DEFINES += $(ALSA_CFLAGS)
 endif
@@ -329,6 +337,7 @@ ifeq ($(HAVE_RSOUND), 1)
 endif

 ifeq ($(HAVE_DSOUND), 1)
+   HAVE_DIRECTX=1
   OBJ += audio/drivers/dsound.o
   DEFINES += -DHAVE_DSOUND
   LIBS += -ldxguid -ldsound
@@ -343,14 +352,14 @@ endif
 # Audio Resamplers

 ifeq ($(HAVE_NEON),1)
-   OBJ += audio/drivers_resampler/sinc_neon.o \
+   OBJ += audio/drivers_resampler/sinc_resampler_neon.o \
          audio/drivers_resampler/cc_resampler_neon.o
   # When compiled without this, tries to attempt to compile sinc lerp,
   # which will error out
-	#
-	# TODO - we need to make quality levels of sinc
-	# runtime toggleable instead of going by compile-time
-	# defines
+   #
+   # TODO - we need to make quality levels of sinc
+   # runtime toggleable instead of going by compile-time
+   # defines
   DEFINES += -DSINC_LOWER_QUALITY
 endif

@@ -359,8 +368,19 @@ ifeq ($(HAVE_NEON),1)
   OBJ += audio/audio_utils_neon.o
 endif

+HW_CONTEXT_MENU_DRIVERS=$(HAVE_RGUI)
+
+ifeq ($(HW_CONTEXT_MENU_DRIVERS),0)
+ifeq ($(HAVE_GL_CONTEXT),1)
+	HW_CONTEXT_MENU_DRIVERS=1
+endif
+ifeq ($(HAVE_VULKAN),1)
+	HW_CONTEXT_MENU_DRIVERS=1
+endif
+endif
+
 # XMB and MaterialUI are always enabled if supported and not explicitly disabled
-ifeq ($(HAVE_RGUI)$(HAVE_GL_CONTEXT), 11)
+ifeq ($(HW_CONTEXT_MENU_DRIVERS), 1)
   ifeq ($(HAVE_ZARCH),)
      HAVE_ZARCH = 1
   endif
@@ -369,12 +389,17 @@ ifeq ($(HAVE_RGUI)$(HAVE_GL_CONTEXT), 11)
      HAVE_MATERIALUI = 1
   endif

+   #ifeq ($(HAVE_NUKLEAR),)
+      #HAVE_NUKLEAR = 1
+   #endif
+
   ifeq ($(HAVE_XMB),)
      HAVE_XMB = 1
   endif
 else
   HAVE_ZARCH = 0
   HAVE_MATERIALUI  = 0
+   #HAVE_NUKLEAR = 0
   HAVE_XMB   = 0
 endif

@@ -386,6 +411,12 @@ ifeq ($(HAVE_MATERIALUI), 1)
   OBJ += menu/drivers/materialui.o
   DEFINES += -DHAVE_MATERIALUI
 endif
+ifeq ($(HAVE_NUKLEAR), 1)
+   OBJ += menu/drivers/nk_common.o
+   OBJ += menu/drivers/nk_menu.o
+   OBJ += menu/drivers/nuklear.o
+   DEFINES += -DHAVE_NUKLEAR
+endif
 ifeq ($(HAVE_ZARCH), 1)
   OBJ += menu/drivers/zarch.o
   DEFINES += -DHAVE_ZARCH
@@ -398,6 +429,7 @@ endif

 ifeq ($(HAVE_LAKKA), 1)
   DEFINES += -DHAVE_LAKKA
+   DEFINES += -DLAKKA_PROJECT=$(LAKKA_PROJECT)
 endif

 ifeq ($(HAVE_MENU_COMMON), 1)
@@ -407,7 +439,8 @@ ifeq ($(HAVE_MENU_COMMON), 1)
      PSEUDO_NS :=
   endif
   OBJ += menu/menu_hash.o \
-			 menu/menu_driver.o \
+          menu/menu_driver.o \
+          menu/menu_content.o \
          menu/intl/menu_hash_de.o \
          menu/intl/menu_hash_es.o \
          menu/intl/menu_hash_eo.o \
@@ -449,6 +482,8 @@ endif

 ifeq ($(UTF8), 1)
   DEFINES += -DHAVE_UTF8
+	OBJ += intl/msg_hash_ru.o
+	DEFINES += -finput-charset=UTF-8
 endif

 ifeq ($(HAVE_STB_FONT), 1)
@@ -463,11 +498,11 @@ endif

 ifeq ($(HAVE_THREADS), 1)
   OBJ += autosave.o \
-			 libretro-common/rthreads/rthreads.o \
-			 libretro-common/rthreads/rsemaphore.o  \
-			 libretro-common/rthreads/async_job.o \
-			 gfx/video_thread_wrapper.o \
-			 audio/audio_thread_wrapper.o
+          libretro-common/rthreads/rthreads.o \
+          libretro-common/rthreads/rsemaphore.o  \
+          libretro-common/rthreads/async_job.o \
+          gfx/video_thread_wrapper.o \
+          audio/audio_thread_wrapper.o
   DEFINES += -DHAVE_THREADS
   ifeq ($(findstring Haiku,$(OS)),)
      LIBS += -lpthread
@@ -478,20 +513,17 @@ ifeq ($(HAVE_COMMAND), 1)
   OBJ += command.o
 endif

-ifeq ($(HAVE_NETWORK_GAMEPAD), 1)
-   OBJ += remote.o
-endif
-
-#Input
-
 ifeq ($(HAVE_WAYLAND), 1)
- #OBJ += input/drivers/wayland.o
+ OBJ += gfx/drivers_context/wayland_ctx.o
 DEFINES += $(WAYLAND_CFLAGS)
 LIBS += $(WAYLAND_LIBS)
 endif

+#Input
+
 ifeq ($(HAVE_DINPUT), 1)
   LIBS += -ldinput8 -ldxguid -lole32
+   HAVE_DIRECTX=1
   DEFINES += -DHAVE_DINPUT
   OBJ += input/drivers/dinput.o \
          input/drivers_joypad/dinput_joypad.o
@@ -503,19 +535,36 @@ ifeq ($(HAVE_XINPUT), 1)
          input/autoconf/builtin_win.o
 endif

+ifeq ($(HAVE_OPENDINGUX_FBDEV), 1)
+	OBJ += gfx/drivers_context/opendingux_fbdev_ctx.o
+	DEFINES += $(EGL_CFLAGS)
+	LIBS += $(EGL_LIBS)
+endif
+
 ifeq ($(HAVE_X11), 1)
   OBJ += input/common/input_x11_common.o \
-			 input/drivers/x11_input.o \
+          input/drivers/x11_input.o \
          gfx/common/x11_common.o \
          input/drivers_keyboard/keyboard_event_x11.o

   LIBS += $(X11_LIBS) $(XEXT_LIBS) $(XF86VM_LIBS) $(XINERAMA_LIBS)
   DEFINES += $(X11_CFLAGS) $(XEXT_CFLAGS) $(XF86VM_CFLAGS) $(XINERAMA_CFLAGS)
+ifeq ($(HAVE_XCB),1)
+	LIBS    += -lX11-xcb
+endif
+ifneq ($(HAVE_GLES), 1)
+	OBJ += gfx/drivers_context/x_ctx.o
+endif
+endif
+
+ifeq ($(HAVE_XCB),1)
+	DEFINES += $(XCB_CFLAGS)
+	LIBS    += $(XCB_LIBS)
 endif

 ifeq ($(HAVE_XKBCOMMON), 1)
   DEFINES += $(XKBCOMMON_CFLAGS)
-	OBJ += input/drivers_keyboard/keyboard_event_xkb.o
+   OBJ += input/drivers_keyboard/keyboard_event_xkb.o
   LIBS += $(XKBCOMMON_LIBS)
 endif

@@ -523,37 +572,40 @@ ifeq ($(HAVE_UDEV), 1)
   DEFINES += $(UDEV_CFLAGS)
   LIBS += $(UDEV_LIBS)
   OBJ += input/drivers/udev_input.o \
-			 input/common/udev_common.o \
-			 input/drivers_keyboard/keyboard_event_udev.o \
+          input/drivers_keyboard/keyboard_event_udev.o \
          input/drivers_joypad/udev_joypad.o
 endif

 ifeq ($(HAVE_LIBUSB), 1)
-	DEFINES += -DHAVE_LIBUSB
-	OBJ += input/drivers_hid/libusb_hid.o
-	LIBS += -lusb-1.0
-	HAVE_HID = 1
+   DEFINES += -DHAVE_LIBUSB
+   OBJ += input/drivers_hid/libusb_hid.o
+   LIBS += -lusb-1.0
+   HAVE_HID = 1
 endif

 ifeq ($(HAVE_IOHIDMANAGER), 1)
-	DEFINES += -DHAVE_IOHIDMANAGER
-	OBJ += input/drivers_hid/iohidmanager_hid.o
-	HAVE_HID = 1
-	LIBS += -framework IOKit
+   DEFINES += -DHAVE_IOHIDMANAGER
+   OBJ += input/drivers_hid/iohidmanager_hid.o
+   HAVE_HID = 1
+   LIBS += -framework IOKit
 endif

 ifeq ($(HAVE_CORELOCATION), 1)
-	DEFINES += -DHAVE_CORELOCATION
-	LIBS += -framework CoreLocation
+   DEFINES += -DHAVE_CORELOCATION
+   LIBS += -framework CoreLocation
 endif

 ifeq ($(HAVE_HID), 1)
-	DEFINES += -DHAVE_HID
-	OBJ += input/connect/joypad_connection.o \
+   DEFINES += -DHAVE_HID
+   OBJ +=      input/connect/joypad_connection.o \
+					input/connect/connect_ps2adapter.o \
               input/connect/connect_ps3.o \
               input/connect/connect_ps4.o \
               input/connect/connect_wii.o \
-               input/connect/connect_wiiupro.o
+               input/connect/connect_nesusb.o \
+               input/connect/connect_snesusb.o \
+               input/connect/connect_wiiupro.o \
+               input/connect/connect_wiiugca.o
 endif

 ifeq ($(HAVE_PARPORT), 1)
@@ -571,8 +623,15 @@ endif
 OBJ += gfx/video_context_driver.o \
       gfx/drivers_context/gfx_null_ctx.o \
       gfx/video_state_tracker.o \
-		 libretro-common/gfx/math/matrix_4x4.o \
-		 libretro-common/gfx/math/matrix_3x3.o
+       libretro-common/gfx/math/matrix_4x4.o \
+       libretro-common/gfx/math/matrix_3x3.o
+
+ifeq ($(HAVE_KMS), 1)
+	HAVE_AND_WILL_USE_DRM = 1
+	OBJ += gfx/drivers_context/drm_ctx.o
+	DEFINES += $(GBM_CFLAGS) $(DRM_CFLAGS) $(EGL_CFLAGS)
+	LIBS += $(GBM_LIBS) $(DRM_LIBS) $(EGL_LIBS)
+endif

 ifeq ($(HAVE_GL_CONTEXT), 1)
   DEFINES += -DHAVE_OPENGL -DHAVE_GLSL
@@ -580,16 +639,9 @@ ifeq ($(HAVE_GL_CONTEXT), 1)
          gfx/common/gl_common.o \
          gfx/drivers_font/gl_raster_font.o \
          libretro-common/glsym/rglgen.o
-	
-   ifeq ($(HAVE_MENU_COMMON), 1)
-		OBJ += menu/drivers_display/menu_display_gl.o
-	endif

-   ifeq ($(HAVE_KMS), 1)
-	   HAVE_AND_WILL_USE_DRM = 1
-      OBJ += gfx/drivers_context/drm_egl_ctx.o
-      DEFINES += $(GBM_CFLAGS) $(DRM_CFLAGS) $(EGL_CFLAGS)
-      LIBS += $(GBM_LIBS) $(DRM_LIBS) $(EGL_LIBS)
+   ifeq ($(HAVE_MENU_COMMON), 1)
+      OBJ += menu/drivers_display/menu_display_gl.o
   endif

   ifeq ($(HAVE_VIDEOCORE), 1)
@@ -620,16 +672,8 @@ ifeq ($(HAVE_GL_CONTEXT), 1)
         DEFINES += $(EGL_CFLAGS)
         LIBS += $(EGL_LIBS)
      endif
-      ifneq ($(HAVE_GLES), 1)
-			OBJ += gfx/drivers_context/glx_ctx.o
-		endif
   endif

-   ifeq ($(HAVE_WAYLAND), 1)
-	   ifeq ($(HAVE_EGL), 1)
-	     OBJ += gfx/drivers_context/wayland_ctx.o
-      endif
-   endif

   ifeq ($(HAVE_GLES), 1)
      LIBS += $(GLES_LIBS)
@@ -641,7 +685,7 @@ ifeq ($(HAVE_GL_CONTEXT), 1)
   else
      DEFINES += -DHAVE_GL_SYNC
      OBJ += libretro-common/glsym/glsym_gl.o
-		GL_LIBS := -lGL
+      GL_LIBS := -lGL
      ifeq ($(OSX), 1)
         GL_LIBS := -framework OpenGL
         OBJ += gfx/drivers_context/cgl_ctx.o
@@ -649,7 +693,7 @@ ifeq ($(HAVE_GL_CONTEXT), 1)
         GL_LIBS := -lopengl32 -lgdi32 -lcomdlg32 -lcomctl32
         OBJ += gfx/drivers_context/wgl_ctx.o
      endif
-		LIBS += $(GL_LIBS)
+      LIBS += $(GL_LIBS)
   endif

   OBJ += gfx/drivers_shader/shader_glsl.o
@@ -657,7 +701,7 @@ ifeq ($(HAVE_GL_CONTEXT), 1)
 endif

 ifeq ($(HAVE_EGL), 1)
-	OBJ += gfx/common/egl_common.o
+   OBJ += gfx/common/egl_common.o
 endif

 ifeq ($(HAVE_SDL2), 1)
@@ -693,6 +737,52 @@ ifeq ($(HAVE_SDL2), 1)
   HAVE_SDL = 0
 endif

+ifeq ($(HAVE_VULKAN), 1)
+	ifeq ($(platform), win)
+		GLSLANG_PLATFORM := Windows
+	else
+		GLSLANG_PLATFORM := Unix
+	endif
+	GLSLANG_SOURCES := \
+		$(wildcard deps/glslang/*.cpp) \
+		$(wildcard deps/glslang/glslang/SPIRV/*.cpp) \
+		$(wildcard deps/glslang/glslang/glslang/GenericCodeGen/*.cpp) \
+		$(wildcard deps/glslang/glslang/OGLCompilersDLL/*.cpp) \
+		$(wildcard deps/glslang/glslang/glslang/MachineIndependent/*.cpp) \
+		$(wildcard deps/glslang/glslang/glslang/MachineIndependent/preprocessor/*.cpp) \
+		$(wildcard deps/glslang/glslang/glslang/OSDependent/$(GLSLANG_PLATFORM)/*.cpp)
+
+	SPIR2CROSS_SOURCES := deps/spir2cross/spir2cross.cpp
+
+	DEFINES += \
+			  -Ideps/glslang/glslang/glslang/OSDependent/$(GLSLANG_PLATFORM) \
+			  -Ideps/glslang/glslang \
+			  -Ideps/glslang/glslang/glslang/MachineIndependent \
+			  -Ideps/glslang/glslang/glslang/Public \
+			  -Ideps/glslang/glslang/SPIRV \
+			  -Ideps/glslang \
+			  -Ideps/spir2cross
+
+	CXXFLAGS += -Wno-switch -Wno-sign-compare -fno-strict-aliasing -Wno-maybe-uninitialized -Wno-reorder -I./gfx/include/vulkan
+   CFLAGS  += -I./gfx/include/vulkan
+
+	GLSLANG_OBJ := $(GLSLANG_SOURCES:.cpp=.o)
+	SPIR2CROSS_OBJ := $(SPIR2CROSS_SOURCES:.cpp=.o)
+
+	OBJ += gfx/drivers/vulkan.o \
+			 gfx/common/vulkan_common.o \
+			 gfx/drivers_font/vulkan_raster_font.o \
+			 gfx/drivers_shader/shader_vulkan.o \
+			 gfx/drivers_shader/glslang_util.o \
+			 gfx/drivers_shader/slang_reflection.o \
+			 $(GLSLANG_OBJ) \
+			 $(SPIR2CROSS_OBJ)
+	ifeq ($(HAVE_MENU_COMMON), 1)
+		OBJ += menu/drivers_display/menu_display_vulkan.o
+	endif
+	LIBS += -lstdc++
+endif
+
 ifeq ($(HAVE_OMAP), 1)
   OBJ += gfx/drivers/omap_gfx.o
 endif
@@ -702,16 +792,16 @@ ifeq ($(HAVE_EXYNOS), 1)
          memory/neon/memcpy-neon.o
   LIBS += $(DRM_LIBS) $(EXYNOS_LIBS)
   DEFINES += $(DRM_CFLAGS) $(EXYNOS_CFLAGS)
-	HAVE_AND_WILL_USE_DRM = 1
+   HAVE_AND_WILL_USE_DRM = 1
 endif

 ifeq ($(HAVE_AND_WILL_USE_DRM), 1)
-	OBJ += gfx/common/drm_common.o
+   OBJ += gfx/common/drm_common.o
 endif

 ifeq ($(HAVE_DISPMANX), 1)
   OBJ += gfx/drivers/dispmanx_gfx.o
-	HAVE_VIDEOCORE = 1
+   HAVE_VIDEOCORE = 1
   LIBS += $(DISPMANX_LIBS)
   DEFINES += $(DISPMANX_CFLAGS)
 endif
@@ -733,14 +823,8 @@ ifeq ($(HAVE_XVIDEO), 1)
   DEFINES += $(XVIDEO_CFLAGS)
 endif

-ifeq ($(HAVE_XSHM), 1)
-   OBJ += gfx/drivers/xshm.o
-   LIBS += $(XSHM_LIBS)
-   DEFINES += $(XSHM_CFLAGS)
-endif
-
 ifeq ($(HAVE_CG), 1)
-	DEFINES += -DHAVE_CG
+   DEFINES += -DHAVE_CG
   OBJ += gfx/drivers_shader/shader_gl_cg.o
   LIBS += $(CG_LIBS)
 endif
@@ -752,12 +836,13 @@ ifeq ($(HAVE_D3D9), 1)
          gfx/common/d3d_common.o \
          gfx/drivers_font/d3d_w32_font.o \
          gfx/drivers_context/d3d_ctx.o
+   HAVE_DIRECTX=1
   DEFINES += -DHAVE_D3D -DHAVE_D3D9
   LIBS += -ld3d9 -ld3dx9 -ldxguid

   ifeq ($(HAVE_MENU_COMMON), 1)
-		OBJ += menu/drivers_display/menu_display_d3d.o
-	endif
+      OBJ += menu/drivers_display/menu_display_d3d.o
+   endif

   ifeq ($(HAVE_CG), 1)
      LIBS += -lcgD3D9
@@ -797,22 +882,23 @@ endif


 ifeq ($(HAVE_ZLIB), 1)
-   OBJ += libretro-common/file/file_extract.o \
+   OBJ += libretro-common/file/archive_file.o \
+          libretro-common/file/archive_file_zlib.o \
          tasks/task_decompress.o
   OBJ += $(ZLIB_OBJS)
   DEFINES += -DHAVE_ZLIB
-	HAVE_RPNG = 1
+   HAVE_RPNG = 1
   HAVE_COMPRESSION = 1
   ifeq ($(WANT_ZLIB), 1)
      DEFINES += -DWANT_ZLIB
   else
      LIBS += -lz
-		HAVE_ZLIB_DEFLATE = 1
+      HAVE_ZLIB_DEFLATE = 1
   endif
 endif

 ifdef HAVE_RPNG
-	DEFINES += -DHAVE_RPNG
+   DEFINES += -DHAVE_RPNG
 endif

 ifeq ($(HAVE_RPNG), 1)
@@ -841,13 +927,9 @@ ifeq ($(WANT_ZLIB),1)
          deps/zlib/inftrees.o \
          deps/zlib/trees.o \
          deps/zlib/uncompr.o \
-          deps/zlib/zutil.o \
-          deps/zlib/ioapi.o \
-          deps/zlib/unzip.o
+          deps/zlib/zutil.o
 else
 ifeq ($(HAVE_ZLIB),1)
-ZLIB_OBJS = deps/zlib/unzip.o \
-            deps/zlib/ioapi.o
 OBJ += $(ZLIB_OBJS)
 HAVE_ZLIB_DEFLATE = 1
 endif
@@ -869,12 +951,22 @@ endif
 ifeq ($(HAVE_NETWORKING), 1)
   DEFINES += -DHAVE_NETWORKING
   OBJ += libretro-common/net/net_compat.o \
-			 libretro-common/net/net_http.o \
-			 net_http_special.o \
-			 tasks/task_http.o
+          libretro-common/net/net_http.o \
+			 libretro-common/net/net_socket.o \
+          net_http_special.o \
+          tasks/task_http.o
+
+   ifneq ($(HAVE_SOCKET_LEGACY),1)
+	OBJ += libretro-common/net/net_ifinfo.o
+	endif
+
+   ifeq ($(WANT_IFADDRS), 1)
+	DEFINES += -DWANT_IFADDRS
+	OBJ += libretro-common/compat/compat_ifaddrs.o
+	endif

   ifneq ($(findstring Win32,$(OS)),)
-      LIBS += -lws2_32
+      LIBS += -lws2_32 -liphlpapi
   endif

   # Netplay
@@ -885,13 +977,17 @@ ifeq ($(HAVE_NETWORKING), 1)
   endif

   # Retro Achievements (also depends on threads)
-   
+
   ifeq ($(HAVE_CHEEVOS), 1)
      ifeq ($(HAVE_THREADS), 1)
         DEFINES += -DHAVE_CHEEVOS
         OBJ += cheevos.o libretro-common/utils/md5.o
      endif
   endif
+
+   ifeq ($(HAVE_NETWORK_GAMEPAD), 1)
+      OBJ += remote.o
+   endif
 endif

 ifneq ($(findstring Win32,$(OS)),)
@@ -917,16 +1013,20 @@ ifeq ($(HAVE_FFMPEG), 1)
          cores/libretro-ffmpeg/ffmpeg_core.o
   LIBS += $(AVCODEC_LIBS) $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(SWSCALE_LIBS) $(SWRESAMPLE_LIBS) $(FFMPEG_LIBS)
   DEFINES += $(AVCODEC_CFLAGS) $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS) $(SWSCALE_CFLAGS) $(SWRESAMPLE_CFLAGS)
-	DEFINES += -DHAVE_FFMPEG -Iffmpeg
+   DEFINES += -DHAVE_FFMPEG -Iffmpeg
 endif

 ifeq ($(HAVE_COMPRESSION), 1)
   DEFINES += -DHAVE_COMPRESSION
 endif

+#ifeq ($(HAVE_DIRECTX), 1)
+   #$DEFINES += -I"$(DXSDK_DIR)/Include"
+#endif
+
 ifeq ($(HAVE_COCOA),1)
-	DEFINES += -DHAVE_MAIN
-	OBJ += input/drivers/cocoa_input.o \
+   DEFINES += -DHAVE_MAIN
+   OBJ += input/drivers/cocoa_input.o \
               input/drivers_keyboard/keyboard_event_apple.o \
               ui/drivers/ui_cocoa.o \
               ui/drivers/cocoa/cocoa_common.o \
@@ -21,20 +21,32 @@ APP_RSF              = ctr/tools/template.rsf
 APP_SYSTEM_MODE      = 64MB
 APP_SYSTEM_MODE_EXT  = 124MB
 APP_BIG_TEXT_SECTION = 0
+APP_USE_SVCHAX       = 0

 include ctr/Makefile.cores

 OBJS :=
-OBJS += gfx/drivers/ctr_sprite.o
+OBJS += gfx/drivers/ctr_shaders/ctr_sprite.o
 OBJS += ctr/ctr_system.o
 OBJS += ctr/ctr_memory.o
 OBJS += ctr/ctr_linear.o
-OBJS += ctr/ctr_svchax.o
+
+ifeq ($(APP_BIG_TEXT_SECTION), 1)
+	APP_USE_SVCHAX = 1
+    LDFLAGS  += -Wl,--defsym,__ctr_patch_services=__service_ptr
+endif
+
+ifeq ($(APP_USE_SVCHAX), 1)
+	OBJS += ctr/ctr_svchax.o
+endif

 ifeq ($(GRIFFIN_BUILD), 1)
 	OBJS += griffin/griffin.o
 else
-	OBJS += libretro-common/file/file_extract.o
+	CFLAGS += -DHAVE_COMPRESSION
+	OBJS += libretro-common/file/archive_file.o
+	OBJS += libretro-common/file/archive_file_zlib.o
+	OBJS += libretro-common/encodings/encoding_utf.o
 	OBJS += verbosity.o
 	OBJS += performance.o
 	OBJS += libretro-common/compat/compat_getopt.o
@@ -43,13 +55,13 @@ else
 	OBJS += libretro-common/compat/compat_fnmatch.o
 	OBJS += libretro-common/memmap/memalign.o
 	OBJS += libretro-common/file/config_file.o
-	OBJS += libretro-common/file/config_file_userdata.o
+	OBJS += config_file_userdata.o
 	OBJS += core_options.o
 	OBJS += cheats.o
 	OBJS += libretro-common/hash/rhash.o
 	OBJS += gfx/video_context_driver.o
 	OBJS += gfx/drivers_context/gfx_null_ctx.o
-	OBJS += gfx/image/image.o
+	OBJS += gfx/video_texture_image.o
 	OBJS += libretro-common/formats/tga/rtga.o
 	OBJS += libretro-common/formats/png/rpng.o
 	OBJS += libretro-common/formats/png/rpng_encode.o
@@ -75,10 +87,11 @@ else
 	OBJS += input/drivers_joypad/hid_joypad.o
 	OBJS += input/drivers_hid/null_hid.o
 	OBJS += gfx/video_state_tracker.o
-	OBJS += libretro-common/queues/fifo_buffer.o
+	OBJS += libretro-common/queues/fifo_queue.o
 	OBJS += audio/audio_resampler_driver.o
-	OBJS += audio/drivers_resampler/sinc.o
-	OBJS += audio/drivers_resampler/nearest.o
+	OBJS += audio/drivers_resampler/sinc_resampler.o
+	OBJS += audio/drivers_resampler/nearest_resampler.o
+	OBJS += audio/drivers_resampler/null_resampler.o
 	OBJS += audio/drivers_resampler/cc_resampler.o
 	OBJS += camera/drivers/nullcamera.o
 	OBJS += location/drivers/nulllocation.o
@@ -86,7 +99,7 @@ else
 	OBJS += audio/drivers/ctr_dsp_audio.o
 	OBJS += audio/drivers/nullaudio.o
 	OBJS += gfx/video_driver.o
-	OBJS += gfx/video_common.o
+	OBJS += gfx/video_coord_array.o
 	OBJS += input/input_driver.o
 	OBJS += audio/audio_driver.o
 	OBJS += camera/camera_driver.o
@@ -122,17 +135,15 @@ else
 	OBJS += content.o
 	OBJS += libretro-common/file/file_path.o
 	OBJS += file_path_special.o
-	OBJS += libretro-common/file/dir_list.o
+	OBJS += libretro-common/lists/dir_list.o
 	OBJS += libretro-common/file/retro_dirent.o
-	OBJS += libretro-common/file/retro_file.o
+	OBJS += libretro-common/streams/file_stream.o
 	OBJS += libretro-common/file/retro_stat.o
-	OBJS += dir_list_special.o
-	OBJS += string_list_special.o
-	OBJS += libretro-common/string/string_list.o
+	OBJS += list_special.o
+	OBJS += libretro-common/lists/string_list.o
 	OBJS += libretro-common/string/stdstring.o
-	OBJS += file_ops.o
 	OBJS += libretro-common/file/nbio/nbio_stdio.o
-	OBJS += libretro-common/file/file_list.o
+	OBJS += libretro-common/lists/file_list.o
 	OBJS += libretro-common/queues/message_queue.o
 	OBJS += patch.o
 	OBJS += configuration.o
@@ -147,7 +158,8 @@ else
 	OBJS += libretro_version_1.o
 	OBJS += retroarch.o
 	OBJS += runloop.o
-	OBJS += tasks/tasks.o
+	OBJS += libretro-common/queues/task_queue.o
+	OBJS += tasks/tasks_internal.o
 	OBJS += msg_hash.o
 	OBJS += intl/msg_hash_de.o
 	OBJS += intl/msg_hash_es.o
@@ -161,8 +173,9 @@ else
 	OBJS += movie.o
 	OBJS += record/record_driver.o
 	OBJS += record/drivers/record_null.o
-	OBJS += tasks/task_decompress.o
+	OBJS += tasks/task_content.o
 	OBJS += tasks/task_file_transfer.o
+	OBJS += tasks/task_decompress.o
 	OBJS += screenshot.o
 	OBJS += playlist.o
 	OBJS += menu/menu_driver.o
@@ -172,6 +185,7 @@ else
 	OBJS += menu/menu_entries.o
 	OBJS += menu/menu_setting.o
 	OBJS += menu/menu_cbs.o
+	OBJS += menu/menu_content.o
 	OBJS += menu/cbs/menu_cbs_ok.o
 	OBJS += menu/cbs/menu_cbs_cancel.o
 	OBJS += menu/cbs/menu_cbs_select.o
@@ -220,8 +234,6 @@ else
 	OBJS += deps/zlib/trees.o
 	OBJS += deps/zlib/uncompr.o
 	OBJS += deps/zlib/zutil.o
-	OBJS += deps/zlib/ioapi.o
-	OBJS += deps/zlib/unzip.o
 	OBJS += audio/audio_utils.o
 endif

@@ -281,13 +293,11 @@ CFLAGS += -I. -Ideps/zlib -Ideps/7zip -Ilibretro-common/include
 CFLAGS += -DRARCH_INTERNAL -DRARCH_CONSOLE -DSINC_LOWEST_QUALITY
 CFLAGS += -DHAVE_GRIFFIN=1 -DHAVE_FILTERS_BUILTIN -DHAVE_MENU -DHAVE_RGUI
 CFLAGS += -DHAVE_ZLIB -DHAVE_RPNG -DWANT_ZLIB -DHAVE_BUILTIN_AUTOCONFIG
-#-DHAVE_LIBRETRO_MANAGEMENT -DWANT_RPNG -DHAVE_7ZIP
-

 CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11

 ASFLAGS	:=	-g $(ARCH) -O3
-LDFLAGS   =	-specs=ctr/3dsx_custom.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
+LDFLAGS  +=	-specs=ctr/3dsx_custom.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)

 CFLAGS   += -std=gnu99 -ffast-math

@@ -315,11 +325,6 @@ $(TARGET): $(TARGET_3DSX) $(TARGET_3DS) $(TARGET_CIA)
 $(TARGET).3dsx: $(TARGET).elf
 $(TARGET).elf: $(OBJS) libretro_ctr.a

-ctr_sprite_shader_shbin.h: gfx/drivers/ctr_sprite.o
-gfx/drivers/ctr_gfx.c: ctr_sprite_shader_shbin.h
-griffin/griffin.o: gfx/drivers/ctr_gfx.c
-
-
 PREFIX		:=	$(DEVKITARM)/bin/arm-none-eabi-

 CC      := $(PREFIX)gcc
@@ -342,14 +347,15 @@ else
 	BANNERTOOL = ctr/tools/bannertool.exe
 endif

-%.o: %.shader
-	python $(AEMSTRO)/aemstro_as.py $< $(notdir $<).shbin
-	$(DEVKITARM)/bin/bin2s $(notdir $<).shbin | $(PREFIX)as -o $@
-	echo "extern const u8" `(echo $(notdir $<).shbin | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(notdir $<).shbin | tr . _)`.h
-	echo "extern const u8" `(echo $(notdir $<).shbin | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(notdir $<).shbin | tr . _)`.h
-	echo "extern const u32" `(echo $(notdir $<).shbin | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_size";" >> `(echo $(notdir $<).shbin | tr . _)`.h
-	rm $(notdir $<).shbin
+%.o: %.vsh %.gsh
+	$(DEVKITARM)/bin/picasso $^ -o $*.shbin
+	$(DEVKITARM)/bin/bin2s $*.shbin | $(PREFIX)as -o $@
+	rm $*.shbin

+%.o: %.vsh
+	$(DEVKITARM)/bin/picasso $^ -o $*.shbin
+	$(DEVKITARM)/bin/bin2s $*.shbin | $(PREFIX)as -o $@
+	rm $*.shbin

 %.o: %.cpp
 	$(CXX) -c -o $@ $< $(CXXFLAGS) $(INCDIRS)
@@ -405,7 +411,6 @@ clean:
 	rm -f $(TARGET).smdh
 	rm -f $(TARGET).bnr
 	rm -f $(TARGET).icn
-	rm -f *_shader_shbin.h
 	rm -f ctr/ctr_config_*.o
 	rm -f ctr/3dsx_custom_crt0.o

@@ -137,7 +137,6 @@ ifeq ($(platform), wii)
  HAVE_WIIUSB_HID          := 1
  HAVE_RARCH_EXEC          := 1
  HAVE_RSOUND              := 1
-  HAVE_LIBRETRO_MANAGEMENT := 1

  APP_BOOTER_DIR = wii/app_booter
  PLATOBJS := $(APP_BOOTER_DIR)/app_booter.binobj
@@ -185,7 +184,6 @@ else ifeq ($(platform), psp1)
  LDFLAGS +=  -Wl,-q

  BUILD_PRX                 = 1
-  HAVE_LIBRETRO_MANAGEMENT := 1
  HAVE_RPNG                := 1
  HAVE_KERNEL_PRX          := 1
  RARCH_CONSOLE          = 1
@@ -207,14 +205,13 @@ else ifeq ($(platform), vita)
 			 -lSceSysmodule_stub -lSceCtrl_stub -lSceAudio_stub -lUVLoader_stub \
 			 -lScePower_stub -lSceRtc_stub -lSceCommonDialog_stub -lfreetype -lz -lm -lc -lpng

-  PLATOBJS += audio/audio_utils_neon.o audio/drivers_resampler/sinc_neon.o \
+  PLATOBJS += audio/audio_utils_neon.o audio/drivers_resampler/sinc_resampler_neon.o \
              audio/drivers_resampler/cc_resampler_neon.o

  LIBDIRS += -L.
  LDFLAGS +=  -Wl,-q

  HAVE_FILTERS_BUILTIN     := 1
-  HAVE_LIBRETRO_MANAGEMENT := 1
  HAVE_BUILTIN_AUTOCONFIG  := 1
  HAVE_RPNG                := 1
  HAVE_ZLIB                := 1
@@ -245,10 +242,6 @@ ifeq ($(platform), vita)
 CFLAGS      += -DHAVE_SOCKET_LEGACY
 endif

-ifeq ($(HAVE_LIBRETRO_MANAGEMENT), 1)
-CFLAGS		+= -DHAVE_LIBRETRO_MANAGEMENT
-endif
-
 ifeq ($(HAVE_KERNEL_PRX), 1)
 CFLAGS      += -DHAVE_KERNEL_PRX
 endif
@@ -10,7 +10,7 @@ TARGET := retroarch-pandora
 LDDIRS = -L. -L$(PNDSDK)/usr/lib
 INCDIRS = -I. -I$(PNDSDK)/usr/include

-OBJ = griffin/griffin.o audio/resamplers/sinc_neon.o audio/audio_utils_neon.o
+OBJ = griffin/griffin.o audio/resamplers/sinc_resampler_neon.o audio/audio_utils_neon.o
 LDFLAGS = -L$(PNDSDK)/usr/lib -Wl,-rpath,$(PNDSDK)/usr/lib

 LIBS = -lGLESv2 -lEGL -ldl -lm -lpthread -lrt -lasound
@@ -68,7 +68,7 @@ ifeq ($(HAVE_RLAUNCH), 1)
 	DEFINES += -DHAVE_RLAUNCH
 endif

-DEFINES += -DHAVE_MENU -DHAVE_RGUI -DHAVE_MATERIALUI -DHAVE_XMB -DRARCH_INTERNAL -DMSB_FIRST -DHAVE_OVERLAY -DHAVE_STB_FONT
+DEFINES += -DHAVE_MENU -DHAVE_RGUI -DRARCH_INTERNAL -DMSB_FIRST -DHAVE_OVERLAY

 ifeq ($(HAVE_GCMGL), 1)
 DEFINES			+= -DHAVE_GCMGL
@@ -106,7 +106,7 @@ PPU_LDLIBS =  $(FONT_LIBS) $(GL_LIBS) $(WHOLE_START) -lretro_ps3 $(WHOLE_END) -l

 PPU_RANLIB = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ranlib.exe

-DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_HEADSET -DHAVE_LIBRETRODB -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_7Z -DWANT_ZLIB -DSINC_LOWER_QUALITY -D__CELLOS_LV2__ -DHAVE_NETPLAY=1 -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -DHAVE_FILTERS_BUILTIN -DHAVE_BUILTIN_AUTOCONFIG
+DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_7Z -DWANT_ZLIB -DSINC_LOWER_QUALITY -D__CELLOS_LV2__ -DHAVE_NETPLAY=1 -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -DHAVE_FILTERS_BUILTIN -DHAVE_BUILTIN_AUTOCONFIG

 ifeq ($(DEBUG), 1)
   PPU_OPTIMIZE_LV	:= -O0 -g
@@ -104,7 +104,7 @@ PPU_LDLIBS =  $(FONT_LIBS) $(GL_LIBS) $(WHOLE_START) -lretro_ps3 $(WHOLE_END) -l

 PPU_RANLIB = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ranlib.exe

-DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -DWANT_ZLIB -DSINC_LOWER_QUALITY -D__CELLOS_LV2__ -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=0 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
+DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -DWANT_ZLIB -DSINC_LOWER_QUALITY -D__CELLOS_LV2__ -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=0 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)

 ifeq ($(DEBUG), 1)
   PPU_OPTIMIZE_LV	:= -O0 -g
@@ -24,20 +24,22 @@ PPU_SRCS		= frontend/frontend_salamander.c \
 				  frontend/drivers/platform_ps3.c \
 				  frontend/drivers/platform_null.c \
 				  libretro-common/file/file_path.c \
-				  libretro-common/file/dir_list.c \
+				  libretro-common/lists/dir_list.c \
+				  libretro-common/lists/string_list.c \
 				  libretro-common/file/retro_dirent.c \
 				  libretro-common/file/retro_stat.c \
 				  libretro-common/hash/rhash.c \
 				  libretro-common/string/stdstring.c \
-				  libretro-common/string/string_list.c \
 				  libretro-common/compat/compat_strl.c \
-				  libretro-common/file/retro_file.c \
+				  libretro-common/streams/file_stream.c \
 				  libretro-common/file/config_file.c \
 				  verbosity.c

 ifeq ($(HAVE_LOGGER), 1)
 PPU_CFLAGS		+= -DHAVE_LOGGER 
-PPU_SRCS		   += netlogger.c
+PPU_SRCS		   += netlogger.c \
+						libretro-common/net/net_compat.c \
+						libretro-common/net/net_socket.c
 endif

 PPU_TARGET		= retroarch-salamander_ps3.elf
@@ -23,7 +23,7 @@ INCDIR = deps/zlib deps/7zip libretro-common/include
 CFLAGS = $(OPTIMIZE_LV) -G0 -std=gnu99 -ffast-math
 ASFLAGS = $(CFLAGS)

-RARCH_DEFINES = -DPSP -D_MIPS_ARCH_ALLEGREX -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_ZLIB -DHAVE_RPNG -DWANT_ZLIB -DHAVE_GRIFFIN=1 -DRARCH_INTERNAL -DRARCH_CONSOLE -DHAVE_MENU -DHAVE_RGUI -DWANT_RPNG -DSINC_LOWEST_QUALITY -DHAVE_BUILTIN_AUTOCONFIG -DHAVE_FILTERS_BUILTIN -DHAVE_7ZIP
+RARCH_DEFINES = -DPSP -D_MIPS_ARCH_ALLEGREX -DHAVE_ZLIB -DHAVE_RPNG -DWANT_ZLIB -DHAVE_GRIFFIN=1 -DRARCH_INTERNAL -DRARCH_CONSOLE -DHAVE_MENU -DHAVE_RGUI -DWANT_RPNG -DSINC_LOWEST_QUALITY -DHAVE_BUILTIN_AUTOCONFIG -DHAVE_FILTERS_BUILTIN -DHAVE_7ZIP

 LIBDIR =
 LDFLAGS =
@@ -37,12 +37,12 @@ OBJS = frontend/frontend_salamander.o \
 		 frontend/drivers/platform_null.o \
 		 libretro-common/file/file_path.o \
 		 libretro-common/string/stdstring.o \
-		 libretro-common/string/string_list.o \
-		 libretro-common/file/dir_list.o \
+		 libretro-common/lists/string_list.o \
+		 libretro-common/lists/dir_list.o \
 		 libretro-common/file/retro_dirent.o \
 		 libretro-common/compat/compat_strl.o \
 		 libretro-common/file/config_file.o \
-		 libretro-common/file/retro_file.o \
+		 libretro-common/streams/file_stream.o \
 		 libretro-common/file/retro_stat.o \
 		 libretro-common/hash/rhash.o \
 		 verbosity.o \
@@ -47,9 +47,9 @@ OBJ = frontend/frontend_salamander.o \
 		libretro-common/file/file_path.o \
 		libretro-common/hash/rhash.o \
 		libretro-common/string/stdstring.o \
-		libretro-common/string/string_list.o \
-		libretro-common/file/dir_list.o \
-		libretro-common/file/retro_file.o \
+		libretro-common/lists/string_list.o \
+		libretro-common/lists/dir_list.o \
+		libretro-common/streams/file_stream.o \
 		libretro-common/file/retro_dirent.o \
 		libretro-common/file/retro_stat.o \
 		libretro-common/compat/compat_strl.o \
@@ -60,7 +60,9 @@ OBJ = frontend/frontend_salamander.o \
 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
 CFLAGS          += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
-OBJ             += logger/netlogger.o
+OBJ             += logger/netlogger.o \
+						 libretro-common/net/net_compat.o \
+						 libretro-common/net/net_socket.o
 endif

 ifeq ($(HAVE_FILE_LOGGER), 1)
@@ -1,5 +1,4 @@
 TARGET = retroarch.exe
-JTARGET = tools/retroarch-joyconfig.exe

 HAVE_DINPUT = 1
 HAVE_XAUDIO = 1
@@ -84,9 +83,7 @@ OBJDIR           := obj-w32

 OS               := Win32
 OBJ              :=
-JOYCONFIG_OBJ    :=
 LIBS             := -lm
-JOYCONFIG_LIBS   :=
 DEFINES          := -I. -Ilibretro-common/include -DRARCH_INTERNAL -DHAVE_OVERLAY
 LDFLAGS          := -L. -static-libgcc

@@ -137,11 +134,10 @@ else
 endif

 RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ))
-RARCH_JOYCONFIG_OBJ := $(addprefix $(OBJDIR)/,$(JOYCONFIG_OBJ))

-all: $(TARGET) $(JTARGET)
+all: $(TARGET)

-include $(RARCH_OBJ:.o=.d) $(RARCH_JOYCONFIG_OBJ:.o=.d)
+-include $(RARCH_OBJ:.o=.d)

 $(TARGET): $(RARCH_OBJ)
 	@$(if $(Q), $(shell echo echo LD $@),)
@@ -170,37 +166,10 @@ $(OBJDIR)/%.o: %.rc $(HEADERS)
 	@$(if $(Q), $(shell echo echo WINDRES $<),)
 	$(Q)$(WINDRES) -o $@ $<

-$(JTARGET): $(RARCH_JOYCONFIG_OBJ)
-	@$(if $(Q), $(shell echo echo LD $@),)
-ifeq ($(CXX_BUILD), 1)
-	$(Q)$(CXX) -o $@ $(RARCH_JOYCONFIG_OBJ) -ldxguid -ldinput8 -lole32 $(LDFLAGS) $(JOYCONFIG_LIBS)
-else
-	$(Q)$(CC) -o $@ $(RARCH_JOYCONFIG_OBJ) -ldxguid -ldinput8 -lole32 $(LDFLAGS) $(JOYCONFIG_LIBS)
-endif
-
 clean:
 	rm -rf $(OBJDIR)
 	rm -f $(TARGET)
 	rm -f *.d
-	rm -f tools/retroarch-joyconfig.exe

-dist_x86: all
-	zip -r retroarch-win32-1.0.zip $(TARGET) $(JTARGET) retroarch.cfg
-
-dist_x86_64: all
-	zip -r retroarch-win64-1.0.zip $(TARGET) $(JTARGET) retroarch.cfg
-
-libs_x86:
-	wget http://themaister.net/retroarch-dl/RetroArch-win32-libs.zip
-	unzip RetroArch-win32-libs.zip
-	wget http://themaister.net/retroarch-dl/RetroArch-win32-headers.zip
-	unzip RetroArch-win32-headers.zip
-
-libs_x86_64:
-	wget http://themaister.net/retroarch-dl/RetroArch-win64-libs.zip
-	unzip RetroArch-win64-libs.zip
-	wget http://themaister.net/retroarch-dl/RetroArch-win64-headers.zip
-	unzip RetroArch-win64-headers.zip
-
-.PHONY: all install uninstall clean dist_x86 dist_x86_64 libs_x86 libs_x86_64
+.PHONY: all install uninstall clean

@@ -55,6 +55,7 @@ RetroArch has been ported to the following platforms outside PC:
   - Xbox 360 (Libxenon/XeXDK)
   - Xbox 1
   - Wii, Gamecube (Libogc)
+   - Nintendo 3DS
   - Raspberry Pi
   - Android
   - iOS
@@ -62,9 +63,14 @@ RetroArch has been ported to the following platforms outside PC:

 ## Dependencies (PC)

-On Windows, RetroArch can run with only Win32 as dependency. On Linux, you need:
+There are no true hard dependencies per se.

-   - GL headers
+On Windows, RetroArch can run with only Win32 as dependency.
+
+On Linux, there are no true dependencies. For optimal usage, the
+following dependencies come as recommended:
+
+   - GL headers / Vulkan headers
   - X11 headers and libs, or EGL/KMS/GBM

 OSX port of RetroArch requires latest versions of XCode to build.
@@ -18,6 +18,8 @@

 #include <retro_assert.h>

+#include <lists/string_list.h>
+
 #include "audio_driver.h"
 #include "audio_resampler_driver.h"
 #include "../record/record_driver.h"
@@ -26,10 +28,11 @@

 #include "../command_event.h"
 #include "../configuration.h"
-#include "../general.h"
+#include "../retroarch.h"
+#include "../runloop.h"
 #include "../performance.h"
 #include "../verbosity.h"
-#include "../string_list_special.h"
+#include "../list_special.h"

 #ifndef AUDIO_BUFFER_FREE_SAMPLES_COUNT
 #define AUDIO_BUFFER_FREE_SAMPLES_COUNT (8 * 1024)
@@ -40,33 +43,51 @@ typedef struct audio_driver_input_data
   float *data;

   size_t data_ptr;
-   size_t chunk_size;
-   size_t nonblock_chunk_size;
-   size_t block_chunk_size;
+   struct
+   {
+      size_t size;
+      size_t nonblock_size;
+      size_t block_size;
+   } chunk;

-   double src_ratio;
-   float in_rate;
+
+   struct
+   {
+      float input;
+      bool  control; 
+      struct
+      {
+         double original;
+         double current;
+      } source_ratio;
+   } audio_rate;

   bool use_float;

-   float *outsamples;
-   int16_t *conv_outsamples;
-
-   int16_t *rewind_buf;
-   size_t rewind_ptr;
-   size_t rewind_size;
+   struct
+   {
+      int16_t *buf;
+      size_t ptr;
+      size_t size;
+   } rewind;

   rarch_dsp_filter_t *dsp;

-   bool rate_control; 
-   double orig_src_ratio;
   size_t driver_buffer_size;

   float volume_gain;
-   struct retro_audio_callback audio_callback;

-   unsigned buffer_free_samples[AUDIO_BUFFER_FREE_SAMPLES_COUNT];
-   uint64_t buffer_free_samples_count;
+   struct
+   {
+      float *buf;
+      int16_t *conv_buf;
+   } output_samples;
+
+   struct
+   {
+      unsigned buf[AUDIO_BUFFER_FREE_SAMPLES_COUNT];
+      uint64_t count;
+   } free_samples;
 } audio_driver_input_data_t;

 static const audio_driver_t *audio_drivers[] = {
@@ -131,12 +152,10 @@ static const audio_driver_t *audio_drivers[] = {
   &audio_null,
   NULL,
 };
-static const rarch_resampler_t *audio_driver_resampler;
-static void *audio_driver_resampler_data;
-static const audio_driver_t *current_audio;
-static void *audio_driver_context_audio_data;

 static audio_driver_input_data_t audio_driver_data;
+static const audio_driver_t *current_audio   = NULL;
+static void *audio_driver_context_audio_data = NULL;

 /**
 * compute_audio_buffer_statistics:
@@ -148,22 +167,25 @@ static void compute_audio_buffer_statistics(void)
 {
   unsigned i, low_water_size, high_water_size, avg, stddev;
   float avg_filled, deviation;
-   uint64_t accum = 0, accum_var = 0;
-   unsigned low_water_count = 0, high_water_count = 0;
-   unsigned samples = min(audio_driver_data.buffer_free_samples_count,
+   uint64_t accum                = 0;
+   uint64_t accum_var            = 0;
+   unsigned low_water_count      = 0;
+   unsigned high_water_count     = 0;
+   unsigned samples              = MIN(
+         audio_driver_data.free_samples.count,
         AUDIO_BUFFER_FREE_SAMPLES_COUNT);

   if (samples < 3)
      return;

   for (i = 1; i < samples; i++)
-      accum += audio_driver_data.buffer_free_samples[i];
+      accum += audio_driver_data.free_samples.buf[i];

   avg = accum / (samples - 1);

   for (i = 1; i < samples; i++)
   {
-      int diff = avg - audio_driver_data.buffer_free_samples[i];
+      int diff = avg - audio_driver_data.free_samples.buf[i];
      accum_var += diff * diff;
   }

@@ -176,9 +198,9 @@ static void compute_audio_buffer_statistics(void)

   for (i = 1; i < samples; i++)
   {
-      if (audio_driver_data.buffer_free_samples[i] >= low_water_size)
+      if (audio_driver_data.free_samples.buf[i] >= low_water_size)
         low_water_count++;
-      else if (audio_driver_data.buffer_free_samples[i] <= high_water_size)
+      else if (audio_driver_data.free_samples.buf[i] <= high_water_size)
         high_water_count++;
   }

@@ -243,14 +265,15 @@ static bool uninit_audio(void)
      audio_driver_context_audio_data = NULL;
   }

-   if (audio_driver_data.conv_outsamples)
-      free(audio_driver_data.conv_outsamples);
-   audio_driver_data.conv_outsamples = NULL;
-   audio_driver_data.data_ptr        = 0;
+   if (audio_driver_data.output_samples.conv_buf)
+      free(audio_driver_data.output_samples.conv_buf);
+   audio_driver_data.output_samples.conv_buf = NULL;
+   audio_driver_data.data_ptr                = 0;

-   if (audio_driver_data.rewind_buf)
-      free(audio_driver_data.rewind_buf);
-   audio_driver_data.rewind_buf = NULL;
+   if (audio_driver_data.rewind.buf)
+      free(audio_driver_data.rewind.buf);
+   audio_driver_data.rewind.buf   = NULL;
+   audio_driver_data.rewind.size  = 0;

   if (!settings->audio.enable)
   {
@@ -258,25 +281,24 @@ static bool uninit_audio(void)
      return false;
   }

-   rarch_resampler_freep(&audio_driver_resampler,
-         &audio_driver_resampler_data);
+   audio_driver_ctl(RARCH_AUDIO_CTL_RESAMPLER_DEINIT, NULL);

   if (audio_driver_data.data)
      free(audio_driver_data.data);
   audio_driver_data.data = NULL;

-   if (audio_driver_data.outsamples)
-      free(audio_driver_data.outsamples);
-   audio_driver_data.outsamples = NULL;
+   if (audio_driver_data.output_samples.buf)
+      free(audio_driver_data.output_samples.buf);
+   audio_driver_data.output_samples.buf = NULL;

-   event_command(EVENT_CMD_DSP_FILTER_DEINIT);
+   event_cmd_ctl(EVENT_CMD_DSP_FILTER_DEINIT, NULL);

   compute_audio_buffer_statistics();

   return true;
 }

-static bool init_audio(void)
+static bool init_audio(bool audio_cb_inited)
 {
   size_t outsamples_max, max_bufsamples = AUDIO_CHUNK_SIZE_NONBLOCKING * 2;
   settings_t *settings = config_get_ptr();
@@ -288,25 +310,25 @@ static bool init_audio(void)
      settings->slowmotion_ratio;

   /* Used for recording even if audio isn't enabled. */
-   retro_assert(audio_driver_data.conv_outsamples =
+   retro_assert(audio_driver_data.output_samples.conv_buf =
         (int16_t*)malloc(outsamples_max * sizeof(int16_t)));

-   if (!audio_driver_data.conv_outsamples)
+   if (!audio_driver_data.output_samples.conv_buf)
      goto error;

-   audio_driver_data.block_chunk_size    = AUDIO_CHUNK_SIZE_BLOCKING;
-   audio_driver_data.nonblock_chunk_size = AUDIO_CHUNK_SIZE_NONBLOCKING;
-   audio_driver_data.chunk_size          = audio_driver_data.block_chunk_size;
+   audio_driver_data.chunk.block_size    = AUDIO_CHUNK_SIZE_BLOCKING;
+   audio_driver_data.chunk.nonblock_size = AUDIO_CHUNK_SIZE_NONBLOCKING;
+   audio_driver_data.chunk.size          = audio_driver_data.chunk.block_size;

   /* Needs to be able to hold full content of a full max_bufsamples
    * in addition to its own. */
-   retro_assert(audio_driver_data.rewind_buf = (int16_t*)
+   retro_assert(audio_driver_data.rewind.buf = (int16_t*)
         malloc(max_bufsamples * sizeof(int16_t)));

-   if (!audio_driver_data.rewind_buf)
+   if (!audio_driver_data.rewind.buf)
      goto error;

-   audio_driver_data.rewind_size             = max_bufsamples;
+   audio_driver_data.rewind.size             = max_bufsamples;

   if (!settings->audio.enable)
   {
@@ -316,10 +338,12 @@ static bool init_audio(void)

   audio_driver_ctl(RARCH_AUDIO_CTL_FIND_DRIVER, NULL);
 #ifdef HAVE_THREADS
-   if (audio_driver_data.audio_callback.callback)
+   if (audio_cb_inited)
   {
      RARCH_LOG("Starting threaded audio driver ...\n");
-      if (!rarch_threaded_audio_init(&current_audio, &audio_driver_context_audio_data,
+      if (!rarch_threaded_audio_init(
+               &current_audio,
+               &audio_driver_context_audio_data,
               *settings->audio.device ? settings->audio.device : NULL,
               settings->audio.out_rate, settings->audio.latency,
               current_audio))
@@ -331,9 +355,10 @@ static bool init_audio(void)
   else
 #endif
   {
-      audio_driver_context_audio_data = current_audio->init(*settings->audio.device ?
-            settings->audio.device : NULL,
-            settings->audio.out_rate, settings->audio.latency);
+      audio_driver_context_audio_data = 
+         current_audio->init(*settings->audio.device ?
+               settings->audio.device : NULL,
+               settings->audio.out_rate, settings->audio.latency);
   }

   if (!audio_driver_context_audio_data)
@@ -343,29 +368,29 @@ static bool init_audio(void)
   }

   audio_driver_data.use_float = false;
-   if (audio_driver_ctl(RARCH_AUDIO_CTL_IS_ACTIVE, NULL) && current_audio->use_float(audio_driver_context_audio_data))
+   if (     audio_driver_ctl(RARCH_AUDIO_CTL_IS_ACTIVE, NULL) 
+         && current_audio->use_float(audio_driver_context_audio_data))
      audio_driver_data.use_float = true;

   if (!settings->audio.sync && audio_driver_ctl(RARCH_AUDIO_CTL_IS_ACTIVE, NULL))
   {
-      event_command(EVENT_CMD_AUDIO_SET_NONBLOCKING_STATE);
-      audio_driver_data.chunk_size = audio_driver_data.nonblock_chunk_size;
+      event_cmd_ctl(EVENT_CMD_AUDIO_SET_NONBLOCKING_STATE, NULL);
+      audio_driver_data.chunk.size = audio_driver_data.chunk.nonblock_size;
   }

-   if (audio_driver_data.in_rate <= 0.0f)
+   if (audio_driver_data.audio_rate.input <= 0.0f)
   {
      /* Should never happen. */
      RARCH_WARN("Input rate is invalid (%.3f Hz). Using output rate (%u Hz).\n",
-            audio_driver_data.in_rate, settings->audio.out_rate);
-      audio_driver_data.in_rate = settings->audio.out_rate;
+            audio_driver_data.audio_rate.input, settings->audio.out_rate);
+      audio_driver_data.audio_rate.input = settings->audio.out_rate;
   }

-   audio_driver_data.orig_src_ratio = audio_driver_data.src_ratio =
-      (double)settings->audio.out_rate / audio_driver_data.in_rate;
+   audio_driver_data.audio_rate.source_ratio.original   = 
+      audio_driver_data.audio_rate.source_ratio.current =
+      (double)settings->audio.out_rate / audio_driver_data.audio_rate.input;

-   if (!rarch_resampler_realloc(&audio_driver_resampler_data,
-            &audio_driver_resampler,
-         settings->audio.resampler, audio_driver_data.orig_src_ratio))
+   if (!audio_driver_ctl(RARCH_AUDIO_CTL_RESAMPLER_INIT, NULL))
   {
      RARCH_ERR("Failed to initialize resampler \"%s\".\n",
            settings->audio.resampler);
@@ -381,16 +406,16 @@ static bool init_audio(void)
   audio_driver_data.data_ptr = 0;

   retro_assert(settings->audio.out_rate <
-         audio_driver_data.in_rate * AUDIO_MAX_RATIO);
-   retro_assert(audio_driver_data.outsamples = (float*)
+         audio_driver_data.audio_rate.input * AUDIO_MAX_RATIO);
+   retro_assert(audio_driver_data.output_samples.buf = (float*)
         malloc(outsamples_max * sizeof(float)));

-   if (!audio_driver_data.outsamples)
+   if (!audio_driver_data.output_samples.buf)
      goto error;

-   audio_driver_data.rate_control = false;
+   audio_driver_data.audio_rate.control = false;
   if (
-         !audio_driver_data.audio_callback.callback 
+         !audio_cb_inited
         && audio_driver_ctl(RARCH_AUDIO_CTL_IS_ACTIVE, NULL) 
         && settings->audio.rate_control
         )
@@ -401,21 +426,21 @@ static bool init_audio(void)
      {
         audio_driver_data.driver_buffer_size = 
            current_audio->buffer_size(audio_driver_context_audio_data);
-         audio_driver_data.rate_control = true;
+         audio_driver_data.audio_rate.control = true;
      }
      else
         RARCH_WARN("Audio rate control was desired, but driver does not support needed features.\n");
   }

-   event_command(EVENT_CMD_DSP_FILTER_INIT);
+   event_cmd_ctl(EVENT_CMD_DSP_FILTER_INIT, NULL);

-   audio_driver_data.buffer_free_samples_count = 0;
+   audio_driver_data.free_samples.count = 0;

   /* Threaded driver is initially stopped. */
   if (
         audio_driver_ctl(RARCH_AUDIO_CTL_IS_ACTIVE, NULL)
         && !settings->audio.mute_enable
-         && audio_driver_data.audio_callback.callback
+         && audio_cb_inited
         )
      audio_driver_ctl(RARCH_AUDIO_CTL_START, NULL);

@@ -433,10 +458,11 @@ error:
 static void audio_driver_readjust_input_rate(void)
 {
   settings_t *settings = config_get_ptr();
-   unsigned write_idx   = audio_driver_data.buffer_free_samples_count++ &
+   unsigned write_idx   = audio_driver_data.free_samples.count++ &
      (AUDIO_BUFFER_FREE_SAMPLES_COUNT - 1);
   int      half_size   = audio_driver_data.driver_buffer_size / 2;
-   int      avail       = current_audio->write_avail(audio_driver_context_audio_data);
+   int      avail       = 
+      current_audio->write_avail(audio_driver_context_audio_data);
   int      delta_mid   = avail - half_size;
   double   direction   = (double)delta_mid / half_size;
   double   adjust      = 1.0 + settings->audio.rate_control_delta * direction;
@@ -446,12 +472,14 @@ static void audio_driver_readjust_input_rate(void)
         (unsigned)(100 - (avail * 100) / audio_driver_data.driver_buffer_size));
 #endif

-   audio_driver_data.buffer_free_samples[write_idx] = avail;
-   audio_driver_data.src_ratio = audio_driver_data.orig_src_ratio * adjust;
+   audio_driver_data.free_samples.buf[write_idx] = avail;
+   audio_driver_data.audio_rate.source_ratio.current = 
+      audio_driver_data.audio_rate.source_ratio.original * adjust;

 #if 0
   RARCH_LOG_OUTPUT("New rate: %lf, Orig rate: %lf\n",
-         audio_driver_data.src_ratio, audio_driver_data.orig_src_ratio);
+         audio_driver_data.audio_rate.source_ratio.current,
+         audio_driver_data.audio_rate.source_ratio.original);
 #endif
 }

@@ -465,8 +493,9 @@ void audio_driver_set_nonblocking_state(bool enable)
      current_audio->set_nonblock_state(audio_driver_context_audio_data,
            settings->audio.sync ? enable : true);

-   audio_driver_data.chunk_size = enable ? audio_driver_data.nonblock_chunk_size : 
-      audio_driver_data.block_chunk_size;
+   audio_driver_data.chunk.size = enable ? 
+      audio_driver_data.chunk.nonblock_size : 
+      audio_driver_data.chunk.block_size;
 }

 /**
@@ -482,11 +511,9 @@ void audio_driver_set_nonblocking_state(bool enable)
 **/
 static bool audio_driver_flush(const int16_t *data, size_t samples)
 {
-   bool is_slowmotion;
   static struct retro_perf_counter audio_convert_s16 = {0};
   static struct retro_perf_counter audio_convert_float = {0};
   static struct retro_perf_counter audio_dsp         = {0};
-   static struct retro_perf_counter resampler_proc    = {0};
   struct resampler_data src_data              = {0};
   struct rarch_dsp_data dsp_data              = {0};
   const void *output_data                     = NULL;
@@ -498,7 +525,9 @@ static bool audio_driver_flush(const int16_t *data, size_t samples)

   if (runloop_ctl(RUNLOOP_CTL_IS_PAUSED, NULL) || settings->audio.mute_enable)
      return true;
-   if (!audio_driver_ctl(RARCH_AUDIO_CTL_IS_ACTIVE, NULL) || !audio_driver_data.data)
+   if (!audio_driver_ctl(RARCH_AUDIO_CTL_IS_ACTIVE, NULL))
+      return false;
+   if (!audio_driver_data.data)
      return false;

   rarch_perf_init(&audio_convert_s16, "audio_convert_s16");
@@ -527,35 +556,30 @@ static bool audio_driver_flush(const int16_t *data, size_t samples)
      }
   }

-   src_data.data_out = audio_driver_data.outsamples;
+   src_data.data_out = audio_driver_data.output_samples.buf;

-   if (audio_driver_data.rate_control)
+   if (audio_driver_data.audio_rate.control)
      audio_driver_readjust_input_rate();

-   src_data.ratio = audio_driver_data.src_ratio;
+   src_data.ratio = audio_driver_data.audio_rate.source_ratio.current;

-   runloop_ctl(RUNLOOP_CTL_IS_SLOWMOTION, &is_slowmotion);
-
-   if (is_slowmotion)
+   if (runloop_ctl(RUNLOOP_CTL_IS_SLOWMOTION, NULL))
      src_data.ratio *= settings->slowmotion_ratio;

-   rarch_perf_init(&resampler_proc, "resampler_proc");
-   retro_perf_start(&resampler_proc);
-   rarch_resampler_process(audio_driver_resampler, audio_driver_resampler_data, &src_data);
-   retro_perf_stop(&resampler_proc);
+   audio_driver_ctl(RARCH_AUDIO_CTL_RESAMPLER_PROCESS, &src_data);

-   output_data   = audio_driver_data.outsamples;
+   output_data   = audio_driver_data.output_samples.buf;
   output_frames = src_data.output_frames;

   if (!audio_driver_data.use_float)
   {
      rarch_perf_init(&audio_convert_float, "audio_convert_float");
      retro_perf_start(&audio_convert_float);
-      audio_convert_float_to_s16(audio_driver_data.conv_outsamples,
+      audio_convert_float_to_s16(audio_driver_data.output_samples.conv_buf,
            (const float*)output_data, output_frames * 2);
      retro_perf_stop(&audio_convert_float);

-      output_data = audio_driver_data.conv_outsamples;
+      output_data = audio_driver_data.output_samples.conv_buf;
      output_size = sizeof(int16_t);
   }

@@ -578,13 +602,14 @@ static bool audio_driver_flush(const int16_t *data, size_t samples)
 **/
 void audio_driver_sample(int16_t left, int16_t right)
 {
-   audio_driver_data.conv_outsamples[audio_driver_data.data_ptr++] = left;
-   audio_driver_data.conv_outsamples[audio_driver_data.data_ptr++] = right;
+   audio_driver_data.output_samples.conv_buf[audio_driver_data.data_ptr++] = left;
+   audio_driver_data.output_samples.conv_buf[audio_driver_data.data_ptr++] = right;

-   if (audio_driver_data.data_ptr < audio_driver_data.chunk_size)
+   if (audio_driver_data.data_ptr < audio_driver_data.chunk.size)
      return;

-   audio_driver_flush(audio_driver_data.conv_outsamples, audio_driver_data.data_ptr);
+   audio_driver_flush(audio_driver_data.output_samples.conv_buf, 
+         audio_driver_data.data_ptr);

   audio_driver_data.data_ptr = 0;
 }
@@ -614,13 +639,14 @@ size_t audio_driver_sample_batch(const int16_t *data, size_t frames)
 * @left                 : value of the left audio channel.
 * @right                : value of the right audio channel.
 *
- * Audio sample render callback function (rewind version). This callback
- * function will be used instead of audio_driver_sample when rewinding is activated.
+ * Audio sample render callback function (rewind version). 
+ * This callback function will be used instead of 
+ * audio_driver_sample when rewinding is activated.
 **/
 void audio_driver_sample_rewind(int16_t left, int16_t right)
 {
-   audio_driver_data.rewind_buf[--audio_driver_data.rewind_ptr] = right;
-   audio_driver_data.rewind_buf[--audio_driver_data.rewind_ptr] = left;
+   audio_driver_data.rewind.buf[--audio_driver_data.rewind.ptr] = right;
+   audio_driver_data.rewind.buf[--audio_driver_data.rewind.ptr] = left;
 }

 /**
@@ -628,8 +654,10 @@ void audio_driver_sample_rewind(int16_t left, int16_t right)
 * @data                 : pointer to audio buffer.
 * @frames               : amount of audio frames to push.
 *
- * Batched audio sample render callback function (rewind version). This callback
- * function will be used instead of audio_driver_sample_batch when rewinding is activated.
+ * Batched audio sample render callback function (rewind version). 
+ *
+ * This callback function will be used instead of 
+ * audio_driver_sample_batch when rewinding is activated.
 *
 * Returns: amount of frames sampled. Will be equal to @frames
 * unless @frames exceeds (AUDIO_CHUNK_SIZE_NONBLOCKING / 2).
@@ -640,7 +668,7 @@ size_t audio_driver_sample_batch_rewind(const int16_t *data, size_t frames)
   size_t samples   = frames << 1;

   for (i = 0; i < samples; i++)
-      audio_driver_data.rewind_buf[--audio_driver_data.rewind_ptr] = data[i];
+      audio_driver_data.rewind.buf[--audio_driver_data.rewind.ptr] = data[i];

   return frames;
 }
@@ -659,7 +687,9 @@ void audio_driver_dsp_filter_free(void)

 void audio_driver_dsp_filter_init(const char *device)
 {
-   audio_driver_data.dsp = rarch_dsp_filter_new(device, audio_driver_data.in_rate);
+   audio_driver_data.dsp = rarch_dsp_filter_new(
+         device, audio_driver_data.audio_rate.input);
+
   if (!audio_driver_data.dsp)
      RARCH_ERR("[DSP]: Failed to initialize DSP filter \"%s\".\n", device);
 }
@@ -669,29 +699,6 @@ void audio_driver_set_buffer_size(size_t bufsize)
   audio_driver_data.driver_buffer_size = bufsize;
 }

-void audio_driver_unset_callback(void)
-{
-   audio_driver_data.audio_callback.callback  = NULL;
-   audio_driver_data.audio_callback.set_state = NULL;
-}
-
-void audio_driver_set_callback(const void *data)
-{
-   const struct retro_audio_callback *cb = 
-      (const struct retro_audio_callback*)data;
-
-   if (cb)
-      audio_driver_data.audio_callback = *cb;
-}
-
-void audio_driver_callback_set_state(bool state)
-{
-   if (!audio_driver_ctl(RARCH_AUDIO_CTL_HAS_CALLBACK, NULL))
-      return;
-
-   if (audio_driver_data.audio_callback.set_state)
-      audio_driver_data.audio_callback.set_state(state);
-}

 static void audio_monitor_adjust_system_rates(void)
 {
@@ -707,13 +714,13 @@ static void audio_monitor_adjust_system_rates(void)
      return;

   timing_skew        = fabs(1.0f - info->fps / settings->video.refresh_rate);
-   audio_driver_data.in_rate = info->sample_rate;
+   audio_driver_data.audio_rate.input = info->sample_rate;

   if (timing_skew <= settings->audio.max_timing_skew)
-      audio_driver_data.in_rate *= (settings->video.refresh_rate / info->fps);
+      audio_driver_data.audio_rate.input *= (settings->video.refresh_rate / info->fps);

   RARCH_LOG("Set audio input rate to: %.2f Hz.\n",
-         audio_driver_data.in_rate);
+         audio_driver_data.audio_rate.input);
 }

 static void audio_driver_setup_rewind(void)
@@ -721,15 +728,15 @@ static void audio_driver_setup_rewind(void)
   unsigned i;

   /* Push audio ready to be played. */
-   audio_driver_data.rewind_ptr = audio_driver_data.rewind_size;
+   audio_driver_data.rewind.ptr = audio_driver_data.rewind.size;

   for (i = 0; i < audio_driver_data.data_ptr; i += 2)
   {
-      audio_driver_data.rewind_buf[--audio_driver_data.rewind_ptr] =
-         audio_driver_data.conv_outsamples[i + 1];
+      audio_driver_data.rewind.buf[--audio_driver_data.rewind.ptr] =
+         audio_driver_data.output_samples.conv_buf[i + 1];

-      audio_driver_data.rewind_buf[--audio_driver_data.rewind_ptr] =
-         audio_driver_data.conv_outsamples[i + 0];
+      audio_driver_data.rewind.buf[--audio_driver_data.rewind.ptr] =
+         audio_driver_data.output_samples.conv_buf[i + 0];
   }

   audio_driver_data.data_ptr = 0;
@@ -737,9 +744,16 @@ static void audio_driver_setup_rewind(void)

 static bool find_audio_driver(void)
 {
+   int i;
+   driver_ctx_info_t drv;
   settings_t *settings = config_get_ptr();

-   int i = find_driver_index("audio_driver", settings->audio.driver);
+   drv.label = "audio_driver";
+   drv.s     = settings->audio.driver;
+
+   driver_ctl(RARCH_DRIVER_CTL_FIND_INDEX, &drv);
+
+   i = drv.len;

   if (i >= 0)
      current_audio = (const audio_driver_t*)audio_driver_find_handle(i);
@@ -764,16 +778,62 @@ static bool find_audio_driver(void)

 bool audio_driver_ctl(enum rarch_audio_ctl_state state, void *data)
 {
-   static bool audio_driver_active   = false;
-   static bool audio_driver_data_own = false;
-   settings_t        *settings       = config_get_ptr();
+   static struct retro_audio_callback audio_callback;
+   static struct string_list *audio_driver_devices_list   = NULL;
+   static struct retro_perf_counter resampler_proc        = {0};
+   static const rarch_resampler_t *audio_driver_resampler = NULL;
+   static void *audio_driver_resampler_data               = NULL;
+   static bool audio_driver_active                        = false;
+   static bool audio_driver_data_own                      = false;
+   settings_t        *settings                            = config_get_ptr();

   switch (state)
   {
-      case RARCH_AUDIO_CTL_NONE:
+      case RARCH_AUDIO_CTL_RESAMPLER_DEINIT:
+         rarch_resampler_freep(&audio_driver_resampler,
+               &audio_driver_resampler_data);
+         break;
+      case RARCH_AUDIO_CTL_DEVICES_LIST_FREE:
+         if (!current_audio || !current_audio->device_list_free
+               || !audio_driver_context_audio_data)
+            return false;
+         current_audio->device_list_free(audio_driver_context_audio_data, 
+               audio_driver_devices_list);
+         audio_driver_devices_list = NULL;
+         break;
+      case RARCH_AUDIO_CTL_DEVICES_LIST_NEW:
+         if (!current_audio || !current_audio->device_list_new
+               || !audio_driver_context_audio_data)
+            return false;
+         audio_driver_devices_list = (struct string_list*)
+            current_audio->device_list_new(audio_driver_context_audio_data);
+         if (!audio_driver_devices_list)
+            return false;
+         break;
+      case RARCH_AUDIO_CTL_DEVICES_LIST_GET:
+         {
+            struct string_list**ptr = (struct string_list**)data;
+            if (!ptr)
+               return false;
+            *ptr = audio_driver_devices_list;
+         }
+         break;
+      case RARCH_AUDIO_CTL_RESAMPLER_INIT:
+         return rarch_resampler_realloc(
+               &audio_driver_resampler_data,
+               &audio_driver_resampler,
+               settings->audio.resampler,
+               audio_driver_data.audio_rate.source_ratio.original);
+      case RARCH_AUDIO_CTL_RESAMPLER_PROCESS:
+         rarch_perf_init(&resampler_proc, "resampler_proc");
+         retro_perf_start(&resampler_proc);
+         rarch_resampler_process(audio_driver_resampler, 
+               audio_driver_resampler_data,
+               (struct resampler_data*)data);
+         retro_perf_stop(&resampler_proc);
         break;
      case RARCH_AUDIO_CTL_INIT:
-         return init_audio();
+         return init_audio(audio_callback.callback != NULL);
      case RARCH_AUDIO_CTL_DESTROY:
         audio_driver_active   = false;
         audio_driver_data_own = false;
@@ -783,57 +843,99 @@ bool audio_driver_ctl(enum rarch_audio_ctl_state state, void *data)
         audio_driver_context_audio_data = NULL;
         break;
      case RARCH_AUDIO_CTL_DEINIT:
-         if (uninit_audio())
-            return true;
+         audio_driver_ctl(RARCH_AUDIO_CTL_DEVICES_LIST_FREE, NULL);
+         if (!uninit_audio())
+            return false;
         break;
      case RARCH_AUDIO_CTL_SETUP_REWIND:
         audio_driver_setup_rewind();
-         return true;
+         break;
+      case RARCH_AUDIO_CTL_SET_CALLBACK_ENABLE:
+         if (!audio_driver_ctl(RARCH_AUDIO_CTL_HAS_CALLBACK, NULL))
+            return false; 
+         if (audio_callback.set_state)
+            audio_callback.set_state(true);
+         break;
+      case RARCH_AUDIO_CTL_SET_CALLBACK_DISABLE:
+         if (!audio_driver_ctl(RARCH_AUDIO_CTL_HAS_CALLBACK, NULL))
+            return false;
+
+         if (audio_callback.set_state)
+            audio_callback.set_state(false);
+         break;
      case RARCH_AUDIO_CTL_HAS_CALLBACK:
-         return audio_driver_data.audio_callback.callback;
+         return audio_callback.callback;
      case RARCH_AUDIO_CTL_CALLBACK:
         if (!audio_driver_ctl(RARCH_AUDIO_CTL_HAS_CALLBACK, NULL))
            return false;

-         if (audio_driver_data.audio_callback.callback)
-            audio_driver_data.audio_callback.callback();
-         return true;
+         if (audio_callback.callback)
+            audio_callback.callback();
+         break;
+      case RARCH_AUDIO_CTL_UNSET_CALLBACK:
+         audio_callback.callback  = NULL;
+         audio_callback.set_state = NULL;
+         break;
+      case RARCH_AUDIO_CTL_SET_CALLBACK:
+         {
+            const struct retro_audio_callback *cb = 
+               (const struct retro_audio_callback*)data;
+#ifdef HAVE_NETPLAY
+            global_t *global = global_get_ptr();
+#endif
+
+            if (recording_driver_get_data_ptr()) /* A/V sync is a must. */
+               return false;
+
+#ifdef HAVE_NETPLAY
+            if (global->netplay.enable)
+               return false;
+#endif
+            if (cb)
+               audio_callback = *cb;
+         }
+         break;
      case RARCH_AUDIO_CTL_MONITOR_ADJUST_SYSTEM_RATES:
         audio_monitor_adjust_system_rates();
-         return true;
+         break;
      case RARCH_AUDIO_CTL_MONITOR_SET_REFRESH_RATE:
         {
            double new_src_ratio = (double)settings->audio.out_rate / 
-               audio_driver_data.in_rate;
+               audio_driver_data.audio_rate.input;

-            audio_driver_data.orig_src_ratio = new_src_ratio;
-            audio_driver_data.src_ratio      = new_src_ratio;
+            audio_driver_data.audio_rate.source_ratio.original = new_src_ratio;
+            audio_driver_data.audio_rate.source_ratio.current  = new_src_ratio;
         }
-         return true;
+         break;
      case RARCH_AUDIO_CTL_MUTE_TOGGLE:
-         if (!audio_driver_context_audio_data || !audio_driver_ctl(RARCH_AUDIO_CTL_IS_ACTIVE, NULL))
+         if (!audio_driver_context_audio_data)
+            return false;
+         if (!audio_driver_ctl(RARCH_AUDIO_CTL_IS_ACTIVE, NULL))
            return false;

         settings->audio.mute_enable = !settings->audio.mute_enable;

         if (settings->audio.mute_enable)
-            event_command(EVENT_CMD_AUDIO_STOP);
-         else if (!event_command(EVENT_CMD_AUDIO_START))
+            event_cmd_ctl(EVENT_CMD_AUDIO_STOP, NULL);
+         else if (!event_cmd_ctl(EVENT_CMD_AUDIO_START, NULL))
         {
            audio_driver_ctl(RARCH_AUDIO_CTL_UNSET_ACTIVE, NULL);
            return false;
         }
-         return true;
+         break;
      case RARCH_AUDIO_CTL_ALIVE:
-         if (!current_audio || !current_audio->alive || !audio_driver_context_audio_data)
+         if (!current_audio || !current_audio->alive 
+               || !audio_driver_context_audio_data)
            return false;
         return current_audio->alive(audio_driver_context_audio_data);
      case RARCH_AUDIO_CTL_START:
-         if (!current_audio || !current_audio->start || !audio_driver_context_audio_data)
+         if (!current_audio || !current_audio->start 
+               || !audio_driver_context_audio_data)
            return false;
         return current_audio->start(audio_driver_context_audio_data);
      case RARCH_AUDIO_CTL_STOP:
-         if (!current_audio || !current_audio->stop || !audio_driver_context_audio_data)
+         if (!current_audio || !current_audio->stop 
+               || !audio_driver_context_audio_data)
            return false;
         return current_audio->stop(audio_driver_context_audio_data);
      case RARCH_AUDIO_CTL_FIND_DRIVER:
@@ -856,10 +958,14 @@ bool audio_driver_ctl(enum rarch_audio_ctl_state state, void *data)
         return audio_driver_active;
      case RARCH_AUDIO_CTL_FRAME_IS_REVERSE:
         /* We just rewound. Flush rewind audio buffer. */
-         audio_driver_flush(audio_driver_data.rewind_buf + audio_driver_data.rewind_ptr,
-               audio_driver_data.rewind_size - audio_driver_data.rewind_ptr);
-         return true;
+         audio_driver_flush(
+               audio_driver_data.rewind.buf + audio_driver_data.rewind.ptr,
+               audio_driver_data.rewind.size - audio_driver_data.rewind.ptr);
+         break;
+      case RARCH_AUDIO_CTL_NONE:
+      default:
+         break;
   }

-   return false;
+   return true;
 }
@@ -27,6 +27,13 @@
 extern "C" {
 #endif

+#define AUDIO_CHUNK_SIZE_BLOCKING      512
+
+/* So we don't get complete line-noise when fast-forwarding audio. */
+#define AUDIO_CHUNK_SIZE_NONBLOCKING   2048
+
+#define AUDIO_MAX_RATIO                16
+
 enum rarch_audio_ctl_state
 {
   RARCH_AUDIO_CTL_NONE = 0,
@@ -42,6 +49,10 @@ enum rarch_audio_ctl_state
   RARCH_AUDIO_CTL_MONITOR_SET_REFRESH_RATE,
   RARCH_AUDIO_CTL_MONITOR_ADJUST_SYSTEM_RATES,
   RARCH_AUDIO_CTL_MUTE_TOGGLE,
+   RARCH_AUDIO_CTL_SET_CALLBACK_ENABLE,
+   RARCH_AUDIO_CTL_SET_CALLBACK_DISABLE,
+   RARCH_AUDIO_CTL_SET_CALLBACK,
+   RARCH_AUDIO_CTL_UNSET_CALLBACK,
   RARCH_AUDIO_CTL_CALLBACK,
   RARCH_AUDIO_CTL_HAS_CALLBACK,
   RARCH_AUDIO_CTL_ALIVE,
@@ -51,7 +62,13 @@ enum rarch_audio_ctl_state
   RARCH_AUDIO_CTL_OWNS_DRIVER,
   RARCH_AUDIO_CTL_SET_ACTIVE,
   RARCH_AUDIO_CTL_UNSET_ACTIVE,
-   RARCH_AUDIO_CTL_IS_ACTIVE
+   RARCH_AUDIO_CTL_IS_ACTIVE,
+   RARCH_AUDIO_CTL_RESAMPLER_DEINIT,
+   RARCH_AUDIO_CTL_RESAMPLER_INIT,
+   RARCH_AUDIO_CTL_RESAMPLER_PROCESS,
+   RARCH_AUDIO_CTL_DEVICES_LIST_NEW,
+   RARCH_AUDIO_CTL_DEVICES_LIST_FREE,
+   RARCH_AUDIO_CTL_DEVICES_LIST_GET
 };

 typedef struct audio_driver
@@ -93,6 +110,12 @@ typedef struct audio_driver
   /* Human-readable identifier. */
   const char *ident;

+   /* Optional. Get audio device list (allocates, caller has to free this) */
+   void *(*device_list_new)(void *data);
+
+   /* Optional. Frees audio device list */
+   void (*device_list_free)(void *data, void *data2);
+
   /* Optional. */
   size_t (*write_avail)(void *data);

@@ -147,12 +170,6 @@ void audio_driver_dsp_filter_init(const char *device);

 void audio_driver_set_buffer_size(size_t bufsize);

-void audio_driver_set_callback(const void *info);
-void audio_driver_unset_callback(void);
-
-void audio_driver_callback_set_state(bool state);
-
-
 extern audio_driver_t audio_rsound;
 extern audio_driver_t audio_oss;
 extern audio_driver_t audio_alsa;
@@ -22,16 +22,15 @@
 #include <dynamic/dylib.h>

 #include <file/file_path.h>
-#include <file/config_file_userdata.h>
-#include <file/dir_list.h>
-
-#include "../performance.h"
+#include <lists/dir_list.h>

 #include "audio_dsp_filter.h"
-#include "../dynamic.h"
 #include "audio_filters/dspfilter.h"
-#include "../file_ext.h"

+#include "../config_file_userdata.h"
+#include "../frontend/frontend_driver.h"
+#include "../performance.h"
+#include "../dynamic.h"

 struct rarch_dsp_plug
 {
@@ -226,12 +225,13 @@ static bool append_plugs(rarch_dsp_filter_t *dsp, struct string_list *list)
 rarch_dsp_filter_t *rarch_dsp_filter_new(
      const char *filter_config, float sample_rate)
 {
-   char basedir[PATH_MAX_LENGTH] = {0};
+#if !defined(HAVE_FILTERS_BUILTIN) && defined(HAVE_DYLIB)
+   char basedir[PATH_MAX_LENGTH];
+   char ext_name[PATH_MAX_LENGTH];
+#endif
   struct string_list *plugs     = NULL;
   rarch_dsp_filter_t *dsp       = NULL;

-   (void)basedir;
-   
   dsp = (rarch_dsp_filter_t*)calloc(1, sizeof(*dsp));
   if (!dsp)
      return NULL;
@@ -243,7 +243,10 @@ rarch_dsp_filter_t *rarch_dsp_filter_new(
 #if !defined(HAVE_FILTERS_BUILTIN) && defined(HAVE_DYLIB)
   fill_pathname_basedir(basedir, filter_config, sizeof(basedir));

-   plugs = dir_list_new(basedir, EXT_EXECUTABLES, false, false);
+   if (!frontend_driver_get_core_extension(ext_name, sizeof(ext_name)))
+         goto error;
+
+   plugs = dir_list_new(basedir, ext_name, false, false);
   if (!plugs)
      goto error;
 #endif
@@ -107,7 +107,7 @@ static void *echo_init(const struct dspfilter_info *info,
   config->get_float_array(userdata, "feedback", &feedback, &num_feedback, default_feedback, 1);
   config->get_float(userdata, "amp", &echo->amp, 0.2f);

-   channels       = num_feedback = num_delay = min(num_delay, num_feedback);
+   channels       = num_feedback = num_delay = MIN(num_delay, num_feedback);

   echo->channels = (struct echo_channel*)calloc(channels, sizeof(*echo->channels));
   if (!echo->channels)
@@ -276,7 +276,7 @@ static void *eq_init(const struct dspfilter_info *info,
      filter_path = NULL;
   }

-   num_gain = num_freq = min(num_gain, num_freq);
+   num_gain = num_freq = MIN(num_gain, num_freq);

   gains = (struct eq_gain*)calloc(num_gain, sizeof(*gains));
   if (!gains)
@@ -14,20 +14,24 @@
 *  If not, see <http://www.gnu.org/licenses/>.
 */

+#include <string.h>
+
+#include <string/stdstring.h>
+
 #include "audio_resampler_driver.h"
+#include "../config_file_userdata.h"
 #ifdef RARCH_INTERNAL
 #include "../performance.h"
 #endif
-#include <file/config_file_userdata.h>
-#include <string.h>
 #ifndef DONT_HAVE_STRING_LIST
-#include "../string_list_special.h"
+#include "../list_special.h"
 #endif

 static const rarch_resampler_t *resampler_drivers[] = {
   &sinc_resampler,
   &CC_resampler,
   &nearest_resampler,
+   &null_resampler,
   NULL,
 };

@@ -54,7 +58,7 @@ static int find_resampler_driver_index(const char *ident)
   unsigned i;

   for (i = 0; resampler_drivers[i]; i++)
-      if (strcasecmp(ident, resampler_drivers[i]->ident) == 0)
+      if (string_is_equal_noncase(ident, resampler_drivers[i]->ident))
         return i;
   return -1;
 }
@@ -140,6 +140,7 @@ typedef struct audio_frame_float
 extern rarch_resampler_t sinc_resampler;
 extern rarch_resampler_t CC_resampler;
 extern rarch_resampler_t nearest_resampler;
+extern rarch_resampler_t null_resampler;

 #ifndef DONT_HAVE_STRING_LIST
 /**
@@ -17,7 +17,7 @@
 #include <stdlib.h>
 #include <string.h>

-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>
 #include <rthreads/rthreads.h>

 #include "audio_thread_wrapper.h"
@@ -34,6 +34,7 @@ typedef struct audio_thread
   scond_t *cond;
   bool alive;
   bool stopped;
+   bool stopped_ack;
   bool is_paused;
   bool use_float;

@@ -81,6 +82,7 @@ static void audio_thread_loop(void *data)
      {
         scond_signal(thr->cond);
         slock_unlock(thr->lock);
+         thr->stopped_ack = true;
         break;
      }

@@ -88,7 +90,14 @@ static void audio_thread_loop(void *data)
      {
         thr->driver->stop(thr->driver_data);
         while (thr->stopped)
+         {
+            /* If we stop right after start, we might not be able to properly ack.
+             * Signal in the loop instead. */
+            thr->stopped_ack = true;
+            scond_signal(thr->cond);
+
            scond_wait(thr->cond, thr->lock);
+         }
         thr->driver->start(thr->driver_data);
      }

@@ -105,9 +114,18 @@ static void audio_thread_block(audio_thread_t *thr)
   if (!thr)
      return;

+   if (thr->stopped)
+      return;
+
   slock_lock(thr->lock);
+   thr->stopped_ack = false;
   thr->stopped = true;
   scond_signal(thr->cond);
+
+   /* Wait until audio driver actually goes to sleep. */
+   while (!thr->stopped_ack)
+      scond_wait(thr->cond, thr->lock);
+
   slock_unlock(thr->lock);
 }

@@ -167,11 +185,12 @@ static bool audio_thread_stop(void *data)
   audio_thread_t *thr = (audio_thread_t*)data;

   if (!thr)
-      return false;
+      return false; 

   audio_thread_block(thr);
   thr->is_paused = true;
-   audio_driver_callback_set_state(false);
+
+   audio_driver_ctl(RARCH_AUDIO_CTL_SET_CALLBACK_DISABLE, NULL);

   return true;
 }
@@ -183,7 +202,8 @@ static bool audio_thread_start(void *data)
   if (!thr)
      return false;

-   audio_driver_callback_set_state(true);
+   audio_driver_ctl(RARCH_AUDIO_CTL_SET_CALLBACK_ENABLE, NULL);
+
   thr->is_paused = false;
   audio_thread_unblock(thr);

@@ -15,6 +15,8 @@

 #include <stdlib.h>

+#include <lists/string_list.h>
+
 #include <alsa/asoundlib.h>

 #include "../audio_driver.h"
@@ -324,6 +326,64 @@ static size_t alsa_buffer_size(void *data)
   return alsa->buffer_size;
 }

+static void *alsa_device_list_new(void *data)
+{
+   void **hints, **n;
+   union string_list_elem_attr attr;
+   struct string_list *s = string_list_new();
+
+   if (!s)
+      return NULL;
+
+   attr.i = 0;
+
+   if (snd_device_name_hint(-1, "pcm", &hints) != 0)
+      goto error;
+
+   n      = hints;
+
+   while (*n != NULL)
+   {
+      char *name = snd_device_name_get_hint(*n, "NAME");
+      char *io   = snd_device_name_get_hint(*n, "IOID");
+      char *desc = snd_device_name_get_hint(*n, "DESC");
+
+      /* description of device IOID - input / output identifcation
+       * ("Input" or "Output"), NULL means both) */
+
+      if (!io || !strcmp(io,"Output"))
+         string_list_append(s, name, attr);
+
+      if (name)
+         free(name);
+      if (io)
+         free(io);
+      if (desc)
+         free(desc);
+
+      n++;
+   }
+
+   /* free hint buffer too */
+   snd_device_name_free_hint(hints);
+
+   return s;
+
+error:
+   string_list_free(s);
+   return NULL;
+}
+
+static void alsa_device_list_free(void *data, void *array_list_data)
+{
+   struct string_list *s = (struct string_list*)array_list_data;
+
+   if (!s)
+      return;
+
+   string_list_free(s);
+}
+
 audio_driver_t audio_alsa = {
   alsa_init,
   alsa_write,
@@ -334,6 +394,8 @@ audio_driver_t audio_alsa = {
   alsa_free,
   alsa_use_float,
   "alsa",
+   alsa_device_list_new,
+   alsa_device_list_free,
   alsa_write_avail,
   alsa_buffer_size,
 };
@@ -227,7 +227,8 @@ static ssize_t alsa_qsa_write(void *data, const void *buf, size_t size)

   while (size)
   {
-      size_t avail_write = min(alsa->buf_size - alsa->buffer_ptr, size);
+      size_t avail_write = MIN(alsa->buf_size - alsa->buffer_ptr, size);
+
      if (avail_write)
      {
         memcpy(alsa->buffer[alsa->buffer_index] + 
@@ -376,6 +377,8 @@ audio_driver_t audio_alsa = {
   alsa_qsa_free,
   alsa_qsa_use_float,
   "alsa",
+   NULL,
+   NULL,
   alsa_qsa_write_avail,
   alsa_qsa_buffer_size,
 };
@@ -16,10 +16,12 @@

 #include <stdlib.h>

+#include <lists/string_list.h>
+
 #include <alsa/asoundlib.h>

 #include <rthreads/rthreads.h>
-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>

 #include "../audio_driver.h"
 #include "../../configuration.h"
@@ -66,7 +68,7 @@ static void alsa_worker_thread(void *data)
      snd_pcm_sframes_t frames;
      slock_lock(alsa->fifo_lock);
      avail = fifo_read_avail(alsa->buffer);
-      fifo_size = min(alsa->period_size, avail);
+      fifo_size = MIN(alsa->period_size, avail);
      fifo_read(alsa->buffer, buf, fifo_size);
      scond_signal(alsa->cond);
      slock_unlock(alsa->fifo_lock);
@@ -252,11 +254,14 @@ static ssize_t alsa_thread_write(void *data, const void *buf, size_t size)
   {
      size_t avail;
      size_t write_amt;
+
      slock_lock(alsa->fifo_lock);
-      avail = fifo_write_avail(alsa->buffer);
-      write_amt = min(avail, size);
+      avail           = fifo_write_avail(alsa->buffer);
+      write_amt       = MIN(avail, size);
+
      fifo_write(alsa->buffer, buf, write_amt);
      slock_unlock(alsa->fifo_lock);
+
      return write_amt;
   }
   else
@@ -278,7 +283,7 @@ static ssize_t alsa_thread_write(void *data, const void *buf, size_t size)
         }
         else
         {
-            size_t write_amt = min(size - written, avail);
+            size_t write_amt = MIN(size - written, avail);
            fifo_write(alsa->buffer, (const char*)buf + written, write_amt);
            slock_unlock(alsa->fifo_lock);
            written += write_amt;
@@ -339,6 +344,64 @@ static size_t alsa_thread_buffer_size(void *data)
   return alsa->buffer_size;
 }

+static void *alsa_device_list_new(void *data)
+{
+   void **hints, **n;
+   union string_list_elem_attr attr;
+   struct string_list *s = string_list_new();
+
+   if (!s)
+      return NULL;
+
+   attr.i = 0;
+
+   if (snd_device_name_hint(-1, "pcm", &hints) != 0)
+      goto error;
+
+   n      = hints;
+
+   while (*n != NULL)
+   {
+      char *name = snd_device_name_get_hint(*n, "NAME");
+      char *io   = snd_device_name_get_hint(*n, "IOID");
+      char *desc = snd_device_name_get_hint(*n, "DESC");
+
+      /* description of device IOID - input / output identifcation
+       * ("Input" or "Output"), NULL means both) */
+
+      if (!io || !strcmp(io,"Output"))
+         string_list_append(s, name, attr);
+
+      if (name)
+         free(name);
+      if (io)
+         free(io);
+      if (desc)
+         free(desc);
+
+      n++;
+   }
+
+   /* free hint buffer too */
+   snd_device_name_free_hint(hints);
+
+   return s;
+
+error:
+   string_list_free(s);
+   return NULL;
+}
+
+static void alsa_device_list_free(void *data, void *array_list_data)
+{
+   struct string_list *s = (struct string_list*)array_list_data;
+
+   if (!s)
+      return;
+
+   string_list_free(s);
+}
+
 audio_driver_t audio_alsathread = {
   alsa_thread_init,
   alsa_thread_write,
@@ -349,6 +412,8 @@ audio_driver_t audio_alsathread = {
   alsa_thread_free,
   alsa_thread_use_float,
   "alsathread",
+   alsa_device_list_new,
+   alsa_device_list_free,
   alsa_thread_write_avail,
   alsa_thread_buffer_size,
 };
@@ -27,9 +27,10 @@
 #include <AudioUnit/AUComponent.h>

 #include <boolean.h>
-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>
 #include <rthreads/rthreads.h>
 #include <retro_endianness.h>
+#include <string/stdstring.h>

 #include "../audio_driver.h"
 #include "../../configuration.h"
@@ -174,7 +175,7 @@ static void choose_output_device(coreaudio_t *dev, const char* device)

      if (AudioObjectGetPropertyData(devices[i],
               &propaddr, 0, 0, &size, device_name) == noErr 
-            && !strcmp(device_name, device))
+            && string_is_equal(device_name, device))
      {
         AudioUnitSetProperty(dev->dev, kAudioOutputUnitProperty_CurrentDevice, 
               kAudioUnitScope_Global, 0, &devices[i], sizeof(AudioDeviceID));
@@ -439,6 +440,17 @@ static size_t coreaudio_buffer_size(void *data)
   return dev->buffer_size;
 }

+static void *coreaudio_device_list_new(void *data)
+{
+   /* TODO/FIXME */
+   return NULL;
+}
+
+static void coreaudio_device_list_free(void *data, void *array_list_data)
+{
+   /* TODO/FIXME */
+}
+
 audio_driver_t audio_coreaudio = {
   coreaudio_init,
   coreaudio_write,
@@ -449,6 +461,8 @@ audio_driver_t audio_coreaudio = {
   coreaudio_free,
   coreaudio_use_float,
   "coreaudio",
+   coreaudio_device_list_new,
+   coreaudio_device_list_free,
   coreaudio_write_avail,
   coreaudio_buffer_size,
 };
@@ -300,6 +300,8 @@ audio_driver_t audio_ctr_csnd = {
   ctr_csnd_audio_free,
   ctr_csnd_audio_use_float,
   "csnd",
+   NULL,
+   NULL,
   ctr_csnd_audio_write_avail,
   ctr_csnd_audio_buffer_size
 };
@@ -214,6 +214,8 @@ audio_driver_t audio_ctr_dsp = {
   ctr_dsp_audio_free,
   ctr_dsp_audio_use_float,
   "dsp",
+   NULL,
+   NULL,
   ctr_dsp_audio_write_avail,
   ctr_dsp_audio_buffer_size
 };
@@ -32,7 +32,7 @@
 #include <retro_inline.h>
 #include <retro_miscellaneous.h>
 #include <rthreads/rthreads.h>
-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>

 #include "../audio_driver.h"
 #include "../../configuration.h"
@@ -489,6 +489,8 @@ audio_driver_t audio_dsound = {
   dsound_free,
   dsound_use_float,
   "dsound",
+   NULL,
+   NULL,
   dsound_write_avail,
   dsound_buffer_size,
 };
@@ -31,19 +31,6 @@
 #include "../../configuration.h"
 #include "../../defines/gx_defines.h"

-#define CHUNK_FRAMES 64
-#define CHUNK_SIZE (CHUNK_FRAMES * sizeof(uint32_t))
-#define BLOCKS 16
-
-#ifdef GEKKO
-#define AIInit AUDIO_Init
-#define AIInitDMA AUDIO_InitDMA
-#define AIStartDMA AUDIO_StartDMA
-#define AIStopDMA AUDIO_StopDMA
-#define AIRegisterDMACallback AUDIO_RegisterDMACallback
-#define AISetDSPSampleRate AUDIO_SetDSPSampleRate
-#endif
-
 typedef struct
 {
   uint32_t data[BLOCKS][CHUNK_FRAMES];
@@ -218,7 +205,7 @@ static void gx_audio_free(void *data)
   AIRegisterDMACallback(NULL);

   if (wa->cond)
-      LWP_CloseQueue(wa->cond);
+      OSCloseThreadQueue(wa->cond);
   wa->cond = 0;

   free(data);
@@ -254,6 +241,8 @@ audio_driver_t audio_gx = {
   gx_audio_free,
   gx_audio_use_float,
   "gx",
+   NULL,
+   NULL,
   gx_audio_write_avail,
   gx_audio_buffer_size,
 };
@@ -362,6 +362,8 @@ audio_driver_t audio_jack = {
   ja_free,
   ja_use_float,
   "jack",
+   NULL,
+   NULL,
   ja_write_avail,
   ja_buffer_size,
 };
@@ -85,6 +85,8 @@ audio_driver_t audio_null = {
   null_audio_free,
   null_audio_use_float,
   "null",
+   NULL,
+   NULL,
   null_audio_write_avail,
   NULL
 };
@@ -162,7 +162,7 @@ static bool al_get_buffer(al_t *al, ALuint *buffer)

 static size_t al_fill_internal_buf(al_t *al, const void *buf, size_t size)
 {
-   size_t read_size = min(BUFSIZE - al->tmpbuf_ptr, size);
+   size_t read_size = MIN(BUFSIZE - al->tmpbuf_ptr, size);
   memcpy(al->tmpbuf + al->tmpbuf_ptr, buf, read_size);
   al->tmpbuf_ptr += read_size;
   return read_size;
@@ -267,6 +267,8 @@ audio_driver_t audio_openal = {
   al_free,
   al_use_float,
   "openal",
+   NULL,
+   NULL,
   al_write_avail,
   al_buffer_size,
 };
@@ -255,7 +255,7 @@ static ssize_t sl_write(void *data, const void *buf_, size_t size)
         slock_unlock(sl->lock);
      }

-      avail_write = min(sl->buf_size - sl->buffer_ptr, size);
+      avail_write = MIN(sl->buf_size - sl->buffer_ptr, size);

      if (avail_write)
      {
@@ -313,6 +313,8 @@ audio_driver_t audio_opensl = {
   sl_free,
   sl_use_float,
   "opensl",
+   NULL,
+   NULL,
   sl_write_avail,
   sl_buffer_size,
 };
@@ -212,6 +212,8 @@ audio_driver_t audio_oss = {
   oss_free,
   oss_use_float,
   "oss",
+   NULL,
+   NULL,
   oss_write_avail,
   oss_buffer_size,
 };
@@ -17,7 +17,7 @@
 #include <stdlib.h>
 #include <string.h>

-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>

 #include "../audio_driver.h"
 #include "../../configuration.h"
@@ -247,6 +247,8 @@ audio_driver_t audio_ps3 = {
   ps3_audio_free,
   ps3_audio_use_float,
   "ps3",
+   NULL,
+   NULL,
   ps3_audio_write_avail,
   NULL
 };
@@ -286,6 +286,8 @@ audio_driver_t audio_psp = {
 #else
   "psp",
 #endif
+   NULL,
+   NULL,
   psp_write_avail,
   psp_buffer_size,
 };
@@ -238,9 +238,7 @@ static ssize_t pulse_write(void *data, const void *buf_, size_t size)
   pa_threaded_mainloop_lock(pa->mainloop);
   while (size)
   {
-      size_t writable = pa_stream_writable_size(pa->stream);
-
-      writable = min(size, writable);
+      size_t writable = MIN(size, pa_stream_writable_size(pa->stream));

      if (writable)
      {
@@ -345,6 +343,8 @@ audio_driver_t audio_pulse = {
   pulse_free,
   pulse_use_float,
   "pulse",
+   NULL,
+   NULL,
   pulse_write_avail,
   pulse_buffer_size,
 };
@@ -142,6 +142,8 @@ audio_driver_t audio_roar = {
   ra_free,
   ra_use_float,
   "roar",
+   NULL,
+   NULL,
   ra_write_avail,
   NULL
 };
@@ -17,7 +17,7 @@

 #include <boolean.h>

-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>
 #include <rthreads/rthreads.h>

 #include "../audio_driver.h"
@@ -233,6 +233,8 @@ audio_driver_t audio_rsound = {
   rs_free,
   rs_use_float,
   "rsound",
+   NULL,
+   NULL,
   rs_write_avail,
   rs_buffer_size,
 };
@@ -32,7 +32,7 @@ extern "C" {
 #include <stdint.h>
 #include <stddef.h>

-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>

 #ifdef _WIN32
 #define RSD_DEFAULT_HOST "127.0.0.1" /* Stupid Windows. */
@@ -110,6 +110,8 @@ audio_driver_t audio_rwebaudio = {
   rwebaudio_free,
   rwebaudio_use_float,
   "rwebaudio",
+   NULL,
+   NULL,
   rwebaudio_write_avail,
   rwebaudio_buffer_size,
 };
@@ -23,7 +23,7 @@

 #include <boolean.h>
 #include <rthreads/rthreads.h>
-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>
 #include <retro_inline.h>

 #include "../audio_driver.h"
@@ -253,6 +253,8 @@ audio_driver_t audio_sdl = {
 #else
   "sdl",
 #endif
+   NULL,
+   NULL,
   sdl_audio_write_avail,
   NULL
 };
@@ -194,7 +194,7 @@ static size_t xaudio2_write(xaudio2_t *handle, const void *buf, size_t bytes_)

   while (bytes)
   {
-      unsigned need   = min(bytes, handle->bufsize - handle->bufptr);
+      unsigned need   = MIN(bytes, handle->bufsize - handle->bufptr);

      memcpy(handle->buf + handle->write_buffer * handle->bufsize + handle->bufptr,
            buffer, need);
@@ -347,6 +347,8 @@ audio_driver_t audio_xa = {
   xa_free,
   xa_use_float,
   "xaudio",
+   NULL,
+   NULL,
   xa_write_avail,
   xa_buffer_size,
 };
@@ -146,6 +146,8 @@ audio_driver_t audio_xenon360 = {
   xenon360_audio_free,
   xenon360_use_float,
   "xenon360",
+   NULL,
+   NULL,
   xenon360_write_avail,
   NULL
 };
@@ -271,7 +271,7 @@ static void resampler_CC_upsample(void *re_, struct resampler_data *data)
   audio_frame_float_t *inp     = (audio_frame_float_t*)data->data_in;
   audio_frame_float_t *inp_max = (audio_frame_float_t*)(inp + data->input_frames);
   audio_frame_float_t *outp    = (audio_frame_float_t*)data->data_out;
-   float b                      = min(data->ratio, 1.00); /* cutoff frequency. */
+   float b                      = MIN(data->ratio, 1.00); /* cutoff frequency. */
   float ratio                  = 1.0 / data->ratio;
   __m128 vec_previous          = _mm_loadu_ps((float*)&re->buffer[0]);
   __m128 vec_current           = _mm_loadu_ps((float*)&re->buffer[2]);
@@ -446,7 +446,7 @@ static void resampler_CC_upsample(void *re_, struct resampler_data *data)
   audio_frame_float_t *inp_max = (audio_frame_float_t*)
      (inp + data->input_frames);
   audio_frame_float_t *outp    = (audio_frame_float_t*)data->data_out;
-   float                      b = min(data->ratio, 1.00); /* cutoff frequency. */
+   float                      b = MIN(data->ratio, 1.00); /* cutoff frequency. */
   float                  ratio = 1.0 / data->ratio;

   while (inp != inp_max)
@@ -0,0 +1,48 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2014-2016 - Ali Bouhlel ( [email protected] )
+ *
+ *  RetroArch 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 Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch 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 RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <math.h>
+ 
+#include "../audio_resampler_driver.h"
+typedef struct rarch_null_resampler
+{
+   void *empty;
+} rarch_null_resampler_t;
+ 
+static void resampler_null_process(
+      void *re_, struct resampler_data *data)
+{
+}
+ 
+static void resampler_null_free(void *re_)
+{
+}
+ 
+static void *resampler_null_init(const struct resampler_config *config,
+      double bandwidth_mod, resampler_simd_mask_t mask)
+{
+   return (void*)0;
+}
+ 
+rarch_resampler_t null_resampler = {
+   resampler_null_init,
+   resampler_null_process,
+   resampler_null_free,
+   RESAMPLER_API_VERSION,
+   "null",
+   "null"
+};
@@ -20,22 +20,19 @@ CFLAGS += -I$(LIBRETRO_COMM_DIR)/include -I../../
 LDFLAGS += -lm

 SHAREDOBJ += $(LIBRETRO_COMM_DIR)/memmap/memalign.o \
-				 $(LIBRETRO_COMM_DIR)/string/string_list.o \
-				 $(LIBRETRO_COMM_DIR)/file/config_file_userdata.o \
+				 $(LIBRETRO_COMM_DIR)/lists/string_list.o \
+				 ../..//config_file_userdata.o \
+				 ../audio_resampler_driver.o \
 				 $(LIBRETRO_COMM_DIR)/file/config_file.o \
-				 $(LIBRETRO_COMM_DIR)/file/retro_file.o \
+				 $(LIBRETRO_COMM_DIR)/streams/file_stream.o \
+				 $(LIBRETRO_COMM_DIR)/string/stdstring.o \
 				 $(LIBRETRO_COMM_DIR)/file/file_path.o \
-				 $(LIBRETRO_COMM_DIR)/compat/compat.o \
+				 $(LIBRETRO_COMM_DIR)/file/retro_stat.o \
+				 $(LIBRETRO_COMM_DIR)/compat/compat_strl.o \
 				 $(LIBRETRO_COMM_DIR)/hash/rhash.o \

 all: $(TESTS)

-resampler-sinc.o: ../audio_resampler_driver.c $(SHAREDOBJ)
-	$(CC) -c -o $@ $< $(CFLAGS)
-
-resampler-cc.o: ../audio_resampler_driver.c $(SHAREDOBJ)
-	$(CC) -c -o $@ $< $(CFLAGS) -DRESAMPLER_IDENT='"CC"'
-
 main-cc.o: main.c
 	$(CC) -c -o $@ $< $(CFLAGS) -DRESAMPLER_IDENT='"CC"'

@@ -45,16 +42,16 @@ snr-cc.o: snr.c
 cc-resampler.o: ../drivers_resampler/cc_resampler.c
 	$(CC) -c -o $@ $< $(CFLAGS)

-sinc-lowest.o: ../drivers_resampler/sinc.c
+sinc-lowest.o: ../drivers_resampler/sinc_resampler.c
 	$(CC) -c -o $@ $< $(CFLAGS) -DSINC_LOWEST_QUALITY

-sinc-lower.o: ../drivers_resampler/sinc.c
+sinc-lower.o: ../drivers_resampler/sinc_resampler.c
 	$(CC) -c -o $@ $< $(CFLAGS) -DSINC_LOWER_QUALITY

-sinc.o: ../drivers_resampler/sinc.c
+sinc.o: ../drivers_resampler/sinc_resampler.c
 	$(CC) -c -o $@ $< $(CFLAGS)

-nearest.o: ../drivers_resampler/nearest.c
+nearest_resampler.o: ../drivers_resampler/nearest_resampler.c
 	$(CC) -c -o $@ $< $(CFLAGS)

 sinc-higher.o: ../drivers_resampler/sinc.c
@@ -63,40 +60,40 @@ sinc-higher.o: ../drivers_resampler/sinc.c
 sinc-highest.o: ../drivers_resampler/sinc.c
 	$(CC) -c -o $@ $< $(CFLAGS) -DSINC_HIGHEST_QUALITY

-test-sinc-lowest: sinc-lowest.o ../audio_utils.o main.o resampler-sinc.o resampler-cc.o nearest.o $(SHAREDOBJ)
+test-sinc-lowest: sinc-lowest.o ../audio_utils.o main.o nearest_resampler.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)

-test-snr-sinc-lowest: sinc-lowest.o ../audio_utils.o snr.o resampler-sinc.o resampler-cc.o nearest.o $(SHAREDOBJ)
+test-snr-sinc-lowest: sinc-lowest.o ../audio_utils.o snr.o nearest_resampler.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)

-test-sinc-lower: sinc-lower.o ../audio_utils.o main.o resampler-sinc.o resampler-cc.o nearest.o $(SHAREDOBJ)
+test-sinc-lower: sinc-lower.o ../audio_utils.o main.o nearest_resampler.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)

-test-snr-sinc-lower: sinc-lower.o ../audio_utils.o snr.o resampler-sinc.o resampler-cc.o nearest.o $(SHAREDOBJ)
+test-snr-sinc-lower: sinc-lower.o ../audio_utils.o snr.o nearest_resampler.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)

-test-sinc: sinc.o ../audio_utils.o main.o resampler-sinc.o resampler-cc.o nearest.o $(SHAREDOBJ)
+test-sinc: sinc.o ../audio_utils.o main.o nearest_resampler.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)

-test-snr-sinc: sinc.o ../audio_utils.o snr.o resampler-sinc.o resampler-cc.o  nearest.o $(SHAREDOBJ)
+test-snr-sinc: sinc.o ../audio_utils.o snr.o nearest_resampler.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)

-test-sinc-higher: sinc-higher.o ../audio_utils.o main.o resampler-sinc.o resampler-cc.o nearest.o $(SHAREDOBJ)
+test-sinc-higher: sinc-higher.o ../audio_utils.o main.o nearest_resampler.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)

-test-snr-sinc-higher: sinc-higher.o ../audio_utils.o snr.o resampler-sinc.o resampler-cc.o nearest.o $(SHAREDOBJ)
+test-snr-sinc-higher: sinc-higher.o ../audio_utils.o snr.o nearest_resampler.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)

-test-sinc-highest: sinc-highest.o ../audio_utils.o main.o resampler-sinc.o resampler-cc.o nearest.o $(SHAREDOBJ)
+test-sinc-highest: sinc-highest.o ../audio_utils.o main.o nearest_resampler.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)

-test-snr-sinc-highest: sinc-highest.o ../audio_utils.o snr.o resampler-sinc.o resampler-cc.o  nearest.o $(SHAREDOBJ)
+test-snr-sinc-highest: sinc-highest.o ../audio_utils.o snr.o nearest_resampler.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)

-test-cc: cc-resampler.o ../audio_utils.o main-cc.o resampler-cc.o resampler-cc.o sinc.o nearest.o $(SHAREDOBJ)
+test-cc: cc-resampler.o ../audio_utils.o main-cc.o resampler-cc.o sinc.o nearest_resampler.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)

-test-snr-cc: cc-resampler.o ../audio_utils.o snr-cc.o resampler-cc.o sinc.o nearest.o $(SHAREDOBJ)
+test-snr-cc: cc-resampler.o ../audio_utils.o snr-cc.o resampler-cc.o sinc.o nearest_resampler.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)

 %.o: %.c
@@ -20,13 +20,14 @@

 #include <boolean.h>

-#include <string/string_list.h>
+#include <lists/string_list.h>
 #include <rthreads/rthreads.h>

 #include "autosave.h"
 #include "configuration.h"
 #include "msg_hash.h"
 #include "runloop.h"
+#include "libretro_version_1.h"
 #include "verbosity.h"

 /* Autosave support. */
@@ -54,28 +55,6 @@ struct autosave

 static struct autosave_st autosave_state;

-/**
- * autosave_lock:
- * @handle          : pointer to autosave object
- *
- * Locks autosave.
- **/
-static void autosave_lock(autosave_t *handle)
-{
-   slock_lock(handle->lock);
-}
-
-/**
- * autosave_unlock:
- * @handle          : pointer to autosave object
- *
- * Unlocks autosave.
- **/
-static void autosave_unlock(autosave_t *handle)
-{
-   slock_unlock(handle->lock);
-}
-
 /**
 * autosave_thread:
 * @data            : pointer to autosave object
@@ -84,19 +63,19 @@ static void autosave_unlock(autosave_t *handle)
 **/
 static void autosave_thread(void *data)
 {
-   bool first_log = true;
+   bool first_log   = true;
   autosave_t *save = (autosave_t*)data;

   while (!save->quit)
   {
      bool differ;

-      autosave_lock(save);
+      slock_lock(save->lock);
      differ = memcmp(save->buffer, save->retro_buffer,
            save->bufsize) != 0;
      if (differ)
         memcpy(save->buffer, save->retro_buffer, save->bufsize);
-      autosave_unlock(save);
+      slock_unlock(save->lock);

      if (differ)
      {
@@ -148,12 +127,13 @@ static void autosave_thread(void *data)
 * Returns: pointer to new autosave_t object if successful, otherwise
 * NULL.
 **/
-autosave_t *autosave_new(const char *path, const void *data, size_t size,
+static autosave_t *autosave_new(const char *path,
+      const void *data, size_t size,
      unsigned interval)
 {
-   autosave_t *handle = (autosave_t*)calloc(1, sizeof(*handle));
+   autosave_t *handle   = (autosave_t*)calloc(1, sizeof(*handle));
   if (!handle)
-      return NULL;
+      goto error;

   handle->bufsize      = size;
   handle->interval     = interval;
@@ -162,10 +142,8 @@ autosave_t *autosave_new(const char *path, const void *data, size_t size,
   handle->retro_buffer = data;

   if (!handle->buffer)
-   {
-      free(handle);
-      return NULL;
-   }
+      goto error;
+
   memcpy(handle->buffer, handle->retro_buffer, handle->bufsize);

   handle->lock         = slock_new();
@@ -175,6 +153,11 @@ autosave_t *autosave_new(const char *path, const void *data, size_t size,
   handle->thread       = sthread_create(autosave_thread, handle);

   return handle;
+
+error:
+   if (handle)
+      free(handle);
+   return NULL;
 }

 /**
@@ -183,7 +166,7 @@ autosave_t *autosave_new(const char *path, const void *data, size_t size,
 *
 * Frees autosave object.
 **/
-void autosave_free(autosave_t *handle)
+static void autosave_free(autosave_t *handle)
 {
   if (!handle)
      return;
@@ -214,7 +197,7 @@ void lock_autosave(void)
   for (i = 0; i < autosave_state.num; i++)
   {
      if (autosave_state.list[i])
-         autosave_lock(autosave_state.list[i]);
+         slock_lock(autosave_state.list[i]->lock);
   }
 }

@@ -230,36 +213,44 @@ void unlock_autosave(void)
   for (i = 0; i < autosave_state.num; i++)
   {
      if (autosave_state.list[i])
-         autosave_unlock(autosave_state.list[i]);
+         slock_unlock(autosave_state.list[i]->lock);
   }
 }

 void autosave_event_init(void)
 {
   unsigned i;
+   autosave_t **list    = NULL;
   settings_t *settings = config_get_ptr();
   global_t   *global   = global_get_ptr();

   if (settings->autosave_interval < 1 || !global->savefiles)
      return;

-   if (!(autosave_state.list = (autosave_t**)calloc(global->savefiles->size,
-               sizeof(*autosave_state.list))))
+   list = (autosave_t**)calloc(global->savefiles->size,
+               sizeof(*autosave_state.list));
+   if (!list)
      return;

-   autosave_state.num = global->savefiles->size;
+   autosave_state.list = list;
+   autosave_state.num  = global->savefiles->size;

   for (i = 0; i < global->savefiles->size; i++)
   {
+      retro_ctx_memory_info_t mem_info;
      const char *path = global->savefiles->elems[i].data;
      unsigned    type = global->savefiles->elems[i].attr.i;

-      if (core.retro_get_memory_size(type) <= 0)
+      mem_info.id = type;
+
+      core_ctl(CORE_CTL_RETRO_GET_MEMORY, &mem_info);
+
+      if (mem_info.size <= 0)
         continue;

      autosave_state.list[i] = autosave_new(path,
-            core.retro_get_memory_data(type),
-            core.retro_get_memory_size(type),
+            mem_info.data,
+            mem_info.size,
            settings->autosave_interval);

      if (!autosave_state.list[i])
@@ -25,29 +25,6 @@ extern "C" {

 typedef struct autosave autosave_t;

-/**
- * autosave_new:
- * @path            : path to autosave file
- * @data            : pointer to buffer
- * @size            : size of @data buffer
- * @interval        : interval at which saves should be performed.
- *
- * Create and initialize autosave object.
- *
- * Returns: pointer to new autosave_t object if successful, otherwise
- * NULL.
- **/
-autosave_t *autosave_new(const char *path, const void *data,
-      size_t size, unsigned interval);
-
-/**
- * autosave_free:
- * @handle          : pointer to autosave object
- *
- * Frees autosave object.
- **/
-void autosave_free(autosave_t *handle);
-
 /**
 * lock_autosave:
 *
@@ -17,9 +17,11 @@
 #include <string.h>

 #include "camera_driver.h"
-#include "../general.h"
-#include "../string_list_special.h"
-#include "../system.h"
+
+#include "../configuration.h"
+#include "../retroarch.h"
+#include "../runloop.h"
+#include "../list_special.h"
 #include "../verbosity.h"

 static const camera_driver_t *camera_drivers[] = {
@@ -41,9 +43,6 @@ static const camera_driver_t *camera_drivers[] = {
   NULL,
 };

-static const camera_driver_t *camera_driver;
-static void *camera_data;
-
 /**
 * camera_driver_find_handle:
 * @idx                : index of driver to get handle to.
@@ -88,138 +87,22 @@ const char* config_get_camera_driver_options(void)
   return char_list_new_special(STRING_LIST_CAMERA_DRIVERS, NULL);
 }

-void find_camera_driver(void)
-{
-   settings_t *settings = config_get_ptr();
-   int i = find_driver_index("camera_driver", settings->camera.driver);
-
-   if (i >= 0)
-      camera_driver = (const camera_driver_t*)camera_driver_find_handle(i);
-   else
-   {
-      unsigned d;
-      RARCH_ERR("Couldn't find any camera driver named \"%s\"\n",
-            settings->camera.driver);
-      RARCH_LOG_OUTPUT("Available camera drivers are:\n");
-      for (d = 0; camera_driver_find_handle(d); d++)
-         RARCH_LOG_OUTPUT("\t%s\n", camera_driver_find_ident(d));
-       
-      RARCH_WARN("Going to default to first camera driver...\n");
-       
-      camera_driver = (const camera_driver_t*)camera_driver_find_handle(0);
-       
-      if (!camera_driver)
-         retro_fail(1, "find_camera_driver()");
-   }
-}
-
-/**
- * driver_camera_start:
- *
- * Starts camera driver interface.
- * Used by RETRO_ENVIRONMENT_GET_CAMERA_INTERFACE.
- *
- * Returns: true (1) if successful, otherwise false (0).
- **/
-bool driver_camera_start(void)
-{
-   settings_t *settings = config_get_ptr();
-
-   if (camera_driver && camera_data && camera_driver->start)
-   {
-      if (settings->camera.allow)
-         return camera_driver->start(camera_data);
-
-      runloop_msg_queue_push(
-            "Camera is explicitly disabled.\n", 1, 180, false);
-   }
-   return false;
-}
-
-/**
- * driver_camera_stop:
- *
- * Stops camera driver.
- * Used by RETRO_ENVIRONMENT_GET_CAMERA_INTERFACE.
- *
- * Returns: true (1) if successful, otherwise false (0).
- **/
 void driver_camera_stop(void)
 {
-   if (camera_driver && camera_driver->stop && camera_data)
-      camera_driver->stop(camera_data);
+   camera_driver_ctl(RARCH_CAMERA_CTL_START, NULL);
 }

-/**
- * driver_camera_poll:
- *
- * Call camera driver's poll function.
- * Used by RETRO_ENVIRONMENT_GET_CAMERA_INTERFACE.
- *
- * Returns: true (1) if successful, otherwise false (0).
- **/
-void driver_camera_poll(void)
+bool driver_camera_start(void)
 {
-   rarch_system_info_t *system = NULL;
-
-   runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system);
-
-   if (camera_driver && camera_driver->poll && camera_data)
-      camera_driver->poll(camera_data,
-            system->camera_callback.frame_raw_framebuffer,
-            system->camera_callback.frame_opengl_texture);
-}
-
-void init_camera(void)
-{
-   settings_t        *settings = config_get_ptr();
-   rarch_system_info_t *system = NULL;
-
-   runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system);
-
-   /* Resource leaks will follow if camera is initialized twice. */
-   if (camera_data)
-      return;
-
-   find_camera_driver();
-
-   camera_data = camera_driver->init(
-         *settings->camera.device ? settings->camera.device : NULL,
-         system->camera_callback.caps,
-         settings->camera.width ?
-         settings->camera.width : system->camera_callback.width,
-         settings->camera.height ?
-         settings->camera.height : system->camera_callback.height);
-
-   if (!camera_data)
-   {
-      RARCH_ERR("Failed to initialize camera driver. Will continue without camera.\n");
-      camera_driver_ctl(RARCH_CAMERA_CTL_UNSET_ACTIVE, NULL);
-   }
-
-   if (system->camera_callback.initialized)
-      system->camera_callback.initialized();
-}
-
-static void uninit_camera(void)
-{
-   rarch_system_info_t *system = NULL;
-   runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system);
-
-   if (camera_data && camera_driver)
-   {
-      if (system->camera_callback.deinitialized)
-         system->camera_callback.deinitialized();
-
-      if (camera_driver->free)
-         camera_driver->free(camera_data);
-   }
-
-   camera_data = NULL;
+   return camera_driver_ctl(RARCH_CAMERA_CTL_START, NULL);
 }

 bool camera_driver_ctl(enum rarch_camera_ctl_state state, void *data)
 {
+   settings_t        *settings = config_get_ptr();
+   static struct retro_camera_callback camera_cb;
+   static const camera_driver_t *camera_driver   = NULL;
+   static void *camera_data                      = NULL;
   static bool camera_driver_active              = false;
   static bool camera_driver_data_own            = false;

@@ -229,6 +112,7 @@ bool camera_driver_ctl(enum rarch_camera_ctl_state state, void *data)
         camera_driver_active   = false;
         camera_driver_data_own = false;
         camera_driver          = NULL;
+         camera_data            = NULL;
         break;
      case RARCH_CAMERA_CTL_SET_OWN_DRIVER:
         camera_driver_data_own = true;
@@ -241,13 +125,110 @@ bool camera_driver_ctl(enum rarch_camera_ctl_state state, void *data)
      case RARCH_CAMERA_CTL_SET_ACTIVE:
         camera_driver_active = true; 
         break;
+      case RARCH_CAMERA_CTL_FIND_DRIVER:
+         {
+            int i;
+            driver_ctx_info_t drv;
+
+            drv.label = "camera_driver";
+            drv.s     = settings->camera.driver;
+
+            driver_ctl(RARCH_DRIVER_CTL_FIND_INDEX, &drv);
+
+            i = drv.len;
+
+            if (i >= 0)
+               camera_driver = (const camera_driver_t*)camera_driver_find_handle(i);
+            else
+            {
+               unsigned d;
+               RARCH_ERR("Couldn't find any camera driver named \"%s\"\n",
+                     settings->camera.driver);
+               RARCH_LOG_OUTPUT("Available camera drivers are:\n");
+               for (d = 0; camera_driver_find_handle(d); d++)
+                  RARCH_LOG_OUTPUT("\t%s\n", camera_driver_find_ident(d));
+
+               RARCH_WARN("Going to default to first camera driver...\n");
+
+               camera_driver = (const camera_driver_t*)camera_driver_find_handle(0);
+
+               if (!camera_driver)
+                  retro_fail(1, "find_camera_driver()");
+            }
+         }
+         break;
      case RARCH_CAMERA_CTL_UNSET_ACTIVE:
         camera_driver_active = false; 
         break;
      case RARCH_CAMERA_CTL_IS_ACTIVE:
        return camera_driver_active; 
      case RARCH_CAMERA_CTL_DEINIT:
-        uninit_camera();
+        if (camera_data && camera_driver)
+        {
+           if (camera_cb.deinitialized)
+              camera_cb.deinitialized();
+
+           if (camera_driver->free)
+              camera_driver->free(camera_data);
+        }
+
+        camera_data = NULL;
+        break;
+      case RARCH_CAMERA_CTL_STOP:
+        if (     camera_driver 
+              && camera_driver->stop 
+              && camera_data)
+           camera_driver->stop(camera_data);
+        break;
+      case RARCH_CAMERA_CTL_START:
+        if (camera_driver && camera_data && camera_driver->start)
+        {
+           if (settings->camera.allow)
+              return camera_driver->start(camera_data);
+
+           runloop_msg_queue_push(
+                 "Camera is explicitly disabled.\n", 1, 180, false);
+        }
+        return false;
+      case RARCH_CAMERA_CTL_POLL:
+        if (!camera_cb.caps)
+           return false;
+        if (!camera_driver || !camera_driver->poll || !camera_data)
+           return false;
+        camera_driver->poll(camera_data,
+              camera_cb.frame_raw_framebuffer,
+              camera_cb.frame_opengl_texture);
+        break;
+      case RARCH_CAMERA_CTL_SET_CB:
+        {
+           struct retro_camera_callback *cb =
+              (struct retro_camera_callback*)data;
+           camera_cb          = *cb;
+        }
+        break;
+      case RARCH_CAMERA_CTL_INIT:
+        /* Resource leaks will follow if camera is initialized twice. */
+        if (camera_data)
+           return false;
+
+        camera_driver_ctl(RARCH_CAMERA_CTL_FIND_DRIVER, NULL);
+
+        camera_data = camera_driver->init(
+              *settings->camera.device ? settings->camera.device : NULL,
+              camera_cb.caps,
+              settings->camera.width ?
+              settings->camera.width : camera_cb.width,
+              settings->camera.height ?
+              settings->camera.height : camera_cb.height);
+
+        if (!camera_data)
+        {
+           RARCH_ERR("Failed to initialize camera driver. Will continue without camera.\n");
+           camera_driver_ctl(RARCH_CAMERA_CTL_UNSET_ACTIVE, NULL);
+        }
+
+        if (camera_cb.initialized)
+           camera_cb.initialized();
        break;
      default:
         break;
@@ -35,7 +35,13 @@ enum rarch_camera_ctl_state
   RARCH_CAMERA_CTL_OWNS_DRIVER,
   RARCH_CAMERA_CTL_SET_ACTIVE,
   RARCH_CAMERA_CTL_UNSET_ACTIVE,
-   RARCH_CAMERA_CTL_IS_ACTIVE
+   RARCH_CAMERA_CTL_IS_ACTIVE,
+   RARCH_CAMERA_CTL_FIND_DRIVER,
+   RARCH_CAMERA_CTL_POLL,
+   RARCH_CAMERA_CTL_SET_CB,
+   RARCH_CAMERA_CTL_STOP,
+   RARCH_CAMERA_CTL_START,
+   RARCH_CAMERA_CTL_INIT
 };

 typedef struct camera_driver
@@ -66,36 +72,6 @@ extern camera_driver_t camera_rwebcam;
 extern camera_driver_t camera_avfoundation;
 extern camera_driver_t camera_null;

-/**
- * driver_camera_start:
- *
- * Starts camera driver.
- * Used by RETRO_ENVIRONMENT_GET_CAMERA_INTERFACE.
- *
- * Returns: true (1) if successful, otherwise false (0).
- **/
-bool driver_camera_start(void);
-
-/**
- * driver_camera_stop:
- *
- * Stops camera driver.
- * Used by RETRO_ENVIRONMENT_GET_CAMERA_INTERFACE.
- *
- * Returns: true (1) if successful, otherwise false (0).
- **/
-void driver_camera_stop(void);
-
-/**
- * driver_camera_poll:
- *
- * Call camera driver's poll function.
- * Used by RETRO_ENVIRONMENT_GET_CAMERA_INTERFACE.
- *
- * Returns: true (1) if successful, otherwise false (0).
- **/
-void driver_camera_poll(void);
-
 /**
 * config_get_camera_driver_options:
 *
@@ -125,9 +101,9 @@ const void *camera_driver_find_handle(int index);
 **/
 const char *camera_driver_find_ident(int index);

-void find_camera_driver(void);
+void driver_camera_stop(void);

-void init_camera(void);
+bool driver_camera_start(void);

 bool camera_driver_ctl(enum rarch_camera_ctl_state state, void *data);

@@ -210,9 +210,9 @@ static bool init_device(void *data)
   }

   /* VIDIOC_S_FMT may change width, height and pitch. */
-   v4l->width = fmt.fmt.pix.width;
+   v4l->width  = fmt.fmt.pix.width;
   v4l->height = fmt.fmt.pix.height;
-   v4l->pitch = max(fmt.fmt.pix.bytesperline, v4l->width * 2);
+   v4l->pitch  = MAX(fmt.fmt.pix.bytesperline, v4l->width * 2);

   /* Sanity check to see if our assumptions are met.
    * It is possible to support whatever the device gives us,
@@ -24,9 +24,9 @@
 #include <compat/posix_string.h>

 #include "cheats.h"
-#include "general.h"
 #include "runloop.h"
 #include "dynamic.h"
+#include "libretro_version_1.h"
 #include "verbosity.h"

 #ifdef HAVE_CONFIG_H
@@ -72,22 +72,34 @@ unsigned cheat_manager_get_size(void)

 void cheat_manager_apply_cheats(void)
 {
+#ifdef HAVE_CHEEVOS
+   bool data_bool  = false;
+#endif
   unsigned i, idx = 0;
   cheat_manager_t *handle = cheat_manager_state;

   if (!handle)
      return;

-   core.retro_cheat_reset();
+   core_ctl(CORE_CTL_RETRO_CHEAT_RESET, NULL);

   for (i = 0; i < handle->size; i++)
   {
      if (handle->cheats[i].state)
-         core.retro_cheat_set(idx++, true, handle->cheats[i].code);
+      {
+         retro_ctx_cheat_info_t cheat_info;
+
+         cheat_info.index   = idx++;
+         cheat_info.enabled = true;
+         cheat_info.code    = handle->cheats[i].code;
+
+         core_ctl(CORE_CTL_RETRO_CHEAT_SET, &cheat_info);
+      }
   }
   
 #ifdef HAVE_CHEEVOS
-   cheevos_apply_cheats(idx != 0);
+   data_bool = idx != 0;
+   cheevos_ctl(CHEEVOS_CTL_APPLY_CHEATS, &data_bool);
 #endif
 }

@@ -118,7 +130,7 @@ bool cheat_manager_save(const char *path)
   settings_t              *settings = config_get_ptr();
   cheat_manager_t *handle = cheat_manager_state;

-   fill_pathname_join(buf, settings->cheat_database,
+   fill_pathname_join(buf, settings->path.cheat_database,
         path, sizeof(buf));

   fill_pathname_noext(cheats_file, buf, ".cht", sizeof(cheats_file));
@@ -165,6 +177,38 @@ bool cheat_manager_save(const char *path)
   return ret;
 }

+static cheat_manager_t *cheat_manager_new(unsigned size)
+{
+   unsigned i;
+   cheat_manager_t *handle = (cheat_manager_t*)
+      calloc(1, sizeof(struct cheat_manager));
+
+   if (!handle)
+      return NULL;
+
+   handle->buf_size = size;
+   handle->size     = size;
+   handle->cheats   = (struct item_cheat*)
+      calloc(handle->buf_size, sizeof(struct item_cheat));
+
+   if (!handle->cheats)
+   {
+      handle->buf_size = 0;
+      handle->size = 0;
+      handle->cheats = NULL;
+      return handle;
+   }
+
+   for (i = 0; i < handle->size; i++)
+   {
+      handle->cheats[i].desc   = NULL;
+      handle->cheats[i].code   = NULL;
+      handle->cheats[i].state  = false;
+   }
+
+   return handle;
+}
+
 bool cheat_manager_load(const char *path)
 {
   unsigned cheats = 0, i;
@@ -218,37 +262,6 @@ bool cheat_manager_load(const char *path)
   return true;
 }

-cheat_manager_t *cheat_manager_new(unsigned size)
-{
-   unsigned i;
-   cheat_manager_t *handle = (cheat_manager_t*)
-      calloc(1, sizeof(struct cheat_manager));
-
-   if (!handle)
-      return NULL;
-
-   handle->buf_size = size;
-   handle->size     = size;
-   handle->cheats   = (struct item_cheat*)
-      calloc(handle->buf_size, sizeof(struct item_cheat));
-
-   if (!handle->cheats)
-   {
-      handle->buf_size = 0;
-      handle->size = 0;
-      handle->cheats = NULL;
-      return handle;
-   }
-
-   for (i = 0; i < handle->size; i++)
-   {
-      handle->cheats[i].desc   = NULL;
-      handle->cheats[i].code   = NULL;
-      handle->cheats[i].state  = false;
-   }
-
-   return handle;
-}

 bool cheat_manager_realloc(unsigned new_size)
 {
@@ -27,8 +27,6 @@ typedef struct cheat_manager cheat_manager_t;

 unsigned cheat_manager_get_size(void);

-cheat_manager_t *cheat_manager_new(unsigned size);
-
 bool cheat_manager_load(const char *path);

 /**
@@ -19,20 +19,36 @@
 #include <stdint.h>
 #include <stdlib.h>

-int cheevos_load(const void *data);
+enum cheevos_ctl_state
+{
+   CHEEVOS_CTL_NONE = 0,
+   CHEEVOS_CTL_TEST,
+   CHEEVOS_CTL_LOAD,

-#ifdef HAVE_MENU
-void cheevos_populate_menu(void *data);
-#endif
+   CHEEVOS_CTL_APPLY_CHEATS,

-void cheevos_get_description(unsigned cheevo_ndx, char *str, size_t len);
+   /* Unload the achievements from memory. */
+   CHEEVOS_CTL_UNLOAD,

-void cheevos_set_cheats(void);
+   /* Toggle Hardcore Mode */
+   CHEEVOS_CTL_TOGGLE_HARDCORE_MODE,

-void cheevos_apply_cheats(bool enable);
+   /* Load the achievements into memory if 
+    * the game has content. */
+   CHEEVOS_CTL_SET_CHEATS,

-void cheevos_test(void);
+   CHEEVOS_CTL_GET_DESCRIPTION,

-void cheevos_unload(void);
+   CHEEVOS_CTL_POPULATE_MENU
+};
+
+typedef struct cheevos_ctx_desc
+{
+   unsigned idx;
+   char *s;
+   size_t len;
+} cheevos_ctx_desc_t;
+
+bool cheevos_ctl(enum cheevos_ctl_state state, void *data);

 #endif /* __RARCH_CHEEVOS_H */
@@ -26,6 +26,8 @@
 #include <compat/posix_string.h>
 #include <file/file_path.h>
 #include <net/net_compat.h>
+#include <net/net_socket.h>
+#include <string/stdstring.h>

 #include "msg_hash.h"

@@ -35,7 +37,14 @@
 #include "verbosity.h"

 #define DEFAULT_NETWORK_CMD_PORT 55355
-#define STDIN_BUF_SIZE 4096
+#define STDIN_BUF_SIZE           4096
+
+#define COMMAND_EXT_GLSL         0x7c976537U
+#define COMMAND_EXT_GLSLP        0x0f840c87U
+#define COMMAND_EXT_CG           0x0059776fU
+#define COMMAND_EXT_CGP          0x0b8865bfU
+#define COMMAND_EXT_SLANG        0x105ce63aU
+#define COMMAND_EXT_SLANGP       0x1bf9adeaU

 struct rarch_cmd
 {
@@ -52,44 +61,85 @@ struct rarch_cmd
   bool state[RARCH_BIND_LIST_END];
 };

+struct cmd_map
+{
+   const char *str;
+   unsigned id;
+};
+
+struct cmd_action_map
+{
+   const char *str;
+   bool (*action)(const char *arg);
+   const char *arg_desc;
+};
+
+static bool cmd_set_shader(const char *arg);
+
+static const struct cmd_action_map action_map[] = {
+   { "SET_SHADER", cmd_set_shader, "<shader path>" },
+};
+
+static const struct cmd_map map[] = {
+   { "FAST_FORWARD",           RARCH_FAST_FORWARD_KEY },
+   { "FAST_FORWARD_HOLD",      RARCH_FAST_FORWARD_HOLD_KEY },
+   { "LOAD_STATE",             RARCH_LOAD_STATE_KEY },
+   { "SAVE_STATE",             RARCH_SAVE_STATE_KEY },
+   { "FULLSCREEN_TOGGLE",      RARCH_FULLSCREEN_TOGGLE_KEY },
+   { "QUIT",                   RARCH_QUIT_KEY },
+   { "STATE_SLOT_PLUS",        RARCH_STATE_SLOT_PLUS },
+   { "STATE_SLOT_MINUS",       RARCH_STATE_SLOT_MINUS },
+   { "REWIND",                 RARCH_REWIND },
+   { "MOVIE_RECORD_TOGGLE",    RARCH_MOVIE_RECORD_TOGGLE },
+   { "PAUSE_TOGGLE",           RARCH_PAUSE_TOGGLE },
+   { "FRAMEADVANCE",           RARCH_FRAMEADVANCE },
+   { "RESET",                  RARCH_RESET },
+   { "SHADER_NEXT",            RARCH_SHADER_NEXT },
+   { "SHADER_PREV",            RARCH_SHADER_PREV },
+   { "CHEAT_INDEX_PLUS",       RARCH_CHEAT_INDEX_PLUS },
+   { "CHEAT_INDEX_MINUS",      RARCH_CHEAT_INDEX_MINUS },
+   { "CHEAT_TOGGLE",           RARCH_CHEAT_TOGGLE },
+   { "SCREENSHOT",             RARCH_SCREENSHOT },
+   { "MUTE",                   RARCH_MUTE },
+   { "OSK",                   RARCH_OSK },
+   { "NETPLAY_FLIP",           RARCH_NETPLAY_FLIP },
+   { "SLOWMOTION",             RARCH_SLOWMOTION },
+   { "VOLUME_UP",              RARCH_VOLUME_UP },
+   { "VOLUME_DOWN",            RARCH_VOLUME_DOWN },
+   { "OVERLAY_NEXT",           RARCH_OVERLAY_NEXT },
+   { "DISK_EJECT_TOGGLE",      RARCH_DISK_EJECT_TOGGLE },
+   { "DISK_NEXT",              RARCH_DISK_NEXT },
+   { "DISK_PREV",              RARCH_DISK_PREV },
+   { "GRAB_MOUSE_TOGGLE",      RARCH_GRAB_MOUSE_TOGGLE },
+   { "MENU_TOGGLE",            RARCH_MENU_TOGGLE },
+   { "MENU_UP",                RETRO_DEVICE_ID_JOYPAD_UP },
+   { "MENU_DOWN",              RETRO_DEVICE_ID_JOYPAD_DOWN },
+   { "MENU_LEFT",              RETRO_DEVICE_ID_JOYPAD_LEFT },
+   { "MENU_RIGHT",             RETRO_DEVICE_ID_JOYPAD_RIGHT },
+   { "MENU_A",                 RETRO_DEVICE_ID_JOYPAD_A },
+   { "MENU_B",                 RETRO_DEVICE_ID_JOYPAD_B },
+};
+
 #if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY)
 static bool cmd_init_network(rarch_cmd_t *handle, uint16_t port)
 {
-   struct addrinfo hints = {0};
-   char port_buf[16]     = {0};
+   int fd;
   struct addrinfo *res  = NULL;
-   int yes               = 1;
-
-   if (!network_init())
-      return false;

   RARCH_LOG("Bringing up command interface on port %hu.\n",
         (unsigned short)port);

-#if defined(_WIN32) || defined(HAVE_SOCKET_LEGACY)
-   hints.ai_family   = AF_INET;
-#else
-   hints.ai_family   = AF_UNSPEC;
-#endif
-   hints.ai_socktype = SOCK_DGRAM;
-   hints.ai_flags    = AI_PASSIVE;
+   fd = socket_init((void**)&res, port, NULL, SOCKET_TYPE_DATAGRAM);

-
-   snprintf(port_buf, sizeof(port_buf), "%hu", (unsigned short)port);
-   if (getaddrinfo_retro(NULL, port_buf, &hints, &res) < 0)
+   if (fd < 0)
      goto error;

-   handle->net_fd = socket(res->ai_family,
-         res->ai_socktype, res->ai_protocol);
-   if (handle->net_fd < 0)
-      goto error;
+   handle->net_fd = fd;

   if (!socket_nonblock(handle->net_fd))
      goto error;

-   setsockopt(handle->net_fd, SOL_SOCKET,
-         SO_REUSEADDR, (const char*)&yes, sizeof(int));
-   if (bind(handle->net_fd, res->ai_addr, res->ai_addrlen) < 0)
+   if (!socket_bind(handle->net_fd, (void*)res))
   {
      RARCH_ERR("Failed to bind socket.\n");
      goto error;
@@ -147,79 +197,11 @@ rarch_cmd_t *rarch_cmd_new(bool stdin_enable,

 #if (defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY)) || defined(HAVE_STDIN_CMD)
 error:
-   rarch_cmd_free(handle);
+   rarch_cmd_ctl(RARCH_CMD_CTL_FREE, handle);
   return NULL;
 #endif
 }

-void rarch_cmd_free(rarch_cmd_t *handle)
-{
-#if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY)
-   if (handle && handle->net_fd >= 0)
-      socket_close(handle->net_fd);
-#endif
-
-   free(handle);
-}
-
-struct cmd_map
-{
-   const char *str;
-   unsigned id;
-};
-
-struct cmd_action_map
-{
-   const char *str;
-   bool (*action)(const char *arg);
-   const char *arg_desc;
-};
-
-static const struct cmd_map map[] = {
-   { "FAST_FORWARD",           RARCH_FAST_FORWARD_KEY },
-   { "FAST_FORWARD_HOLD",      RARCH_FAST_FORWARD_HOLD_KEY },
-   { "LOAD_STATE",             RARCH_LOAD_STATE_KEY },
-   { "SAVE_STATE",             RARCH_SAVE_STATE_KEY },
-   { "FULLSCREEN_TOGGLE",      RARCH_FULLSCREEN_TOGGLE_KEY },
-   { "QUIT",                   RARCH_QUIT_KEY },
-   { "STATE_SLOT_PLUS",        RARCH_STATE_SLOT_PLUS },
-   { "STATE_SLOT_MINUS",       RARCH_STATE_SLOT_MINUS },
-   { "REWIND",                 RARCH_REWIND },
-   { "MOVIE_RECORD_TOGGLE",    RARCH_MOVIE_RECORD_TOGGLE },
-   { "PAUSE_TOGGLE",           RARCH_PAUSE_TOGGLE },
-   { "FRAMEADVANCE",           RARCH_FRAMEADVANCE },
-   { "RESET",                  RARCH_RESET },
-   { "SHADER_NEXT",            RARCH_SHADER_NEXT },
-   { "SHADER_PREV",            RARCH_SHADER_PREV },
-   { "CHEAT_INDEX_PLUS",       RARCH_CHEAT_INDEX_PLUS },
-   { "CHEAT_INDEX_MINUS",      RARCH_CHEAT_INDEX_MINUS },
-   { "CHEAT_TOGGLE",           RARCH_CHEAT_TOGGLE },
-   { "SCREENSHOT",             RARCH_SCREENSHOT },
-   { "MUTE",                   RARCH_MUTE },
-   { "OSK",                   RARCH_OSK },
-   { "NETPLAY_FLIP",           RARCH_NETPLAY_FLIP },
-   { "SLOWMOTION",             RARCH_SLOWMOTION },
-   { "VOLUME_UP",              RARCH_VOLUME_UP },
-   { "VOLUME_DOWN",            RARCH_VOLUME_DOWN },
-   { "OVERLAY_NEXT",           RARCH_OVERLAY_NEXT },
-   { "DISK_EJECT_TOGGLE",      RARCH_DISK_EJECT_TOGGLE },
-   { "DISK_NEXT",              RARCH_DISK_NEXT },
-   { "DISK_PREV",              RARCH_DISK_PREV },
-   { "GRAB_MOUSE_TOGGLE",      RARCH_GRAB_MOUSE_TOGGLE },
-   { "MENU_TOGGLE",            RARCH_MENU_TOGGLE },
-   { "MENU_UP",                RETRO_DEVICE_ID_JOYPAD_UP },
-   { "MENU_DOWN",              RETRO_DEVICE_ID_JOYPAD_DOWN },
-   { "MENU_LEFT",              RETRO_DEVICE_ID_JOYPAD_LEFT },
-   { "MENU_RIGHT",             RETRO_DEVICE_ID_JOYPAD_RIGHT },
-   { "MENU_A",                 RETRO_DEVICE_ID_JOYPAD_A },
-   { "MENU_B",                 RETRO_DEVICE_ID_JOYPAD_B },
-};
-
-#define COMMAND_EXT_GLSL      0x7c976537U
-#define COMMAND_EXT_GLSLP     0x0f840c87U
-#define COMMAND_EXT_CG        0x0059776fU
-#define COMMAND_EXT_CGP       0x0b8865bfU
-
 static bool cmd_set_shader(const char *arg)
 {
   char msg[256];
@@ -237,6 +219,10 @@ static bool cmd_set_shader(const char *arg)
      case COMMAND_EXT_CGP:
         type = RARCH_SHADER_CG;
         break;
+      case COMMAND_EXT_SLANG:
+      case COMMAND_EXT_SLANGP:
+         type = RARCH_SHADER_SLANG;
+         break;
      default:
         return false;
   }
@@ -250,10 +236,6 @@ static bool cmd_set_shader(const char *arg)
   return video_driver_set_shader(type, arg);
 }

-static const struct cmd_action_map action_map[] = {
-   { "SET_SHADER", cmd_set_shader, "<shader path>" },
-};
-
 static bool command_get_arg(const char *tok,
      const char **arg, unsigned *index)
 {
@@ -261,7 +243,7 @@ static bool command_get_arg(const char *tok,

   for (i = 0; i < ARRAY_SIZE(map); i++)
   {
-      if (!strcmp(tok, map[i].str))
+      if (string_is_equal(tok, map[i].str))
      {
         if (arg)
            *arg = NULL;
@@ -319,7 +301,7 @@ static void parse_sub_msg(rarch_cmd_t *handle, const char *tok)

 static void parse_msg(rarch_cmd_t *handle, char *buf)
 {
-   char *save = NULL;
+   char *save      = NULL;
   const char *tok = strtok_r(buf, "\n", &save);

   while (tok)
@@ -329,17 +311,6 @@ static void parse_msg(rarch_cmd_t *handle, char *buf)
   }
 }

-void rarch_cmd_set(rarch_cmd_t *handle, unsigned id)
-{
-   if (id < RARCH_BIND_LIST_END)
-      handle->state[id] = true;
-}
-
-bool rarch_cmd_get(rarch_cmd_t *handle, unsigned id)
-{
-   return id < RARCH_BIND_LIST_END && handle->state[id];
-}
-
 #if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY)
 static void network_cmd_poll(rarch_cmd_t *handle)
 {
@@ -380,9 +351,9 @@ static size_t read_stdin(char *buf, size_t size)
 {
   DWORD i;
   DWORD has_read = 0;
-   DWORD avail = 0;
-   bool echo = false;
-   HANDLE hnd = GetStdHandle(STD_INPUT_HANDLE);
+   DWORD avail    = 0;
+   bool echo      = false;
+   HANDLE hnd     = GetStdHandle(STD_INPUT_HANDLE);

   if (hnd == INVALID_HANDLE_VALUE)
      return 0;
@@ -523,19 +494,6 @@ static void stdin_cmd_poll(rarch_cmd_t *handle)
 }
 #endif

-void rarch_cmd_poll(rarch_cmd_t *handle)
-{
-   memset(handle->state, 0, sizeof(handle->state));
-
-#if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY)
-   network_cmd_poll(handle);
-#endif
-
-#ifdef HAVE_STDIN_CMD
-   stdin_cmd_poll(handle);
-#endif
-}
-
 #if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY)
 static bool send_udp_packet(const char *host,
      uint16_t port, const char *msg)
@@ -547,11 +505,6 @@ static bool send_udp_packet(const char *host,
   int fd                      = -1;
   bool ret                    = true;

-#if defined(_WIN32) || defined(HAVE_SOCKET_LEGACY)
-   hints.ai_family   = AF_INET;
-#else
-   hints.ai_family   = AF_UNSPEC;
-#endif
   hints.ai_socktype = SOCK_DGRAM;

   snprintf(port_buf, sizeof(port_buf), "%hu", (unsigned short)port);
@@ -572,7 +525,7 @@ static bool send_udp_packet(const char *host,
         goto end;
      }

-      len = strlen(msg);
+      len     = strlen(msg);
      ret_len = sendto(fd, msg, len, 0, tmp->ai_addr, tmp->ai_addrlen);

      if (ret_len < len)
@@ -611,7 +564,7 @@ static bool verify_command(const char *cmd)
   return false;
 }

-bool network_cmd_send(const char *cmd_)
+static bool network_cmd_send(const char *cmd_)
 {
   bool ret;
   char *command       = NULL;
@@ -655,3 +608,62 @@ bool network_cmd_send(const char *cmd_)
   return ret;
 }
 #endif
+
+bool rarch_cmd_ctl(enum rarch_cmd_ctl_state state, void *data)
+{
+   switch (state)
+   {
+      case RARCH_CMD_CTL_NETWORK_SEND:
+#if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY)
+         network_cmd_send((const char*)data);
+#endif
+         break;
+      case RARCH_CMD_CTL_POLL:
+         {
+            rarch_cmd_t *handle = (rarch_cmd_t*)data;
+            memset(handle->state, 0, sizeof(handle->state));
+
+#if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY)
+            network_cmd_poll(handle);
+#endif
+
+#ifdef HAVE_STDIN_CMD
+            stdin_cmd_poll(handle);
+#endif
+         }
+         break;
+      case RARCH_CMD_CTL_SET:
+         {
+            rarch_cmd_handle_t *handle = (rarch_cmd_handle_t*)data;
+            if (!handle || !handle->handle)
+               return false;
+            if (handle->id < RARCH_BIND_LIST_END)
+               handle->handle->state[handle->id] = true;
+         }
+         break;
+      case RARCH_CMD_CTL_GET:
+         {
+            rarch_cmd_handle_t *handle = (rarch_cmd_handle_t*)data;
+            if (!handle || !handle->handle)
+               return false;
+            return handle->id < RARCH_BIND_LIST_END 
+               && handle->handle->state[handle->id];
+         }
+      case RARCH_CMD_CTL_FREE:
+         {
+            rarch_cmd_t *handle = (rarch_cmd_t*)data;
+#if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY)
+            if (handle && handle->net_fd >= 0)
+               socket_close(handle->net_fd);
+#endif
+
+            free(handle);
+         }
+         break;
+      case RARCH_CMD_CTL_NONE:
+      default:
+         break;
+   }
+
+   return true;
+}
@@ -28,22 +28,28 @@
 extern "C" {
 #endif

+enum rarch_cmd_ctl_state
+{
+   RARCH_CMD_CTL_NONE = 0,
+   RARCH_CMD_CTL_GET,
+   RARCH_CMD_CTL_SET,
+   RARCH_CMD_CTL_POLL,
+   RARCH_CMD_CTL_NETWORK_SEND,
+   RARCH_CMD_CTL_FREE
+};
+
 typedef struct rarch_cmd rarch_cmd_t;

+typedef struct rarch_cmd_handle
+{
+   rarch_cmd_t *handle;
+   unsigned id;
+} rarch_cmd_handle_t;
+
 rarch_cmd_t *rarch_cmd_new(bool stdin_enable,
      bool network_enable, uint16_t port);

-void rarch_cmd_free(rarch_cmd_t *handle);
-
-void rarch_cmd_poll(rarch_cmd_t *handle);
-
-void rarch_cmd_set(rarch_cmd_t *handle, unsigned id);
-
-bool rarch_cmd_get(rarch_cmd_t *handle, unsigned id);
-
-#if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY)
-bool network_cmd_send(const char *cmd);
-#endif
+bool rarch_cmd_ctl(enum rarch_cmd_ctl_state state, void *data);

 #ifdef __cplusplus
 }
@@ -52,6 +52,8 @@ enum event_command
   EVENT_CMD_QUIT,
   /* Reinitialize all drivers. */
   EVENT_CMD_REINIT,
+   /* Toggles cheevos hardcore mode. */
+   EVENT_CMD_CHEEVOS_HARDCORE_MODE_TOGGLE,
   /* Deinitialize rewind. */
   EVENT_CMD_REWIND_DEINIT,
   /* Initializes rewind. */
@@ -120,6 +122,8 @@ enum event_command
   EVENT_CMD_QUIT_RETROARCH,
   /* Shutdown the OS */
   EVENT_CMD_SHUTDOWN,
+   /* Reboot the OS */
+   EVENT_CMD_REBOOT,
   /* Resume RetroArch when in menu. */
   EVENT_CMD_RESUME,
   /* Toggles pause. */
@@ -176,10 +180,6 @@ enum event_command
   EVENT_CMD_REMOTE_INIT,
   /* Deinitializes remote gamepad interface. */
   EVENT_CMD_REMOTE_DEINIT,
-   /* Deinitializes drivers. */
-   EVENT_CMD_DRIVERS_DEINIT,
-   /* Initializes drivers. */
-   EVENT_CMD_DRIVERS_INIT,
   /* Reinitializes audio driver. */
   EVENT_CMD_AUDIO_REINIT,
   /* Resizes windowed scale. Will reinitialize video driver. */
@@ -194,6 +194,8 @@ enum event_command
   EVENT_CMD_DISK_NEXT,
   /* Cycle to previous disk. */
   EVENT_CMD_DISK_PREV,
+   /* Appends disk image to disk image list. */
+   EVENT_CMD_DISK_APPEND_IMAGE,
   /* Stops rumbling. */
   EVENT_CMD_RUMBLE_STOP,
   /* Toggles mouse grab. */
@@ -201,20 +203,11 @@ enum event_command
   /* Toggles fullscreen mode. */
   EVENT_CMD_FULLSCREEN_TOGGLE,
   EVENT_CMD_PERFCNT_REPORT_FRONTEND_LOG,
-   EVENT_CMD_REMAPPING_INIT,
-   EVENT_CMD_REMAPPING_DEINIT,
   EVENT_CMD_VOLUME_UP,
-   EVENT_CMD_VOLUME_DOWN
+   EVENT_CMD_VOLUME_DOWN,
+   EVENT_CMD_EXEC
 };

-/**
- * event_disk_control_append_image:
- * @path                 : Path to disk image. 
- *
- * Appends disk image to disk image list.
- **/
-void event_disk_control_append_image(const char *path);
-
 /**
 * event_command:
 * @cmd                  : Command index.
@@ -223,7 +216,7 @@ void event_disk_control_append_image(const char *path);
 *
 * Returns: true (1) on success, otherwise false (0).
 **/
-bool event_command(enum event_command action);
+bool event_cmd_ctl(enum event_command action, void *data);

 #ifdef __cplusplus
 }
@@ -18,7 +18,6 @@
 #define __CONFIG_DEF_H

 #include <boolean.h>
-#include "libretro.h"
 #include "driver.h"
 #include "gfx/video_driver.h"

@@ -29,6 +28,7 @@
 enum
 {
   VIDEO_GL = 0,
+   VIDEO_VULKAN,
   VIDEO_XVIDEO,
   VIDEO_SDL,
   VIDEO_SDL2,
@@ -125,6 +125,7 @@ enum
   MENU_XUI,
   MENU_MATERIALUI,
   MENU_XMB,
+   MENU_NUKLEAR,

   RECORD_FFMPEG,
   RECORD_NULL
@@ -508,6 +509,24 @@ static const bool overlay_hide_in_menu = true;
 #ifdef HAVE_MENU
 static bool default_block_config_read = true;

+static unsigned xmb_scale_factor = 100;
+static unsigned xmb_alpha_factor = 75;
+static unsigned xmb_theme        = 0;
+
+#ifdef HAVE_LAKKA
+static bool xmb_shadows_enable   = false;
+#else
+static bool xmb_shadows_enable   = true;
+#endif
+
+static unsigned menu_background_gradient = 4;
+
+#if defined(HAVE_OPENGLES2) || defined(OSX_PPC)
+static unsigned menu_shader_pipeline = 1;
+#else
+static unsigned menu_shader_pipeline = 2;
+#endif
+
 static bool show_advanced_settings    = true;
 static const uint32_t menu_entry_normal_color = 0xffffffff;
 static const uint32_t menu_entry_hover_color  = 0xff64ff64;
@@ -577,6 +596,9 @@ static const bool post_filter_record = false;
 /* Screenshots post-shaded GPU output if available. */
 static const bool gpu_screenshot = true;

+/* Screenshots named automatically. */
+static const bool auto_screenshot_filename = true;
+
 /* Record post-shaded GPU output instead of raw game footage if available. */
 static const bool gpu_record = false;

@@ -625,7 +647,12 @@ static const char *audio_device = NULL;

 /* Desired audio latency in milliseconds. Might not be honored
 * if driver can't provide given latency. */
+#ifdef ANDROID
+/* For most Android devices, 64ms is way too low. */
+static const int out_latency = 128;
+#else
 static const int out_latency = 64;
+#endif

 /* Will sync audio. (recommended) */
 static const bool audio_sync = true;
@@ -751,12 +778,18 @@ static const bool input_descriptor_hide_unbound = false;

 static const unsigned input_max_users = 5;

+static const unsigned input_poll_type_behavior = 2;
+
+static const unsigned menu_thumbnails_default = 3;
+
 #ifdef IOS
 static const bool ui_companion_start_on_boot = false;
 #else
 static const bool ui_companion_start_on_boot = true;
 #endif

+static const bool ui_companion_enable = false;
+
 #if defined(ANDROID)
 #if defined(ANDROID_ARM)
 static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/android/latest/armeabi-v7a/";
@@ -74,6 +74,12 @@ static const bool _opengl_supp = true;
 static const bool _opengl_supp = false;
 #endif

+#ifdef HAVE_VULKAN
+static const bool _vulkan_supp = true;
+#else
+static const bool _vulkan_supp = false;
+#endif
+
 #if defined(HAVE_OPENGLES) || defined(HAVE_OPENGLES2) || defined(HAVE_OPENGLES3)
 static const bool _opengles_supp = true;
 #else
@@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2015 The RetroArch team
+/* Copyright  (C) 2010-2016 The RetroArch team
 *
 * ---------------------------------------------------------------------------------------
 * The following license statement only applies to this file (config_file_userdata.c).
@@ -20,9 +20,10 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */

-#include <file/config_file_userdata.h>
 #include <file/file_path.h>
-#include <string/string_list.h>
+#include <lists/string_list.h>
+
+#include "config_file_userdata.h"

 #define get_array_setup() \
   char key[2][256]; \
@@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2015 The RetroArch team
+/* Copyright  (C) 2010-2016 The RetroArch team
 *
 * ---------------------------------------------------------------------------------------
 * The following license statement only applies to this file (config_file_userdata.h).
@@ -25,7 +25,7 @@

 #include <string.h>

-#include "config_file.h"
+#include <file/config_file.h>

 struct config_file_userdata
 {
@@ -1,7 +1,7 @@
 /*  RetroArch - A frontend for libretro.
 *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
 *  Copyright (C) 2011-2016 - Daniel De Matteis
- * 
+ *
 *  RetroArch 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 Found-
 *  ation, either version 3 of the License, or (at your option) any later version.
@@ -72,17 +72,12 @@ typedef struct settings
      unsigned aspect_ratio_idx;
      unsigned rotation;

-      char shader_path[PATH_MAX_LENGTH];
      bool shader_enable;

-      char softfilter_plugin[PATH_MAX_LENGTH];
      float refresh_rate;
      bool threaded;

-      char filter_dir[PATH_MAX_LENGTH];
-      char shader_dir[PATH_MAX_LENGTH];

-      char font_path[PATH_MAX_LENGTH];
      float font_size;
      bool font_enable;
      float msg_pos_x;
@@ -112,6 +107,7 @@ typedef struct settings
      bool menubar_enable;
      bool suspend_screensaver_enable;
      bool companion_start_on_boot;
+      bool companion_enable;
   } ui;

 #ifdef HAVE_MENU
@@ -122,9 +118,8 @@ typedef struct settings
      bool timedate_enable;
      bool core_enable;
      bool dynamic_wallpaper_enable;
-      bool boxart_enable;
+      unsigned thumbnails;
      bool throttle;
-      char wallpaper[PATH_MAX_LENGTH];

      struct
      {
@@ -163,6 +158,15 @@ typedef struct settings
      unsigned entry_normal_color;
      unsigned entry_hover_color;
      unsigned title_color;
+      unsigned xmb_scale_factor;
+      unsigned xmb_alpha_factor;
+      unsigned xmb_theme;
+      unsigned background_gradient;
+      bool xmb_shadows_enable;
+      unsigned shader_pipeline;
+      char xmb_font[PATH_MAX_LENGTH];
+      bool throttle_framerate;
+      bool linear_filter;
   } menu;
 #endif

@@ -190,22 +194,20 @@ typedef struct settings
   struct
   {
      char driver[32];
+      char resampler[32];
+      char device[PATH_MAX_LENGTH];
      bool enable;
      bool mute_enable;
      unsigned out_rate;
      unsigned block_frames;
-      char device[PATH_MAX_LENGTH];
      unsigned latency;
      bool sync;

-      char dsp_plugin[PATH_MAX_LENGTH];
-      char filter_dir[PATH_MAX_LENGTH];

      bool rate_control;
      float rate_control_delta;
      float max_timing_skew;
      float volume; /* dB scale. */
-      char resampler[32];
   } audio;

   struct
@@ -213,6 +215,7 @@ typedef struct settings
      char driver[32];
      char joypad_driver[32];
      char keyboard_layout[64];
+      char device_names[MAX_USERS][64];

      unsigned remap_ids[MAX_USERS][RARCH_BIND_LIST_END];
      struct retro_keybind binds[MAX_USERS][RARCH_BIND_LIST_END];
@@ -233,7 +236,6 @@ typedef struct settings
      float axis_threshold;
      unsigned joypad_map[MAX_USERS];
      unsigned device[MAX_USERS];
-      char device_names[MAX_USERS][64];
      unsigned device_name_index[MAX_USERS];
      bool autodetect_enable;
      bool netplay_client_swap_input;
@@ -244,16 +246,12 @@ typedef struct settings
      bool overlay_enable;
      bool overlay_enable_autopreferred;
      bool overlay_hide_in_menu;
-      char overlay[PATH_MAX_LENGTH];
      float overlay_opacity;
      float overlay_scale;

-      char autoconfig_dir[PATH_MAX_LENGTH];
      bool input_descriptor_label_show;
      bool input_descriptor_hide_unbound;

-      char remapping_path[PATH_MAX_LENGTH];
-      
      unsigned menu_toggle_gamepad_combo;
      bool back_as_menu_toggle_enable;

@@ -262,12 +260,12 @@ typedef struct settings
 #endif
      bool keyboard_gamepad_enable;
      unsigned keyboard_gamepad_mapping_type;
+      unsigned poll_type_behavior;
   } input;

   struct
   {
      bool enable;
-      char overlay[PATH_MAX_LENGTH];
      float opacity;
      float scale;
   } osk;
@@ -284,10 +282,7 @@ typedef struct settings
      bool buildbot_auto_extract_archive;
   } network;

-   struct
-   {
-      bool set_supports_no_game_enable;
-   } core;
+   bool set_supports_no_game_enable;

   struct
   {
@@ -300,6 +295,7 @@ typedef struct settings
   {
      bool enable;
      bool test_unofficial;
+      bool hardcore_mode_enable;
      char username[32];
      char password[32];
   } cheevos;
@@ -310,32 +306,57 @@ typedef struct settings
   bool bundle_assets_extract_enable;
   unsigned bundle_assets_extract_version_current;
   unsigned bundle_assets_extract_last_version;
-   char bundle_assets_src_path[PATH_MAX_LENGTH];
-   char bundle_assets_dst_path[PATH_MAX_LENGTH];
-   char bundle_assets_dst_path_subdir[PATH_MAX_LENGTH];

-   char core_options_path[PATH_MAX_LENGTH];
-   char content_history_path[PATH_MAX_LENGTH];
-   char content_history_directory[PATH_MAX_LENGTH];
+   struct
+   {
+      char cheat_database[PATH_MAX_LENGTH];
+      char content_database[PATH_MAX_LENGTH];
+      char libretro[PATH_MAX_LENGTH];
+      char osk_overlay[PATH_MAX_LENGTH];
+      char overlay[PATH_MAX_LENGTH];
+      char menu_wallpaper[PATH_MAX_LENGTH];
+      char audio_dsp_plugin[PATH_MAX_LENGTH];
+      char softfilter_plugin[PATH_MAX_LENGTH];
+      char core_options[PATH_MAX_LENGTH];
+      char content_history[PATH_MAX_LENGTH];
+      char libretro_info[PATH_MAX_LENGTH];
+      char cheat_settings[PATH_MAX_LENGTH];
+      char bundle_assets_src[PATH_MAX_LENGTH];
+      char bundle_assets_dst[PATH_MAX_LENGTH];
+      char bundle_assets_dst_subdir[PATH_MAX_LENGTH];
+      char shader[PATH_MAX_LENGTH];
+      char font[PATH_MAX_LENGTH];
+   } path;
+
+   struct
+   {
+      char audio_filter[PATH_MAX_LENGTH];
+      char autoconfig[PATH_MAX_LENGTH];
+      char video_filter[PATH_MAX_LENGTH];
+      char video_shader[PATH_MAX_LENGTH];
+      char content_history[PATH_MAX_LENGTH];
+      char libretro[PATH_MAX_LENGTH];
+      char cursor[PATH_MAX_LENGTH];
+      char input_remapping[PATH_MAX_LENGTH];
+      char overlay[PATH_MAX_LENGTH];
+      char resampler[PATH_MAX_LENGTH];
+      char screenshot[PATH_MAX_LENGTH];
+      char system[PATH_MAX_LENGTH];
+      char cache[PATH_MAX_LENGTH];
+      char playlist[PATH_MAX_LENGTH];
+      char core_assets[PATH_MAX_LENGTH];
+      char assets[PATH_MAX_LENGTH];
+      char dynamic_wallpapers[PATH_MAX_LENGTH];
+      char thumbnails[PATH_MAX_LENGTH];
+      char menu_config[PATH_MAX_LENGTH];
+      char menu_content[PATH_MAX_LENGTH];
+   } directory;
+
   unsigned content_history_size;

-   char libretro[PATH_MAX_LENGTH];
-   char libretro_directory[PATH_MAX_LENGTH];
   unsigned libretro_log_level;
-   char libretro_info_path[PATH_MAX_LENGTH];
-   char content_database[PATH_MAX_LENGTH];
-   char cheat_database[PATH_MAX_LENGTH];
-   char cursor_directory[PATH_MAX_LENGTH];
-   char cheat_settings_path[PATH_MAX_LENGTH];
-   char input_remapping_directory[PATH_MAX_LENGTH];

-   char overlay_directory[PATH_MAX_LENGTH];
-   char resampler_directory[PATH_MAX_LENGTH];
-   char screenshot_directory[PATH_MAX_LENGTH];
-   char system_directory[PATH_MAX_LENGTH];
-
-   char cache_directory[PATH_MAX_LENGTH];
-   char playlist_directory[PATH_MAX_LENGTH];
+   bool auto_screenshot_filename;

   bool history_list_enable;
   bool rewind_enable;
@@ -361,13 +382,7 @@ typedef struct settings
   unsigned network_remote_base_port;
   bool debug_panel_enable;

-   char core_assets_directory[PATH_MAX_LENGTH];
-   char assets_directory[PATH_MAX_LENGTH];
-   char dynamic_wallpapers_directory[PATH_MAX_LENGTH];
-   char boxarts_directory[PATH_MAX_LENGTH];
-   char menu_config_directory[PATH_MAX_LENGTH];
 #if defined(HAVE_MENU)
-   char menu_content_directory[PATH_MAX_LENGTH];
   bool menu_show_start_screen;
 #endif
   bool fps_show;
@@ -393,6 +408,13 @@ typedef struct settings
   unsigned int user_language;

   bool config_save_on_exit;
+
+#ifdef HAVE_SYSTEMD
+   bool ssh_enable;
+   bool samba_enable;
+   bool bluetooth_enable;
+#endif
+
 } settings_t;

 /**
@@ -520,16 +542,6 @@ bool config_unload_override(void);
 */
 bool config_load_remap(void);

-/**
- * config_save_keybinds_file:
- * @path            : Path that shall be written to.
- *
- * Writes a keybinds config file to disk.
- *
- * Returns: true (1) on success, otherwise returns false (0).
- **/
-bool config_save_keybinds_file(const char *path);
-
 /**
 * config_save_autoconf_profile:
 * @path            : Path that shall be written to.
@@ -17,73 +17,90 @@
 #ifndef __RARCH_FILE_H
 #define __RARCH_FILE_H

-#include <boolean.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
 #include <sys/types.h>

+#include <boolean.h>
+
+#include "frontend/frontend_driver.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

-/* Handles files related to libretro. */
+enum content_ctl_state
+{
+   CONTENT_CTL_NONE = 0,

-/**
- * load_state:
- * @path      : path that state will be loaded from.
- *
- * Load a state from disk to memory.
- *
- * Returns: true if successful, false otherwise.
- **/
-bool load_state(const char *path);
+   CONTENT_CTL_IS_INITED,

-/**
- * save_state:
- * @path      : path of saved state that shall be written to.
- *
- * Save a state from memory to disk.
- *
- * Returns: true if successful, false otherwise.
- **/
-bool save_state(const char *path);
+   CONTENT_CTL_DOES_NOT_NEED_CONTENT,

-/**
- * load_ram_file:
- * @path             : path of RAM state that will be loaded from.
- * @type             : type of memory
- *
- * Load a RAM state from disk to memory.
- */
-void load_ram_file(const char *path, int type);
+   CONTENT_CTL_SET_DOES_NOT_NEED_CONTENT,

-/**
- * save_ram_file:
- * @path             : path of RAM state that shall be written to.
- * @type             : type of memory
- *
- * Save a RAM state from memory to disk.
- *
- * In case the file could not be written to, a fallback function
- * 'dump_to_file_desperate' will be called.
- */
-void save_ram_file(const char *path, int type);
+   CONTENT_CTL_UNSET_DOES_NOT_NEED_CONTENT,

-/**
- * init_content_file:
- *
- * Initializes and loads a content file for the currently
- * selected libretro core.
- *
- * global->content_is_init will be set to the return value
- * on exit.
- *
- * Returns : true if successful, otherwise false.
- **/
-bool init_content_file(void);
+   /* Initializes and loads a content file for the currently
+    * selected libretro core. */
+   CONTENT_CTL_INIT,

-void content_temporary_free(void);
+   CONTENT_CTL_DEINIT,
+
+   /* Loads content file and starts up RetroArch.
+    * If no content file can be loaded, will start up RetroArch
+    * as-is. */
+   CONTENT_CTL_LOAD,
+
+   CONTENT_CTL_GET_CRC,
+
+   /* Load a RAM state from disk to memory. */
+   CONTENT_CTL_LOAD_RAM_FILE,
+
+   /* Save a RAM state from memory to disk. */
+   CONTENT_CTL_SAVE_RAM_FILE,
+
+   /* Load a state from disk to memory. */
+   CONTENT_CTL_LOAD_STATE,
+
+   /* Save a state from memory to disk. */
+   CONTENT_CTL_SAVE_STATE,
+
+   /* Frees temporary content handle. */
+   CONTENT_CTL_TEMPORARY_FREE,
+
+   CONTENT_CTL_STREAM_INIT,
+
+   CONTENT_CTL_STREAM_CRC_CALCULATE
+};
+
+typedef struct ram_type
+{
+   const char *path;
+   int type;
+} ram_type_t;
+
+typedef struct content_stream
+{
+   uint32_t a;
+   const uint8_t *b;
+   size_t c;
+   uint32_t crc;
+} content_stream_t;
+
+typedef struct content_ctx_info
+{
+   int argc;                       /* Argument count. */
+   char **argv;                    /* Argument variable list. */
+   void *args;                     /* Arguments passed from callee */
+   environment_get_t environ_get;  /* Function passed for environment_get function */
+} content_ctx_info_t;
+
+void content_push_to_history_playlist(bool do_push,
+      const char *path, void *data);
+
+bool content_ctl(enum content_ctl_state state, void *data);

 #ifdef __cplusplus
 }
@@ -16,17 +16,24 @@
 */

 #include <file/file_path.h>
-#include <file/file_extract.h>
+#include <lists/dir_list.h>
+#include <file/archive_file.h>
+#include <compat/strl.h>
+
+#include <string/stdstring.h>

 #include "core_info.h"
-#include "general.h"
-#include "dir_list_special.h"
+#include "configuration.h"
+#include "list_special.h"
 #include "config.def.h"

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

+static const char *core_info_tmp_path = NULL;
+static const struct string_list *core_info_tmp_list = NULL;
+
 static void core_info_list_resolve_all_extensions(
      core_info_list_t *core_info_list)
 {
@@ -103,13 +110,91 @@ static void core_info_list_resolve_all_firmware(
   }
 }

+static void core_info_list_free(core_info_list_t *core_info_list)
+{
+   size_t i, j;
+
+   if (!core_info_list)
+      return;
+
+   for (i = 0; i < core_info_list->count; i++)
+   {
+      core_info_t *info = (core_info_t*)&core_info_list->list[i];
+
+      if (!info)
+         continue;
+
+      free(info->path);
+      free(info->core_name);
+      free(info->systemname);
+      free(info->system_manufacturer);
+      free(info->display_name);
+      free(info->supported_extensions);
+      free(info->authors);
+      free(info->permissions);
+      free(info->licenses);
+      free(info->categories);
+      free(info->databases);
+      free(info->notes);
+      if (info->supported_extensions_list)
+         string_list_free(info->supported_extensions_list);
+      string_list_free(info->authors_list);
+      string_list_free(info->note_list);
+      string_list_free(info->permissions_list);
+      string_list_free(info->licenses_list);
+      string_list_free(info->categories_list);
+      string_list_free(info->databases_list);
+      config_file_free((config_file_t*)info->config_data);
+
+      for (j = 0; j < info->firmware_count; j++)
+      {
+         free(info->firmware[j].path);
+         free(info->firmware[j].desc);
+      }
+      free(info->firmware);
+   }
+
+   free(core_info_list->all_ext);
+   free(core_info_list->list);
+   free(core_info_list);
+}
+
+static config_file_t *core_info_list_iterate(
+      struct string_list *contents, size_t i)
+{
+   char info_path_base[PATH_MAX_LENGTH];
+   char info_path[PATH_MAX_LENGTH];
+   settings_t *settings = config_get_ptr();
+
+   if (!contents->elems[i].data)
+      return NULL;
+
+   fill_pathname_base(info_path_base, contents->elems[i].data,
+         sizeof(info_path_base));
+   path_remove_extension(info_path_base);
+
+#if defined(RARCH_MOBILE) || (defined(RARCH_CONSOLE) && !defined(PSP))
+   char *substr = strrchr(info_path_base, '_');
+   if (substr)
+      *substr = '\0';
+#endif
+
+   strlcat(info_path_base, ".info", sizeof(info_path_base));
+
+   fill_pathname_join(info_path, (*settings->path.libretro_info) ?
+         settings->path.libretro_info : settings->directory.libretro,
+         info_path_base, sizeof(info_path));
+
+   return config_file_new(info_path);
+}
+
 void core_info_get_name(const char *path, char *s, size_t len)
 {
   size_t i;
-   core_info_t *core_info = NULL;
+   core_info_t *core_info           = NULL;
   core_info_list_t *core_info_list = NULL;
-   settings_t *settings = config_get_ptr();
-   struct string_list *contents = dir_list_new_special(NULL, DIR_LIST_CORES, NULL);
+   struct string_list *contents     = dir_list_new_special(
+         NULL, DIR_LIST_CORES, NULL);

   if (!contents)
      return;
@@ -127,35 +212,12 @@ void core_info_get_name(const char *path, char *s, size_t len)

   for (i = 0; i < contents->size; i++)
   {
-      config_file_t *conf                  = NULL;
-      char info_path_base[PATH_MAX_LENGTH] = {0};
-      char info_path[PATH_MAX_LENGTH]      = {0};
+      config_file_t *conf = NULL;

-      core_info[i].path = strdup(contents->elems[i].data);
-
-      if (!core_info[i].path)
-         break;
-
-      if (strcmp(core_info[i].path, path) != 0)
-            continue;
-
-      fill_pathname_base(info_path_base, contents->elems[i].data,
-            sizeof(info_path_base));
-      path_remove_extension(info_path_base);
-
-#if defined(RARCH_MOBILE) || (defined(RARCH_CONSOLE) && !defined(PSP))
-      char *substr = strrchr(info_path_base, '_');
-      if (substr)
-         *substr = '\0';
-#endif
-
-      strlcat(info_path_base, ".info", sizeof(info_path_base));
-
-      fill_pathname_join(info_path, (*settings->libretro_info_path) ?
-            settings->libretro_info_path : settings->libretro_directory,
-            info_path_base, sizeof(info_path));
-
-      conf = config_file_new(info_path);
+      if (!string_is_equal(contents->elems[i].data, path))
+         continue;
+      
+      conf = core_info_list_iterate(contents, i);

      if (conf)
      {
@@ -164,6 +226,8 @@ void core_info_get_name(const char *path, char *s, size_t len)
         core_info[i].config_data = (void*)conf;
      }

+      core_info[i].path = strdup(contents->elems[i].data);
+
      strlcpy(s, core_info[i].core_name, len);
   }

@@ -174,13 +238,14 @@ error:
   core_info_list_free(core_info_list);
 }

-core_info_list_t *core_info_list_new(void)
+
+static core_info_list_t *core_info_list_new(void)
 {
   size_t i;
-   core_info_t *core_info = NULL;
+   core_info_t *core_info           = NULL;
   core_info_list_t *core_info_list = NULL;
-   settings_t *settings = config_get_ptr();
-   struct string_list *contents = dir_list_new_special(NULL, DIR_LIST_CORES, NULL);
+   struct string_list *contents     = 
+      dir_list_new_special(NULL, DIR_LIST_CORES, NULL);

   if (!contents)
      return NULL;
@@ -198,35 +263,12 @@ core_info_list_t *core_info_list_new(void)

   for (i = 0; i < contents->size; i++)
   {
-      config_file_t *conf                  = NULL;
-      char info_path_base[PATH_MAX_LENGTH] = {0};
-      char info_path[PATH_MAX_LENGTH]      = {0};
-      core_info[i].path = strdup(contents->elems[i].data);
-
-      if (!core_info[i].path)
-         break;
-
-      fill_pathname_base(info_path_base, contents->elems[i].data,
-            sizeof(info_path_base));
-      path_remove_extension(info_path_base);
-
-#if defined(RARCH_MOBILE) || (defined(RARCH_CONSOLE) && !defined(PSP))
-      char *substr = strrchr(info_path_base, '_');
-      if (substr)
-         *substr = '\0';
-#endif
-
-      strlcat(info_path_base, ".info", sizeof(info_path_base));
-
-      fill_pathname_join(info_path, (*settings->libretro_info_path) ?
-            settings->libretro_info_path : settings->libretro_directory,
-            info_path_base, sizeof(info_path));
-
-      conf = config_file_new(info_path);
+      config_file_t *conf = core_info_list_iterate(contents, i);

      if (conf)
      {
         unsigned count = 0;
+
         config_get_string(conf, "display_name",
               &core_info[i].display_name);
         config_get_string(conf, "corename",
@@ -284,8 +326,11 @@ core_info_list_t *core_info_list_new(void)
         core_info[i].config_data = conf;
      }

+      core_info[i].path = strdup(contents->elems[i].data);
+
      if (!core_info[i].display_name)
-         core_info[i].display_name = strdup(path_basename(core_info[i].path));
+         core_info[i].display_name = 
+            strdup(path_basename(core_info[i].path));
   }

   core_info_list_resolve_all_extensions(core_info_list);
@@ -301,54 +346,6 @@ error:
   return NULL;
 }

-void core_info_list_free(core_info_list_t *core_info_list)
-{
-   size_t i, j;
-
-   if (!core_info_list)
-      return;
-
-   for (i = 0; i < core_info_list->count; i++)
-   {
-      core_info_t *info = (core_info_t*)&core_info_list->list[i];
-
-      if (!info)
-         continue;
-
-      free(info->path);
-      free(info->core_name);
-      free(info->systemname);
-      free(info->system_manufacturer);
-      free(info->display_name);
-      free(info->supported_extensions);
-      free(info->authors);
-      free(info->permissions);
-      free(info->licenses);
-      free(info->categories);
-      free(info->databases);
-      free(info->notes);
-      if (info->supported_extensions_list)
-         string_list_free(info->supported_extensions_list);
-      string_list_free(info->authors_list);
-      string_list_free(info->note_list);
-      string_list_free(info->permissions_list);
-      string_list_free(info->licenses_list);
-      string_list_free(info->categories_list);
-      string_list_free(info->databases_list);
-      config_file_free((config_file_t*)info->config_data);
-
-      for (j = 0; j < info->firmware_count; j++)
-      {
-         free(info->firmware[j].path);
-         free(info->firmware[j].desc);
-      }
-      free(info->firmware);
-   }
-
-   free(core_info_list->all_ext);
-   free(core_info_list->list);
-   free(core_info_list);
-}

 size_t core_info_list_num_info_files(core_info_list_t *core_info_list)
 {
@@ -359,7 +356,8 @@ size_t core_info_list_num_info_files(core_info_list_t *core_info_list)

   for (i = 0; i < core_info_list->count; i++)
   {
-      config_file_t *conf = (config_file_t*)core_info_list->list[i].config_data;
+      config_file_t *conf = (config_file_t*)
+         core_info_list->list[i].config_data;
      num += !!conf;
   }

@@ -367,7 +365,7 @@ size_t core_info_list_num_info_files(core_info_list_t *core_info_list)
 }

 bool core_info_list_get_display_name(core_info_list_t *core_info_list,
-      const char *path, char *buf, size_t size)
+      const char *path, char *s, size_t len)
 {
   size_t i;

@@ -377,10 +375,10 @@ bool core_info_list_get_display_name(core_info_list_t *core_info_list,
   for (i = 0; i < core_info_list->count; i++)
   {
      const core_info_t *info = &core_info_list->list[i];
-      if (!strcmp(path_basename(info->path), path_basename(path))
+      if (string_is_equal(path_basename(info->path), path_basename(path))
            && info->display_name)
      {
-         strlcpy(buf, info->display_name, size);
+         strlcpy(s, info->display_name, len);
         return true;
      }
   }
@@ -428,7 +426,11 @@ error:
   return false;
 }

-bool core_info_list_get_info(core_info_list_t *core_info_list,
+/* Shallow-copies internal state. 
+ *
+ * Data in *info is invalidated when the
+ * core_info_list is freed. */
+static bool core_info_list_get_info(core_info_list_t *core_info_list,
      core_info_t *out_info, const char *path)
 {
   size_t i;
@@ -440,7 +442,9 @@ bool core_info_list_get_info(core_info_list_t *core_info_list,
   for (i = 0; i < core_info_list->count; i++)
   {
      const core_info_t *info = &core_info_list->list[i];
-      if (!strcmp(path_basename(info->path), path_basename(path)))
+
+      if (string_is_equal(path_basename(info->path), 
+               path_basename(path)))
      {
         *out_info = *info;
         return true;
@@ -450,7 +454,7 @@ bool core_info_list_get_info(core_info_list_t *core_info_list,
   return false;
 }

-bool core_info_does_support_any_file(const core_info_t *core,
+static bool core_info_does_support_any_file(const core_info_t *core,
      const struct string_list *list)
 {
   size_t i;
@@ -464,7 +468,8 @@ bool core_info_does_support_any_file(const core_info_t *core,
   return false;
 }

-bool core_info_does_support_file(const core_info_t *core, const char *path)
+static bool core_info_does_support_file(
+      const core_info_t *core, const char *path)
 {
   if (!path || !core || !core->supported_extensions_list)
      return false;
@@ -472,27 +477,18 @@ bool core_info_does_support_file(const core_info_t *core, const char *path)
         core->supported_extensions_list, ".", path_get_extension(path));
 }

-const char *core_info_list_get_all_extensions(void)
-{
-   core_info_list_t *list = NULL;
-   runloop_ctl(RUNLOOP_CTL_CURRENT_CORE_LIST_GET, &list);
-   if (!list)
-      return NULL;
-   return list->all_ext;
-}
-
 /* qsort_r() is not in standard C, sadly. */
-static const char *core_info_tmp_path;
-static const struct string_list *core_info_tmp_list;

 static int core_info_qsort_cmp(const void *a_, const void *b_)
 {
   const core_info_t *a = (const core_info_t*)a_;
   const core_info_t *b = (const core_info_t*)b_;
-   int support_a        = core_info_does_support_any_file(a, core_info_tmp_list) ||
-      core_info_does_support_file(a, core_info_tmp_path);
-   int support_b        = core_info_does_support_any_file(b, core_info_tmp_list) ||
-      core_info_does_support_file(b, core_info_tmp_path);
+   int support_a        = 
+         core_info_does_support_any_file(a, core_info_tmp_list)
+      || core_info_does_support_file(a, core_info_tmp_path);
+   int support_b        = 
+         core_info_does_support_any_file(b, core_info_tmp_list)
+      || core_info_does_support_file(b, core_info_tmp_path);

   if (support_a != support_b)
      return support_b - support_a;
@@ -502,19 +498,19 @@ static int core_info_qsort_cmp(const void *a_, const void *b_)
 void core_info_list_get_supported_cores(core_info_list_t *core_info_list,
      const char *path, const core_info_t **infos, size_t *num_infos)
 {
+#ifdef HAVE_ZLIB
   struct string_list *list = NULL;
+#endif
   size_t supported = 0, i;

   if (!core_info_list)
      return;

-   (void)list;
-
   core_info_tmp_path = path;

 #ifdef HAVE_ZLIB
-   if (!strcasecmp(path_get_extension(path), "zip"))
-      list = zlib_get_file_list(path, NULL);
+   if (string_is_equal_noncase(path_get_extension(path), "zip"))
+      list = file_archive_get_file_list(path, NULL);
   core_info_tmp_list = list;
 #endif

@@ -546,30 +542,10 @@ void core_info_list_get_supported_cores(core_info_list_t *core_info_list,
      string_list_free(list);
 #endif

-   *infos = core_info_list->list;
+   *infos     = core_info_list->list;
   *num_infos = supported;
 }

-core_info_t *core_info_find(core_info_list_t *list,
-      const char *core)
-{
-   size_t i;
-
-   for (i = 0; i < list->count; i++)
-   {
-      core_info_t *info = (core_info_t*)&list->list[i];
-
-      if (!info)
-         continue;
-      if (!info->path)
-         continue;
-      if (!strcmp(info->path, core))
-         return info;
-   }
-
-   return NULL;
-}
-
 core_info_t *core_info_get(core_info_list_t *list, size_t i)
 {
   core_info_t *info = NULL;
@@ -583,6 +559,55 @@ core_info_t *core_info_get(core_info_list_t *list, size_t i)
   return info;
 }

+static core_info_t *core_info_find(core_info_list_t *list,
+      const char *core)
+{
+   size_t i;
+
+   for (i = 0; i < list->count; i++)
+   {
+      core_info_t *info = core_info_get(list, i);
+
+      if (!info)
+         continue;
+      if (string_is_equal(info->path, core))
+         return info;
+   }
+
+   return NULL;
+}
+
+
+static bool core_info_list_update_missing_firmware(
+      core_info_list_t *core_info_list,
+      const char *core, const char *systemdir)
+{
+   size_t i;
+   char path[PATH_MAX_LENGTH] = {0};
+   core_info_t          *info = NULL;
+
+   if (!core_info_list || !core)
+      return false;
+
+   info = core_info_find(core_info_list, core);
+
+   if (!info)
+      return false;
+
+   for (i = 0; i < info->firmware_count; i++)
+   {
+      if (!info->firmware[i].path)
+         continue;
+
+      fill_pathname_join(path, systemdir,
+            info->firmware[i].path, sizeof(path));
+      info->firmware[i].missing = !path_file_exists(path);
+   }
+
+   return true;
+}
+
+#if 0
 static int core_info_firmware_cmp(const void *a_, const void *b_)
 {
   const core_info_firmware_t *a = (const core_info_firmware_t*)a_;
@@ -594,31 +619,10 @@ static int core_info_firmware_cmp(const void *a_, const void *b_)
   return strcasecmp(a->path, b->path);
 }

-void core_info_list_update_missing_firmware(core_info_list_t *core_info_list,
-      const char *core, const char *systemdir)
-{
-   size_t i;
-   char path[PATH_MAX_LENGTH] = {0};
-   core_info_t          *info = NULL;
+/* Non-reentrant, does not allocate. Returns pointer to internal state. */

-   if (!core_info_list || !core)
-      return;
-
-   if (!(info = core_info_find(core_info_list, core)))
-      return;
-
-   for (i = 0; i < info->firmware_count; i++)
-   {
-      if (!info->firmware[i].path)
-         continue;
-
-      fill_pathname_join(path, systemdir,
-            info->firmware[i].path, sizeof(path));
-      info->firmware[i].missing = !path_file_exists(path);
-   }
-}
-
-void core_info_list_get_missing_firmware(core_info_list_t *core_info_list,
+static void core_info_list_get_missing_firmware(
+      core_info_list_t *core_info_list,
      const char *core, const char *systemdir,
      const core_info_firmware_t **firmware, size_t *num_firmware)
 {
@@ -639,7 +643,8 @@ void core_info_list_get_missing_firmware(core_info_list_t *core_info_list,

   for (i = 1; i < info->firmware_count; i++)
   {
-      fill_pathname_join(path, systemdir, info->firmware[i].path, sizeof(path));
+      fill_pathname_join(path, systemdir,
+            info->firmware[i].path, sizeof(path));
      info->firmware[i].missing = !path_file_exists(path);
      *num_firmware += info->firmware[i].missing;
   }
@@ -647,3 +652,90 @@ void core_info_list_get_missing_firmware(core_info_list_t *core_info_list,
   qsort(info->firmware, info->firmware_count, sizeof(*info->firmware),
         core_info_firmware_cmp);
 }
+#endif
+
+bool core_info_ctl(enum core_info_state state, void *data)
+{
+   static core_info_t *core_info_current            = NULL;
+   static core_info_list_t *core_info_curr_list     = NULL;
+
+   switch (state)
+   {
+      case CORE_INFO_CTL_CURRENT_CORE_FREE:
+         if (core_info_current)
+            free(core_info_current);
+         core_info_current = NULL;
+         break;
+      case CORE_INFO_CTL_CURRENT_CORE_INIT:
+         core_info_current = (core_info_t*)calloc(1, sizeof(core_info_t));
+         if (!core_info_current)
+            return false;
+         break;
+      case CORE_INFO_CTL_CURRENT_CORE_GET:
+         {
+            core_info_t **core = (core_info_t**)data;
+            if (!core)
+               return false;
+            *core = core_info_current;
+         }
+         break;
+      case CORE_INFO_CTL_LIST_DEINIT:
+         if (core_info_curr_list)
+            core_info_list_free(core_info_curr_list);
+         core_info_curr_list = NULL;
+         break;
+      case CORE_INFO_CTL_LIST_INIT:
+         core_info_curr_list = core_info_list_new();
+         break;
+      case CORE_INFO_CTL_LIST_GET:
+         {
+            core_info_list_t **core = (core_info_list_t**)data;
+            if (!core)
+               return false;
+            *core = core_info_curr_list;
+         }
+         break;
+      case CORE_INFO_CTL_LIST_UPDATE_MISSING_FIRMWARE:
+         {
+            core_info_ctx_firmware_t *info = (core_info_ctx_firmware_t*)data;
+            if (!info)
+               return false;
+
+            return core_info_list_update_missing_firmware(core_info_curr_list,
+                  info->path, info->directory.system);
+         }
+      case CORE_INFO_CTL_FIND:
+         {
+            core_info_ctx_find_t *info = (core_info_ctx_find_t*)data;
+            if (!info || !core_info_curr_list)
+               return false;
+            info->inf = core_info_find(core_info_curr_list, info->path);
+            if (!info->inf)
+               return false;
+         }
+         break;
+      case CORE_INFO_CTL_LOAD:
+         {
+            core_info_t *core_info     = NULL;
+            core_info_ctx_find_t *info = (core_info_ctx_find_t*)data;
+
+            if (!info)
+               return false;
+
+            core_info_ctl(CORE_INFO_CTL_CURRENT_CORE_GET, &core_info);
+
+            if (!core_info_curr_list)
+               return false;
+
+            if (!core_info_list_get_info(core_info_curr_list,
+                     core_info, info->path))
+               return false;
+         }
+         break;
+      case CORE_INFO_CTL_NONE:
+      default:
+         break;
+   }
+
+   return true;
+}
@@ -20,10 +20,26 @@

 #include <stddef.h>

+#include <lists/string_list.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif

+enum core_info_state
+{
+   CORE_INFO_CTL_NONE = 0,
+   CORE_INFO_CTL_LIST_DEINIT,
+   CORE_INFO_CTL_LIST_INIT,
+   CORE_INFO_CTL_LIST_GET,
+   CORE_INFO_CTL_LIST_UPDATE_MISSING_FIRMWARE,
+   CORE_INFO_CTL_CURRENT_CORE_FREE,
+   CORE_INFO_CTL_CURRENT_CORE_INIT,
+   CORE_INFO_CTL_CURRENT_CORE_GET,
+   CORE_INFO_CTL_LOAD,
+   CORE_INFO_CTL_FIND
+};
+
 typedef struct
 {
   char *path;
@@ -70,41 +86,29 @@ typedef struct
   char *all_ext;
 } core_info_list_t;

-core_info_list_t *core_info_list_new(void);
-void core_info_list_free(core_info_list_t *list);
+typedef struct core_info_ctx_firmware
+{
+   const char *path;
+   struct
+   {
+      const char *system;
+   } directory;
+} core_info_ctx_firmware_t;
+
+typedef struct core_info_ctx_find
+{
+   core_info_t *inf;
+   const char *path;
+} core_info_ctx_find_t;

 size_t core_info_list_num_info_files(core_info_list_t *list);

-bool core_info_does_support_file(const core_info_t *info,
-      const char *path);
-
-bool core_info_does_support_any_file(const core_info_t *info,
-      const struct string_list *list);
-
 /* Non-reentrant, does not allocate. Returns pointer to internal state. */
 void core_info_list_get_supported_cores(core_info_list_t *list,
      const char *path, const core_info_t **infos, size_t *num_infos);

-/* Non-reentrant, does not allocate. Returns pointer to internal state. */
-void core_info_list_get_missing_firmware(core_info_list_t *list,
-      const char *core, const char *systemdir,
-      const core_info_firmware_t **firmware, size_t *num_firmware);
-
-void core_info_list_update_missing_firmware(core_info_list_t *list,
-      const char *core, const char *systemdir);	  
-	  
-/* Shallow-copies internal state. Data in *info is invalidated when the
- * core_info_list is freed. */
-bool core_info_list_get_info(core_info_list_t *list,
-      core_info_t *info, const char *path);
-
-const char *core_info_list_get_all_extensions(void);
-
-core_info_t *core_info_find(core_info_list_t *list,
-      const char *core);
-
 bool core_info_list_get_display_name(core_info_list_t *list,
-      const char *path, char *buf, size_t size);
+      const char *path, char *s, size_t len);

 bool core_info_get_display_name(const char *path, char *s, size_t len);

@@ -112,6 +116,8 @@ void core_info_get_name(const char *path, char *s, size_t len);

 core_info_t *core_info_get(core_info_list_t *list, size_t i);

+bool core_info_ctl(enum core_info_state action, void *data);
+
 #ifdef __cplusplus
 }
 #endif
@@ -17,10 +17,14 @@
 #include <string.h>

 #include <file/config_file.h>
-#include <file/dir_list.h>
+#include <lists/dir_list.h>
+#include <lists/string_list.h>
 #include <compat/posix_string.h>
 #include <compat/strl.h>
 #include <retro_miscellaneous.h>
+#include <string/stdstring.h>
+
+#include "libretro.h"

 #include "core_options.h"

@@ -57,9 +61,17 @@ void core_option_free(core_option_manager_t *opt)

   for (i = 0; i < opt->size; i++)
   {
-      free(opt->opts[i].desc);
-      free(opt->opts[i].key);
-      string_list_free(opt->opts[i].vals);
+      if (opt->opts[i].desc)
+         free(opt->opts[i].desc);
+      if (opt->opts[i].key)
+         free(opt->opts[i].key);
+
+      if (opt->opts[i].vals)
+         string_list_free(opt->opts[i].vals);
+
+      opt->opts[i].desc = NULL;
+      opt->opts[i].key  = NULL;
+      opt->opts[i].vals = NULL;
   }

   if (opt->conf)
@@ -68,9 +80,10 @@ void core_option_free(core_option_manager_t *opt)
   free(opt);
 }

-void core_option_get(core_option_manager_t *opt, struct retro_variable *var)
+void core_option_get(core_option_manager_t *opt, void *data)
 {
   size_t i;
+   struct retro_variable *var = (struct retro_variable*)data;

   if (!opt)
      return;
@@ -79,7 +92,10 @@ void core_option_get(core_option_manager_t *opt, struct retro_variable *var)

   for (i = 0; i < opt->size; i++)
   {
-      if (!strcmp(opt->opts[i].key, var->key))
+      if (string_is_empty(opt->opts[i].key))
+         continue;
+
+      if (string_is_equal(opt->opts[i].key, var->key))
      {
         var->value = core_option_get_val(opt, i);
         return;
@@ -129,7 +145,7 @@ static bool parse_variable(core_option_manager_t *opt, size_t idx,

      for (i = 0; i < option->vals->size; i++)
      {
-         if (!strcmp(option->vals->elems[i].data, config_val))
+         if (string_is_equal(option->vals->elems[i].data, config_val))
         {
            option->index = i;
            break;
@@ -154,11 +170,12 @@ static bool parse_variable(core_option_manager_t *opt, size_t idx,
 * Returns: handle to new core manager handle, otherwise NULL.
 **/
 core_option_manager_t *core_option_new(const char *conf_path,
-      const struct retro_variable *vars)
+      const void *data)
 {
   const struct retro_variable *var;
-   size_t size                      = 0;
-   core_option_manager_t *opt       = (core_option_manager_t*)
+   const struct retro_variable *vars = (const struct retro_variable*)data;
+   size_t size                       = 0;
+   core_option_manager_t *opt        = (core_option_manager_t*)
      calloc(1, sizeof(*opt));

   if (!opt)
@@ -312,24 +329,6 @@ const char *core_option_get_val(core_option_manager_t *opt, size_t idx)
   return option->vals->elems[option->index].data;
 }

-/**
- * core_option_get_vals:
- * @opt                   : pointer to core option manager object.
- * @idx                   : idx of core option.
- *
- * Gets list of core option values from core option at index @idx.
- *
- * Returns: string list of core option values if successful, otherwise
- * NULL.
- **/
-struct string_list *core_option_get_vals(
-      core_option_manager_t *opt, size_t idx)
-{
-   if (!opt)
-      return NULL;
-   return opt->opts[idx].vals;
-}
-
 void core_option_set_val(core_option_manager_t *opt,
      size_t idx, size_t val_idx)
 {
@@ -17,10 +17,9 @@
 #ifndef CORE_OPTIONS_H__
 #define CORE_OPTIONS_H__

-#include <boolean.h>
-#include "libretro.h"
 #include <stddef.h>
-#include <string/string_list.h>
+
+#include <boolean.h>

 #ifdef __cplusplus
 extern "C" {
@@ -38,7 +37,7 @@ typedef struct core_option_manager core_option_manager_t;
 * Returns: handle to new core manager handle, otherwise NULL.
 **/
 core_option_manager_t *core_option_new(const char *conf_path,
-      const struct retro_variable *vars);
+      const void *data);

 /**
 * core_option_updated:
@@ -72,7 +71,8 @@ bool core_option_flush(core_option_manager_t *opt);
 * Returns: true (1) if core option values could be
 * successfully saved to disk, otherwise false (0).
 **/
-bool core_option_flush_game_specific(core_option_manager_t *opt, char* path);
+bool core_option_flush_game_specific(
+      core_option_manager_t *opt, char* path);

 /**
 * core_option_free:
@@ -82,7 +82,7 @@ bool core_option_flush_game_specific(core_option_manager_t *opt, char* path);
 **/
 void core_option_free(core_option_manager_t *opt);

-void core_option_get(core_option_manager_t *opt, struct retro_variable *var);
+void core_option_get(core_option_manager_t *opt,  void *data);

 /**
 * core_option_size:
@@ -103,7 +103,8 @@ size_t core_option_size(core_option_manager_t *opt);
 *
 * Returns: Description for an option.
 **/
-const char *core_option_get_desc(core_option_manager_t *opt, size_t idx);
+const char *core_option_get_desc(core_option_manager_t *opt, 
+      size_t idx);

 /**
 * core_option_get_val:
@@ -114,20 +115,8 @@ const char *core_option_get_desc(core_option_manager_t *opt, size_t idx);
 *
 * Returns: Value for an option.
 **/
-const char *core_option_get_val(core_option_manager_t *opt, size_t idx);
-
-/**
- * core_option_get_vals:
- * @opt                   : pointer to core option manager object.
- * @idx                   : idx of core option.
- *
- * Gets list of core option values from core option at index @idx.
- *
- * Returns: string list of core option values if successful, otherwise
- * NULL.
- **/
-struct string_list *core_option_get_vals(
-      core_option_manager_t *opt, size_t idx);
+const char *core_option_get_val(core_option_manager_t *opt, 
+      size_t idx);

 void core_option_set_val(core_option_manager_t *opt,
      size_t idx, size_t val_idx);
@@ -0,0 +1,27 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2016 - Daniel De Matteis
+ * 
+ *  RetroArch 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 Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch 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 RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __CORE_TYPE_H
+#define __CORE_TYPE_H
+
+enum rarch_core_type 
+{
+   CORE_TYPE_PLAIN = 0,
+   CORE_TYPE_DUMMY,
+   CORE_TYPE_FFMPEG,
+   CORE_TYPE_IMAGEVIEWER
+};
+
+#endif
@@ -5,6 +5,12 @@
 #include <assert.h>
 #include <stdarg.h>

+#ifdef RARCH_INTERNAL
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -12,6 +18,7 @@ extern "C" {
 #include <libavformat/avformat.h>
 #include <libavcodec/avcodec.h>
 #include <libswscale/swscale.h>
+#include <libavutil/imgutils.h>
 #include <libavutil/time.h>
 #include <libavutil/opt.h>
 #include <libavdevice/avdevice.h>
@@ -33,7 +40,7 @@ extern "C" {
 #endif

 #include <rthreads/rthreads.h>
-#include <queues/fifo_buffer.h>
+#include <queues/fifo_queue.h>

 #include "libretro.h"
 #ifdef RARCH_INTERNAL
@@ -792,8 +799,10 @@ static bool codec_id_is_ass(enum AVCodecID id)
 #endif
         return true;
      default:
-         return false;
+         break;
   }
+
+   return false;
 }
 #endif

@@ -801,14 +810,15 @@ static bool open_codecs(void)
 {
   unsigned i;

-   video_stream = -1;
-   memset(audio_streams,    0, sizeof(audio_streams));
-   memset(subtitle_streams, 0, sizeof(subtitle_streams));
+   video_stream         = -1;
   audio_streams_num    = 0;
   audio_streams_ptr    = 0;
   subtitle_streams_num = 0;
   subtitle_streams_ptr = 0;

+   memset(audio_streams,    0, sizeof(audio_streams));
+   memset(subtitle_streams, 0, sizeof(subtitle_streams));
+
   for (i = 0; i < fctx->nb_streams; i++)
   {
      switch (fctx->streams[i]->codec->codec_type)
@@ -848,7 +858,7 @@ static bool open_codecs(void)

               if (size)
               {
-                  ass_extra_data[subtitle_streams_num] = av_malloc(size);
+                  ass_extra_data[subtitle_streams_num] = (uint8_t*)av_malloc(size);
                  memcpy(ass_extra_data[subtitle_streams_num], (*s)->extradata, size);
               }

@@ -858,12 +868,12 @@ static bool open_codecs(void)
            break;

         case AVMEDIA_TYPE_ATTACHMENT:
-         {
-            AVCodecContext *ctx = fctx->streams[i]->codec;
-            if (codec_id_is_ttf(ctx->codec_id))
-               append_attachment(ctx->extradata, ctx->extradata_size);
+            {
+               AVCodecContext *ctx = fctx->streams[i]->codec;
+               if (codec_id_is_ttf(ctx->codec_id))
+                  append_attachment(ctx->extradata, ctx->extradata_size);
+            }
            break;
-         }

         default:
            break;
@@ -883,19 +893,21 @@ static bool init_media_info(void)
   {
      media.width  = vctx->width;
      media.height = vctx->height;
-      media.aspect = (float)vctx->width * av_q2d(vctx->sample_aspect_ratio) / vctx->height;
+      media.aspect = (float)vctx->width * 
+         av_q2d(vctx->sample_aspect_ratio) / vctx->height;
   }

 #ifdef HAVE_SSA
   if (sctx[0])
   {
-      size_t i;
+      unsigned i;

      ass = ass_library_init();
      ass_set_message_cb(ass, ass_msg_cb, NULL);

      for (i = 0; i < attachments_size; i++)
-         ass_add_font(ass, (char*)"", (char*)attachments[i].data, attachments[i].size);
+         ass_add_font(ass, (char*)"",
+               (char*)attachments[i].data, attachments[i].size);

      ass_render = ass_renderer_init(ass);
      ass_set_frame_size(ass_render, media.width, media.height);
@@ -903,7 +915,7 @@ static bool init_media_info(void)
      ass_set_fonts(ass_render, NULL, NULL, 1, NULL, 1);
      ass_set_hinting(ass_render, ASS_HINTING_LIGHT);

-      for (i = 0; i < subtitle_streams_num; i++)
+      for (i = 0; i < (unsigned)subtitle_streams_num; i++)
      {
         ass_track[i] = ass_new_track(ass);
         ass_process_codec_private(ass_track[i], (char*)ass_extra_data[i],
@@ -916,7 +928,8 @@ static bool init_media_info(void)
 }

 static void set_colorspace(struct SwsContext *sws,
-      unsigned width, unsigned height, enum AVColorSpace default_color, int in_range)
+      unsigned width, unsigned height,
+      enum AVColorSpace default_color, int in_range)
 {
   const int *coeffs = NULL;

@@ -951,7 +964,8 @@ static void set_colorspace(struct SwsContext *sws,
   }
 }

-static bool decode_video(AVPacket *pkt, AVFrame *frame, AVFrame *conv, struct SwsContext *sws)
+static bool decode_video(AVPacket *pkt, AVFrame *frame,
+      AVFrame *conv, struct SwsContext *sws)
 {
   int got_ptr = 0;
   int ret     = avcodec_decode_video2(vctx, frame, &got_ptr, pkt);
@@ -971,7 +985,8 @@ static bool decode_video(AVPacket *pkt, AVFrame *frame, AVFrame *conv, struct Sw
   return false;
 }

-static int16_t *decode_audio(AVCodecContext *ctx, AVPacket *pkt, AVFrame *frame, int16_t *buffer, size_t *buffer_cap,
+static int16_t *decode_audio(AVCodecContext *ctx, AVPacket *pkt,
+      AVFrame *frame, int16_t *buffer, size_t *buffer_cap,
      SwrContext *swr)
 {
   AVPacket pkt_tmp = *pkt;
@@ -1020,7 +1035,9 @@ static int16_t *decode_audio(AVCodecContext *ctx, AVPacket *pkt, AVFrame *frame,
         }
      }

-      decode_last_audio_time = pts * av_q2d(fctx->streams[audio_streams[audio_streams_ptr]]->time_base);
+      decode_last_audio_time = pts * av_q2d(
+            fctx->streams[audio_streams[audio_streams_ptr]]->time_base);
+
      if (!decode_thread_dead)
         fifo_write(audio_decode_fifo, buffer, required_buffer);

@@ -1101,7 +1118,8 @@ static void render_ass_img(AVFrame *conv_frame, ASS_Image *img)
            dst_g = (g * src_alpha + dst_g * dst_alpha) >> 8;
            dst_b = (b * src_alpha + dst_b * dst_alpha) >> 8;

-            dst[x] = (0xffu << 24) | (dst_r << 16) | (dst_g << 8) | (dst_b << 0);
+            dst[x] = (0xffu << 24) | (dst_r << 16) | 
+               (dst_g << 8) | (dst_b << 0);
         }
      }
   }
@@ -1285,7 +1303,8 @@ static void decode_thread(void *data)
         for (i = 0; i < sub.num_rects; i++)
         {
            if (sub.rects[i]->ass)
-               ass_process_data(ass_track_active, sub.rects[i]->ass, strlen(sub.rects[i]->ass));
+               ass_process_data(ass_track_active,
+                     sub.rects[i]->ass, strlen(sub.rects[i]->ass));
         }
 #endif

@@ -1406,14 +1425,16 @@ static void context_reset(void)
 #if !defined(HAVE_OPENGLES)
      glGenBuffers(1, &frames[i].pbo);
      glBindBuffer(GL_PIXEL_UNPACK_BUFFER, frames[i].pbo);
-      glBufferData(GL_PIXEL_UNPACK_BUFFER, media.width * media.height * sizeof(uint32_t), NULL, GL_STREAM_DRAW);
+      glBufferData(GL_PIXEL_UNPACK_BUFFER, media.width 
+            * media.height * sizeof(uint32_t), NULL, GL_STREAM_DRAW);
      glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
 #endif
   }

   glGenBuffers(1, &vbo);
   glBindBuffer(GL_ARRAY_BUFFER, vbo);
-   glBufferData(GL_ARRAY_BUFFER, sizeof(vertex_data), vertex_data, GL_STATIC_DRAW);
+   glBufferData(GL_ARRAY_BUFFER,
+         sizeof(vertex_data), vertex_data, GL_STATIC_DRAW);

   glBindBuffer(GL_ARRAY_BUFFER, 0);
   glBindTexture(GL_TEXTURE_2D, 0);
@@ -1569,7 +1590,8 @@ bool CORE_PREFIX(retro_load_game)(const struct retro_game_info *info)

   if (video_stream >= 0 || is_glfft)
   {
-      video_decode_fifo = fifo_new(media.width * media.height * sizeof(uint32_t) * 32);
+      video_decode_fifo = fifo_new(media.width 
+            * media.height * sizeof(uint32_t) * 32);

 #ifdef HAVE_OPENGL
      use_gl = true;
@@ -5,6 +5,9 @@
 #include <assert.h>

 #include <boolean.h>
+#include <lists/dir_list.h>
+#include <file/file_path.h>
+#include <compat/strl.h>

 #define STB_IMAGE_IMPLEMENTATION

@@ -17,11 +20,11 @@
 #define STBI_SUPPORT_ZLIB
 #endif

-#include "../deps/stb/stb_image.h"
+#include "../../deps/stb/stb_image.h"

 #ifdef RARCH_INTERNAL
 #include "internal_cores.h"
-#include "../libretro.h"
+#include "../../libretro.h"
 #define IMAGE_CORE_PREFIX(s) libretro_imageviewer_##s
 #else
 #include "libretro.h"
@@ -35,26 +38,31 @@ static retro_input_state_t IMAGE_CORE_PREFIX(input_state_cb);
 static retro_audio_sample_batch_t IMAGE_CORE_PREFIX(audio_batch_cb);
 static retro_environment_t IMAGE_CORE_PREFIX(environ_cb);

+static bool      process_new_image;
 static uint32_t* image_buffer;
 static int       image_width;
 static int       image_height;
 static bool      image_uploaded;
+static bool      slideshow_enable;
+struct string_list *file_list;

 #if 0
 #define DUPE_TEST
 #endif

+#ifdef RARCH_INTERNAL
+static const char* IMAGE_CORE_PREFIX(valid_extensions) = "jpg|jpeg|png|bmp|tga";
+#else
+static const char* IMAGE_CORE_PREFIX(valid_extensions) = "jpg|jpeg|png|bmp|psd|tga|gif|hdr|pic|ppm|pgm";
+#endif
+
 void IMAGE_CORE_PREFIX(retro_get_system_info)(struct retro_system_info *info)
 {
   info->library_name     = "image display";
   info->library_version  = "v0.1";
   info->need_fullpath    = true;
   info->block_extract    = false;
-#ifdef RARCH_INTERNAL
-   info->valid_extensions = "jpg|jpeg|png|bmp|tga";
-#else
-   info->valid_extensions = "jpg|jpeg|png|bmp|psd|tga|gif|hdr|pic|ppm|pgm";
-#endif
+   info->valid_extensions = IMAGE_CORE_PREFIX(valid_extensions);
 }

 void IMAGE_CORE_PREFIX(retro_get_system_av_info)(struct retro_system_av_info *info)
@@ -163,23 +171,42 @@ void IMAGE_CORE_PREFIX(retro_cheat_set)(unsigned a, bool b, const char * c)
 {
 }

-bool IMAGE_CORE_PREFIX(retro_load_game)(const struct retro_game_info *info)
+static bool imageviewer_load(const char *path, int image_index)
 {
   int comp;
-   uint32_t *buf, *end;
+   if (image_buffer)
+      free(image_buffer);
+   
+   image_buffer           = (uint32_t*)stbi_load(
+         path,
+         &image_width,
+         &image_height,
+         &comp,
+         4);
+
+   if (!image_buffer)
+      return false;
+
+   process_new_image = true;
+
+
+   return true;
+}
+
+bool IMAGE_CORE_PREFIX(retro_load_game)(const struct retro_game_info *info)
+{
   enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_XRGB8888;
-  
-   image_buffer = (uint32_t*)stbi_load (info->path,&image_width, &image_height, &comp, 4);
-   /* RGBA > XRGB8888 */
-   buf = &image_buffer[0];
-   end = buf + (image_width*image_height*sizeof(uint32_t))/4;
+   char *dir                   = strdup(info->path);
+
+   slideshow_enable            = false;
+
+   path_basedir(dir);
+
+   file_list = dir_list_new(dir, IMAGE_CORE_PREFIX(valid_extensions),
+         false,false);
+   dir_list_sort(file_list, false);
+   free(dir);

-   while(buf < end)
-   {
-    uint32_t pixel = *buf;
-    *buf = (pixel & 0xff00ff00) | ((pixel << 16) & 0x00ff0000) | ((pixel >> 16) & 0xff);
-    buf++;
-   }
  
   if (!IMAGE_CORE_PREFIX(environ_cb)(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt))
   {
@@ -188,6 +215,8 @@ bool IMAGE_CORE_PREFIX(retro_load_game)(const struct retro_game_info *info)
      return false;
   }

+   if (!imageviewer_load(info->path, 0))
+      return false;

   return true;
 }
@@ -221,10 +250,133 @@ size_t IMAGE_CORE_PREFIX(retro_get_memory_size)(unsigned id)
   return 0;
 }

+
 void IMAGE_CORE_PREFIX(retro_run)(void)
 {
+   bool first_image       = false;
+   bool last_image        = false;
+   bool backwards_image   = false;
+   bool forward_image     = false;
+   bool load_image        = false;
+   bool next_image        = false;
+   bool prev_image        = false;
+   static int frames      = 0;
+   static int image_index = 0;
+   uint16_t input         = 0;
+   static uint16_t previnput;
+   uint16_t realinput     = 0;
+   int i;
+
   IMAGE_CORE_PREFIX(input_poll_cb)();

+   if (slideshow_enable)
+   {
+      if ((frames % 120 == 0) && image_index < (signed)(file_list->size - 1))
+         next_image = true;
+   }
+
+   for (i=0;i<16;i++)
+   {
+     if (IMAGE_CORE_PREFIX(input_state_cb)(0, RETRO_DEVICE_JOYPAD, 0, i))
+     {
+        realinput |= 1<<i;
+     }
+   }
+   input = realinput & ~previnput;
+   previnput = realinput;
+
+   if (input & (1<<RETRO_DEVICE_ID_JOYPAD_UP))
+   {
+      if ((image_index + 5) < (signed)(file_list->size - 1))
+         forward_image   = true;
+      else
+         last_image      = true;
+   }
+
+   if (input & (1<<RETRO_DEVICE_ID_JOYPAD_DOWN))
+   {
+      if ((image_index - 5) > 0)
+         backwards_image = true;
+      else
+         first_image     = true;
+   }
+
+   if (input & (1<<RETRO_DEVICE_ID_JOYPAD_LEFT))
+   {
+      if (image_index > 0)
+         prev_image = true;
+   }
+   if (input & (1<<RETRO_DEVICE_ID_JOYPAD_RIGHT))
+   {
+      if (image_index < (signed)(file_list->size - 1))
+         next_image = true;
+   }
+
+   if (input & (1<<RETRO_DEVICE_ID_JOYPAD_Y))
+   {
+      slideshow_enable = !slideshow_enable;
+   }
+
+   if (prev_image)
+   {
+      image_index--;
+      load_image = true;
+   }
+   else if (next_image)
+   {
+      image_index++;
+      load_image = true;
+   }
+   else if (backwards_image)
+   {
+      image_index -= 5;
+      load_image = true;
+   }
+   else if (forward_image)
+   {
+      image_index += 5;
+      load_image = true;
+   }
+   else if (first_image)
+   {
+      image_index = 0;
+      load_image = true;
+   }
+   else if (last_image)
+   {
+      image_index = file_list->size - 1;
+      load_image = true;
+   }
+
+   if (load_image)
+   {
+      if (!imageviewer_load(file_list->elems[image_index].data, image_index))
+      {
+         IMAGE_CORE_PREFIX(environ_cb)(RETRO_ENVIRONMENT_SHUTDOWN, NULL);
+      }
+   }
+
+   if (process_new_image)
+   {
+      /* RGBA > XRGB8888 */
+      struct retro_system_av_info info;
+      uint32_t *buf = &image_buffer[0];
+      uint32_t *end = buf + (image_width*image_height*sizeof(uint32_t))/4;
+
+      while(buf < end)
+      {
+         uint32_t pixel = *buf;
+         *buf = (pixel & 0xff00ff00) | ((pixel << 16) & 0x00ff0000) | ((pixel >> 16) & 0xff);
+         buf++;
+      }
+
+      IMAGE_CORE_PREFIX(retro_get_system_av_info)(&info);
+
+      IMAGE_CORE_PREFIX(environ_cb)(RETRO_ENVIRONMENT_SET_GEOMETRY, &info.geometry);
+
+      process_new_image = false;
+   }
+
 #ifdef DUPE_TEST
   if (!image_uploaded)
   {
@@ -236,6 +388,7 @@ void IMAGE_CORE_PREFIX(retro_run)(void)
 #else
   IMAGE_CORE_PREFIX(video_cb)(image_buffer, image_width, image_height, image_width * sizeof(uint32_t));
 #endif
+   frames++;
 }

 unsigned IMAGE_CORE_PREFIX(retro_api_version)(void)
@@ -0,0 +1 @@
+#include "../internal_cores.h"
@@ -0,0 +1,172 @@
+ifeq ($(platform),)
+	platform = unix
+	ifeq ($(shell uname -a),)
+		platform = win
+	else ifneq ($(findstring MINGW,$(shell uname -a)),)
+		platform = win
+	else ifneq ($(findstring Darwin,$(shell uname -a)),)
+		platform = osx
+		arch = intel
+	ifeq ($(shell uname -p),powerpc)
+		arch = ppc
+	endif
+	else ifneq ($(findstring win,$(shell uname -a)),)
+		platform = win
+	endif
+endif
+
+# system platform
+system_platform = unix
+ifeq ($(shell uname -a),)
+	EXE_EXT = .exe
+	system_platform = win
+else ifneq ($(findstring Darwin,$(shell uname -a)),)
+	system_platform = osx
+	arch = intel
+	ifeq ($(shell uname -p),powerpc)
+		arch = ppc
+	endif
+	else ifneq ($(findstring MINGW,$(shell uname -a)),)
+	system_platform = win
+endif
+
+TARGET_NAME = testgl_ff
+
+ifeq ($(platform), unix)
+   TARGET := $(TARGET_NAME)_libretro.so
+   fpic := -fPIC
+   SHARED := -shared -Wl,--version-script=link.T -Wl,--no-undefined
+   GL_LIB := -lGL
+else ifneq (,$(findstring osx,$(platform)))
+   TARGET := $(TARGET_NAME)_libretro.dylib
+   fpic := -fPIC
+   SHARED := -dynamiclib
+   GL_LIB := -framework OpenGL
+   CFLAGS += -DOSX
+	ifeq ($(arch),ppc)
+		CFLAGS += -D__ppc__ -DOSX_PPC
+	endif
+	OSXVER = `sw_vers -productVersion | cut -d. -f 2`
+	OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
+	fpic += -mmacosx-version-min=10.1
+else ifeq ($(platform), pi)
+   TARGET := $(TARGET_NAME)_libretro.so
+   fpic := -fPIC
+   SHARED := -shared -Wl,--version-script=link.T -Wl,--no-undefined
+   CFLAGS += -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/vmcs_host/linux
+   GLES := 1
+   LIBS += -L/opt/vc/lib
+else ifneq (,$(findstring ios,$(platform)))
+   TARGET := $(TARGET_NAME)_libretro_ios.dylib
+   fpic := -fPIC
+   SHARED := -dynamiclib
+
+ifeq ($(IOSSDK),)
+   IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
+endif
+
+   GL_LIB := -framework OpenGLES
+   DEFINES := -DIOS
+   CFLAGS += -DGLES $(DEFINES)
+   CC = cc -arch armv7 -isysroot $(IOSSDK)
+ifeq ($(platform),ios9)
+	CC     += -miphoneos-version-min=8.0
+	CFLAGS += -miphoneos-version-min=8.0
+else
+	CC     += -miphoneos-version-min=5.0
+	CFLAGS += -miphoneos-version-min=5.0
+endif
+else ifneq (,$(findstring qnx,$(platform)))
+   TARGET := $(TARGET_NAME)_libretro_qnx.so
+   fpic := -fPIC
+   SHARED := -shared -Wl,--version-script=link.T
+   GL_LIB := -lGL
+
+   CC = qcc -Vgcc_ntoarmv7le
+   AR = qcc -Vgcc_ntoarmv7le
+   CFLAGS += -DGLES
+   GL_LIB := -lGLESv2
+   GLES := 1
+else ifneq (,$(findstring armv,$(platform)))
+   CC = gcc
+   TARGET := $(TARGET_NAME)_libretro.so
+   fpic := -fPIC
+   SHARED := -shared -Wl,--version-script=link.T -Wl,--no-undefined
+   CFLAGS += -I.
+ifneq (,$(findstring gles,$(platform)))
+   GLES := 1
+else
+   GL_LIB := -lGL
+endif
+ifneq (,$(findstring cortexa8,$(platform)))
+   CFLAGS += -marm -mcpu=cortex-a8
+else ifneq (,$(findstring cortexa9,$(platform)))
+   CFLAGS += -marm -mcpu=cortex-a9
+endif
+   CFLAGS += -marm
+ifneq (,$(findstring neon,$(platform)))
+   CFLAGS += -mfpu=neon
+endif
+ifneq (,$(findstring softfloat,$(platform)))
+   CFLAGS += -mfloat-abi=softfp
+else ifneq (,$(findstring hardfloat,$(platform)))
+   CFLAGS += -mfloat-abi=hard
+endif
+   CFLAGS += -DARM
+# emscripten
+else ifeq ($(platform), emscripten)
+	TARGET := $(TARGET_NAME)_libretro_emscripten.bc
+else
+   CC = gcc
+   TARGET := $(TARGET_NAME)_libretro.dll
+   SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=link.T -Wl,--no-undefined
+   GL_LIB := -lopengl32
+   CFLAGS += -I..
+endif
+
+ifeq ($(DEBUG), 1)
+   CFLAGS += -O0 -g
+else
+   CFLAGS += -O3
+endif
+
+ifneq (,$(findstring qnx,$(platform)))
+	CFLAGS += -Wc,-std=c99
+else
+	CFLAGS += -std=gnu99
+endif
+
+OBJECTS := libretro_gl_ff_test.o ../../libretro-common/glsym/rglgen.o
+CFLAGS += -Wall -pedantic $(fpic)
+
+ifeq ($(GLES), 1)
+   CFLAGS += -DGLES -DHAVE_OPENGLES2
+   ifeq ($(GLES31), 1)
+      CFLAGS += -DHAVE_OPENGLES3 -DGLES31 -DGLES3
+   else ifeq ($(GLES3), 1)
+      CFLAGS += -DHAVE_OPENGLES3 -DGLES3
+   endif
+   LIBS += -lGLESv2 # Still link against GLESv2 when using GLES3 API, at least on desktop Linux.
+   OBJECTS += ../../libretro-common/glsym/glsym_es2.o
+else
+   OBJECTS += ../../libretro-common/glsym/glsym_gl.o
+   LIBS += $(GL_LIB)
+endif
+
+ifeq ($(CORE), 1)
+   CFLAGS += -DCORE
+endif
+
+all: $(TARGET)
+
+$(TARGET): $(OBJECTS)
+	$(CC) $(fpic) $(SHARED) $(INCLUDES) -o $@ $(OBJECTS) $(LIBS) -lm $(EXTRA_GL_LIBS)
+
+%.o: %.c
+	$(CC) -I../../libretro-common/include $(CFLAGS) -c -o $@ $<
+
+clean:
+	rm -f $(OBJECTS) $(TARGET)
+
+.PHONY: clean
+
@@ -0,0 +1,27 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := retro-test-gl-ff
+
+ifeq ($(TARGET_ARCH),arm)
+LOCAL_CFLAGS += -DANDROID_ARM
+LOCAL_ARM_MODE := arm
+endif
+
+ifeq ($(TARGET_ARCH),x86)
+LOCAL_CFLAGS += -DANDROID_X86
+endif
+
+ifeq ($(TARGET_ARCH),mips)
+LOCAL_CFLAGS += -DANDROID_MIPS
+endif
+
+GLES_LIB := -lGLESv2
+
+LOCAL_SRC_FILES += $(addprefix ../,$(wildcard *.c) ../../../libretro-common/glsym/rglgen.c ../../../libretro-common/glsym/glsym_es2.c)
+LOCAL_CFLAGS += -O2 -Wall -std=gnu99 -ffast-math -DGLES -DHAVE_OPENGLES2 -I../../../libretro-common/include
+LOCAL_LDLIBS += $(GLES_LIB)
+
+include $(BUILD_SHARED_LIBRARY)
+
@@ -0,0 +1,7 @@
+APP_ABI := all
+ifeq ($(GLES), 3)
+   APP_PLATFORM := android-18
+else
+   APP_PLATFORM := android-9
+endif
+
@@ -0,0 +1,366 @@
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+#include <glsym/glsym.h>
+
+#include "../../libretro.h"
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
+static struct retro_hw_render_callback hw_render;
+
+#if defined(HAVE_PSGL)
+#define RARCH_GL_FRAMEBUFFER GL_FRAMEBUFFER_OES
+#define RARCH_GL_FRAMEBUFFER_COMPLETE GL_FRAMEBUFFER_COMPLETE_OES
+#define RARCH_GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0_EXT
+#elif defined(OSX_PPC)
+#define RARCH_GL_FRAMEBUFFER GL_FRAMEBUFFER_EXT
+#define RARCH_GL_FRAMEBUFFER_COMPLETE GL_FRAMEBUFFER_COMPLETE_EXT
+#define RARCH_GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0_EXT
+#else
+#define RARCH_GL_FRAMEBUFFER GL_FRAMEBUFFER
+#define RARCH_GL_FRAMEBUFFER_COMPLETE GL_FRAMEBUFFER_COMPLETE
+#define RARCH_GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0
+#endif
+
+#define BASE_WIDTH 320
+#define BASE_HEIGHT 240
+#ifdef GLES
+#define MAX_WIDTH 1024
+#define MAX_HEIGHT 1024
+#else
+#define MAX_WIDTH 2048
+#define MAX_HEIGHT 2048
+#endif
+
+static unsigned width  = BASE_WIDTH;
+static unsigned height = BASE_HEIGHT;
+
+void retro_init(void)
+{}
+
+void retro_deinit(void)
+{}
+
+unsigned retro_api_version(void)
+{
+   return RETRO_API_VERSION;
+}
+
+void retro_set_controller_port_device(unsigned port, unsigned device)
+{
+   (void)port;
+   (void)device;
+}
+
+void retro_get_system_info(struct retro_system_info *info)
+{
+   memset(info, 0, sizeof(*info));
+   info->library_name     = "TestCore GL (FF)";
+   info->library_version  = "v1";
+   info->need_fullpath    = false;
+   info->valid_extensions = NULL; // Anything is fine, we don't care.
+}
+
+void retro_get_system_av_info(struct retro_system_av_info *info)
+{
+   info->timing = (struct retro_system_timing) {
+      .fps = 60.0,
+      .sample_rate = 30000.0,
+   };
+
+   info->geometry = (struct retro_game_geometry) {
+      .base_width   = BASE_WIDTH,
+      .base_height  = BASE_HEIGHT,
+      .max_width    = MAX_WIDTH,
+      .max_height   = MAX_HEIGHT,
+      .aspect_ratio = 4.0 / 3.0,
+   };
+}
+
+static retro_video_refresh_t video_cb;
+static retro_audio_sample_t audio_cb;
+static retro_audio_sample_batch_t audio_batch_cb;
+static retro_environment_t environ_cb;
+static retro_input_poll_t input_poll_cb;
+static retro_input_state_t input_state_cb;
+
+void retro_set_environment(retro_environment_t cb)
+{
+   environ_cb = cb;
+
+   struct retro_variable variables[] = {
+      {
+         "testgl_resolution",
+#ifdef GLES
+         "Internal resolution; 320x240|360x480|480x272|512x384|512x512|640x240|640x448|640x480|720x576|800x600|960x720|1024x768",
+#else
+         "Internal resolution; 320x240|360x480|480x272|512x384|512x512|640x240|640x448|640x480|720x576|800x600|960x720|1024x768|1024x1024|1280x720|1280x960|1600x1200|1920x1080|1920x1440|1920x1600|2048x2048",
+#endif
+      },
+#ifdef CORE
+      { "testgl_multisample", "Multisampling; 1x|2x|4x" },
+#endif
+      { NULL, NULL },
+   };
+
+   bool no_rom = true;
+   cb(RETRO_ENVIRONMENT_SET_SUPPORT_NO_GAME, &no_rom);
+   cb(RETRO_ENVIRONMENT_SET_VARIABLES, variables);
+}
+
+void retro_set_audio_sample(retro_audio_sample_t cb)
+{
+   audio_cb = cb;
+}
+
+void retro_set_audio_sample_batch(retro_audio_sample_batch_t cb)
+{
+   audio_batch_cb = cb;
+}
+
+void retro_set_input_poll(retro_input_poll_t cb)
+{
+   input_poll_cb = cb;
+}
+
+void retro_set_input_state(retro_input_state_t cb)
+{
+   input_state_cb = cb;
+}
+
+void retro_set_video_refresh(retro_video_refresh_t cb)
+{
+   video_cb = cb;
+}
+
+static void update_variables(void)
+{
+   struct retro_variable var = {
+      .key = "testgl_resolution",
+   };
+
+   if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
+   {
+      char *pch;
+      char str[100];
+      snprintf(str, sizeof(str), "%s", var.value);
+      
+      pch = strtok(str, "x");
+      if (pch)
+         width = strtoul(pch, NULL, 0);
+      pch = strtok(NULL, "x");
+      if (pch)
+         height = strtoul(pch, NULL, 0);
+
+      fprintf(stderr, "[libretro-test]: Got size: %u x %u.\n", width, height);
+   }
+
+#ifdef CORE
+   var.key = "testgl_multisample";
+   var.value = NULL;
+
+   if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
+   {
+      switch (*var.value)
+      {
+         case '1':
+            init_multisample(1);
+            break;
+
+         case '2':
+            init_multisample(2);
+            break;
+
+         case '4':
+            init_multisample(4);
+            break;
+      }
+   }
+#endif
+}
+
+static unsigned frame_count;
+
+void retro_run(void)
+{
+   bool updated = false;
+   if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE, &updated) && updated)
+      update_variables();
+
+   input_poll_cb();
+
+   if (input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP))
+   {
+   }
+
+   float ratio = width / (float)height;
+
+   glBindFramebuffer(RARCH_GL_FRAMEBUFFER, hw_render.get_current_framebuffer());
+
+   glClearColor(0.3, 0.4, 0.5, 1.0);
+   glViewport(0, 0, width, height);
+   glClear(GL_COLOR_BUFFER_BIT);
+
+   glMatrixMode(GL_PROJECTION);
+   glLoadIdentity();
+   glOrtho(-ratio, ratio, -1.f, 1.f, 1.f, -1.f);
+   glMatrixMode(GL_MODELVIEW);
+   glLoadIdentity();
+   glRotatef((float)frame_count * 2, 0.0f, 0.0f, 0.1f);
+
+   glLoadIdentity();
+   glBegin(GL_TRIANGLES);
+
+   glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+   glVertex2f(-0.5f, -0.5f);
+
+   glColor4f(1.0f, 1.0f, 0.0f, 1.0f);
+   glVertex2f(0.5f, -0.5f);
+   
+   glColor4f(0.0f, 1.0f, 1.0f, 1.0f);
+   glVertex2f(-0.5f, 0.5f);
+
+   glColor4f(1.0f, 0.0f, 1.0f, 1.0f);
+   glVertex2f(0.5f, 0.5f);
+
+   glEnd();
+
+   frame_count++;
+
+   video_cb(RETRO_HW_FRAME_BUFFER_VALID, width, height, 0);
+}
+
+static void context_reset(void)
+{
+   fprintf(stderr, "Context reset!\n");
+   rglgen_resolve_symbols(hw_render.get_proc_address);
+}
+
+static void context_destroy(void)
+{
+   fprintf(stderr, "Context destroy!\n");
+}
+
+#ifdef GLES
+static bool retro_init_hw_context(void)
+{
+#if defined(GLES31)
+   hw_render.context_type = RETRO_HW_CONTEXT_OPENGLES_VERSION;
+   hw_render.version_major = 3;
+   hw_render.version_minor = 1;
+#elif defined(GLES3)
+   hw_render.context_type = RETRO_HW_CONTEXT_OPENGLES3;
+#else
+   hw_render.context_type = RETRO_HW_CONTEXT_OPENGLES2;
+#endif
+   hw_render.context_reset = context_reset;
+   hw_render.context_destroy = context_destroy;
+   hw_render.depth = true;
+   hw_render.bottom_left_origin = true;
+
+   if (!environ_cb(RETRO_ENVIRONMENT_SET_HW_RENDER, &hw_render))
+      return false;
+
+   return true;
+}
+#else
+static bool retro_init_hw_context(void)
+{
+   hw_render.context_type = RETRO_HW_CONTEXT_OPENGL;
+   hw_render.context_reset = context_reset;
+   hw_render.context_destroy = context_destroy;
+   hw_render.depth = true;
+   hw_render.bottom_left_origin = true;
+
+   if (!environ_cb(RETRO_ENVIRONMENT_SET_HW_RENDER, &hw_render))
+      return false;
+
+   return true;
+}
+#endif
+
+bool retro_load_game(const struct retro_game_info *info)
+{
+   update_variables();
+
+   enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_XRGB8888;
+   if (!environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt))
+   {
+      fprintf(stderr, "XRGB8888 is not supported.\n");
+      return false;
+   }
+
+   if (!retro_init_hw_context())
+   {
+      fprintf(stderr, "HW Context could not be initialized, exiting...\n");
+      return false;
+   }
+
+   fprintf(stderr, "Loaded game!\n");
+   (void)info;
+   return true;
+}
+
+void retro_unload_game(void)
+{}
+
+unsigned retro_get_region(void)
+{
+   return RETRO_REGION_NTSC;
+}
+
+bool retro_load_game_special(unsigned type, const struct retro_game_info *info, size_t num)
+{
+   (void)type;
+   (void)info;
+   (void)num;
+   return false;
+}
+
+size_t retro_serialize_size(void)
+{
+   return 0;
+}
+
+bool retro_serialize(void *data, size_t size)
+{
+   (void)data;
+   (void)size;
+   return false;
+}
+
+bool retro_unserialize(const void *data, size_t size)
+{
+   (void)data;
+   (void)size;
+   return false;
+}
+
+void *retro_get_memory_data(unsigned id)
+{
+   (void)id;
+   return NULL;
+}
+
+size_t retro_get_memory_size(unsigned id)
+{
+   (void)id;
+   return 0;
+}
+
+void retro_reset(void)
+{}
+
+void retro_cheat_reset(void)
+{}
+
+void retro_cheat_set(unsigned index, bool enabled, const char *code)
+{
+   (void)index;
+   (void)enabled;
+   (void)code;
+}
+
@@ -0,0 +1,5 @@
+{
+   global: retro_*;
+   local: *;
+};
+
@@ -1,7 +1,3 @@
-ifneq ($(EMSCRIPTEN),)
-	platform = emscripten
-endif
-
 ifeq ($(platform),)
 	platform = unix
 	ifeq ($(shell uname -a),)
@@ -140,7 +136,7 @@ else
 	CFLAGS += -std=gnu99
 endif

-OBJECTS := libretro-test.o ../../libretro-common/glsym/rglgen.o
+OBJECTS := libretro_gl_test.o ../../libretro-common/glsym/rglgen.o
 CFLAGS += -Wall -pedantic $(fpic)

 ifeq ($(GLES), 1)
@@ -35,13 +35,13 @@ static struct retro_hw_render_callback hw_render;
 #define MAX_HEIGHT 2048
 #endif

-static unsigned width = BASE_WIDTH;
+static unsigned width  = BASE_WIDTH;
 static unsigned height = BASE_HEIGHT;

 static GLuint prog;
 static GLuint vbo;

-#ifdef CORE
+#if defined(CORE)
 static bool context_alive;
 static bool multisample_fbo;
 static unsigned multisample;
@@ -49,10 +49,7 @@ static GLuint vao;

 static GLuint fbo;
 static GLuint rbo_color, rbo_depth_stencil;
-#endif

-
-#ifdef CORE
 static const char *vertex_shader[] = {
   "#version 140\n"
   "uniform mat4 uMVP;",
@@ -114,7 +111,7 @@ static void compile_program(void)
   glDeleteShader(frag);
 }

-#ifdef CORE
+#if defined(CORE)
 static void init_multisample(unsigned samples)
 {
   multisample = samples;
@@ -184,7 +181,7 @@ static void setup_vao(void)
      1.0, 0.0, 1.0, 1.0,
   };

-#ifdef CORE
+#if defined(CORE)
   glGenVertexArrays(1, &vao);
 #endif

@@ -342,6 +339,8 @@ static void update_variables(void)
 #endif
 }

+static unsigned frame_count;
+
 void retro_run(void)
 {
   bool updated = false;
@@ -350,6 +349,11 @@ void retro_run(void)

   input_poll_cb();

+   if (input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP))
+   {
+   }
+
+
 #ifdef CORE
   glBindVertexArray(vao);
   if (multisample_fbo)
@@ -377,8 +381,6 @@ void retro_run(void)

   int loc = glGetUniformLocation(prog, "uMVP");

-   static unsigned frame_count;
-   frame_count++;
   float angle = frame_count / 100.0;
   float cos_angle = cos(angle);
   float sin_angle = sin(angle);
@@ -421,6 +423,9 @@ void retro_run(void)
      glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
   }
 #endif
+
+   frame_count++;
+
   video_cb(RETRO_HW_FRAME_BUFFER_VALID, width, height, 0);
 }

@@ -428,6 +433,7 @@ static void context_reset(void)
 {
   fprintf(stderr, "Context reset!\n");
   rglgen_resolve_symbols(hw_render.get_proc_address);
+
   compile_program();
   setup_vao();
 #ifdef CORE
@@ -478,7 +484,7 @@ static bool retro_init_hw_context(void)
 #else
 static bool retro_init_hw_context(void)
 {
-#ifdef CORE
+#if defined(CORE)
   hw_render.context_type = RETRO_HW_CONTEXT_OPENGL_CORE;
   hw_render.version_major = 3;
   hw_render.version_minor = 1;
@@ -0,0 +1,62 @@
+ifeq ($(platform),)
+	platform = unix
+	ifeq ($(shell uname -a),)
+		platform = win
+	else ifneq ($(findstring MINGW,$(shell uname -a)),)
+		platform = win
+	else ifneq ($(findstring Darwin,$(shell uname -a)),)
+		platform = osx
+		arch = intel
+	ifeq ($(shell uname -p),powerpc)
+		arch = ppc
+	endif
+	else ifneq ($(findstring win,$(shell uname -a)),)
+		platform = win
+	endif
+endif
+
+# system platform
+system_platform = unix
+ifeq ($(shell uname -a),)
+	EXE_EXT = .exe
+	system_platform = win
+else ifneq ($(findstring MINGW,$(shell uname -a)),)
+	system_platform = win
+endif
+
+TARGET_NAME = testvulkan
+
+ifeq ($(platform), unix)
+   TARGET := $(TARGET_NAME)_libretro.so
+   fpic := -fPIC
+   SHARED := -shared -Wl,--version-script=link.T -Wl,--no-undefined
+else
+   CC = gcc
+   TARGET := $(TARGET_NAME)_libretro.dll
+   SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=link.T -Wl,--no-undefined
+   CFLAGS += -I..
+endif
+
+ifeq ($(DEBUG), 1)
+   CFLAGS += -O0 -g
+else
+   CFLAGS += -O3
+endif
+
+CFLAGS += -std=gnu99
+OBJECTS := libretro-test.o
+CFLAGS += -Wall -pedantic $(fpic)
+
+all: $(TARGET)
+
+$(TARGET): $(OBJECTS)
+	$(CC) $(fpic) $(SHARED) $(INCLUDES) -o $@ $(OBJECTS) $(LIBS) -lm
+
+%.o: %.c
+	$(CC) -I../../libretro-common/include $(CFLAGS) -c -o $@ $<
+
+clean:
+	rm -f $(OBJECTS) $(TARGET)
+
+.PHONY: clean
+
@@ -0,0 +1,5 @@
+{
+   global: retro_*;
+   local: *;
+};
+
@@ -0,0 +1,23 @@
+VERT_SHADERS := $(wildcard *.vert)
+FRAG_SHADERS := $(wildcard *.frag)
+SPIRV := $(VERT_SHADERS:.vert=.vert.spv) $(FRAG_SHADERS:.frag=.frag.spv)
+INCLUDES := $(SPIRV:.spv=.inc)
+
+GLSLANG := glslangValidator
+
+all: $(INCLUDES)
+
+%.frag.spv: %.frag
+	$(GLSLANG) -V -o $@ $<
+
+%.vert.spv: %.vert
+	$(GLSLANG) -V -o $@ $<
+
+%.inc: %.spv
+	xxd -i $< $@
+
+clean:
+	rm -f $(INCLUDES)
+	rm -f $(SPIRV)
+
+.PHONY: clean
@@ -0,0 +1,9 @@
+#version 310 es
+precision mediump float;
+layout(location = 0) in vec4 vColor;
+layout(location = 0) out vec4 FragColor;
+
+void main()
+{
+   FragColor = vColor;
+}
@@ -0,0 +1,38 @@
+unsigned char triangle_frag_spv[] = {
+  0x03, 0x02, 0x23, 0x07, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x08, 0x00,
+  0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x02, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x06, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x47, 0x4c, 0x53, 0x4c, 0x2e, 0x73, 0x74, 0x64, 0x2e, 0x34, 0x35, 0x30,
+  0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x07, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x69, 0x6e, 0x00, 0x00, 0x00, 0x00,
+  0x09, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x10, 0x00, 0x03, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x36, 0x01, 0x00, 0x00, 0x05, 0x00, 0x04, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x69, 0x6e, 0x00, 0x00, 0x00, 0x00,
+  0x05, 0x00, 0x05, 0x00, 0x09, 0x00, 0x00, 0x00, 0x46, 0x72, 0x61, 0x67,
+  0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x00, 0x00, 0x00, 0x05, 0x00, 0x04, 0x00,
+  0x0b, 0x00, 0x00, 0x00, 0x76, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x00, 0x00,
+  0x47, 0x00, 0x03, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x47, 0x00, 0x04, 0x00, 0x09, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x47, 0x00, 0x03, 0x00, 0x0b, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x47, 0x00, 0x04, 0x00, 0x0b, 0x00, 0x00, 0x00,
+  0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x00, 0x03, 0x00,
+  0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x02, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x21, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x16, 0x00, 0x03, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x20, 0x00, 0x00, 0x00, 0x17, 0x00, 0x04, 0x00, 0x07, 0x00, 0x00, 0x00,
+  0x06, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0x04, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00,
+  0x3b, 0x00, 0x04, 0x00, 0x08, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x20, 0x00, 0x04, 0x00, 0x0a, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x3b, 0x00, 0x04, 0x00,
+  0x0a, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x36, 0x00, 0x05, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x02, 0x00,
+  0x05, 0x00, 0x00, 0x00, 0x3d, 0x00, 0x04, 0x00, 0x07, 0x00, 0x00, 0x00,
+  0x0c, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x03, 0x00,
+  0x09, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x01, 0x00,
+  0x38, 0x00, 0x01, 0x00
+};
+unsigned int triangle_frag_spv_len = 412;
@@ -0,0 +1,15 @@
+#version 310 es
+layout(location = 0) in vec4 Position;
+layout(location = 1) in vec4 Color;
+layout(location = 0) out vec4 vColor;
+
+layout(std140, set = 0, binding = 0) uniform UBO
+{
+   mat4 MVP;
+};
+
+void main()
+{
+   gl_Position = MVP * Position;
+   vColor = Color;
+}
@@ -0,0 +1,83 @@
+unsigned char triangle_vert_spv[] = {
+  0x03, 0x02, 0x23, 0x07, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x08, 0x00,
+  0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x02, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x06, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x47, 0x4c, 0x53, 0x4c, 0x2e, 0x73, 0x74, 0x64, 0x2e, 0x34, 0x35, 0x30,
+  0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x69, 0x6e, 0x00, 0x00, 0x00, 0x00,
+  0x0a, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00,
+  0x1b, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x36, 0x01, 0x00, 0x00, 0x05, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x6d, 0x61, 0x69, 0x6e, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x06, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x67, 0x6c, 0x5f, 0x50, 0x65, 0x72, 0x56, 0x65,
+  0x72, 0x74, 0x65, 0x78, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x06, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x67, 0x6c, 0x5f, 0x50,
+  0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x06, 0x00, 0x07, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x67, 0x6c, 0x5f, 0x50,
+  0x6f, 0x69, 0x6e, 0x74, 0x53, 0x69, 0x7a, 0x65, 0x00, 0x00, 0x00, 0x00,
+  0x05, 0x00, 0x03, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x05, 0x00, 0x03, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x55, 0x42, 0x4f, 0x00,
+  0x06, 0x00, 0x04, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x4d, 0x56, 0x50, 0x00, 0x05, 0x00, 0x03, 0x00, 0x10, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x05, 0x00, 0x15, 0x00, 0x00, 0x00,
+  0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x00, 0x00, 0x00,
+  0x05, 0x00, 0x04, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x76, 0x43, 0x6f, 0x6c,
+  0x6f, 0x72, 0x00, 0x00, 0x05, 0x00, 0x04, 0x00, 0x1b, 0x00, 0x00, 0x00,
+  0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x00, 0x00, 0x00, 0x48, 0x00, 0x05, 0x00,
+  0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x48, 0x00, 0x05, 0x00, 0x08, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x47, 0x00, 0x03, 0x00, 0x08, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x48, 0x00, 0x04, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x05, 0x00, 0x00, 0x00, 0x48, 0x00, 0x05, 0x00, 0x0e, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x48, 0x00, 0x05, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x07, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x47, 0x00, 0x03, 0x00,
+  0x0e, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x47, 0x00, 0x04, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x47, 0x00, 0x04, 0x00, 0x10, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x47, 0x00, 0x04, 0x00, 0x15, 0x00, 0x00, 0x00,
+  0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x00, 0x04, 0x00,
+  0x1a, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x47, 0x00, 0x04, 0x00, 0x1b, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x13, 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x21, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x16, 0x00, 0x03, 0x00, 0x06, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
+  0x17, 0x00, 0x04, 0x00, 0x07, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x04, 0x00, 0x08, 0x00, 0x00, 0x00,
+  0x07, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x20, 0x00, 0x04, 0x00,
+  0x09, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+  0x3b, 0x00, 0x04, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x15, 0x00, 0x04, 0x00, 0x0b, 0x00, 0x00, 0x00,
+  0x20, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x2b, 0x00, 0x04, 0x00,
+  0x0b, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x18, 0x00, 0x04, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00,
+  0x04, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x03, 0x00, 0x0e, 0x00, 0x00, 0x00,
+  0x0d, 0x00, 0x00, 0x00, 0x20, 0x00, 0x04, 0x00, 0x0f, 0x00, 0x00, 0x00,
+  0x02, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x3b, 0x00, 0x04, 0x00,
+  0x0f, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x20, 0x00, 0x04, 0x00, 0x11, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+  0x0d, 0x00, 0x00, 0x00, 0x20, 0x00, 0x04, 0x00, 0x14, 0x00, 0x00, 0x00,
+  0x01, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x3b, 0x00, 0x04, 0x00,
+  0x14, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x20, 0x00, 0x04, 0x00, 0x18, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x07, 0x00, 0x00, 0x00, 0x3b, 0x00, 0x04, 0x00, 0x18, 0x00, 0x00, 0x00,
+  0x1a, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x3b, 0x00, 0x04, 0x00,
+  0x14, 0x00, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+  0x36, 0x00, 0x05, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x02, 0x00,
+  0x05, 0x00, 0x00, 0x00, 0x41, 0x00, 0x05, 0x00, 0x11, 0x00, 0x00, 0x00,
+  0x12, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00,
+  0x3d, 0x00, 0x04, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00,
+  0x12, 0x00, 0x00, 0x00, 0x3d, 0x00, 0x04, 0x00, 0x07, 0x00, 0x00, 0x00,
+  0x16, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x91, 0x00, 0x05, 0x00,
+  0x07, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00,
+  0x16, 0x00, 0x00, 0x00, 0x41, 0x00, 0x05, 0x00, 0x18, 0x00, 0x00, 0x00,
+  0x19, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00,
+  0x3e, 0x00, 0x03, 0x00, 0x19, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00,
+  0x3d, 0x00, 0x04, 0x00, 0x07, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
+  0x1b, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x03, 0x00, 0x1a, 0x00, 0x00, 0x00,
+  0x1c, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x01, 0x00, 0x38, 0x00, 0x01, 0x00
+};
+unsigned int triangle_vert_spv_len = 960;
@@ -120,6 +120,8 @@ else
 CFLAGS += -std=gnu99
 endif

+CFLAGS += -I../../libretro-common/include
+
 all: $(TARGET)

 $(TARGET): $(OBJECTS)
@@ -9,7 +9,7 @@

 #include "../../libretro.h"

-static uint16_t *frame_buf;
+static uint32_t *frame_buf;
 static struct retro_log_callback logging;
 static retro_log_printf_t log_cb;
 static bool use_audio_cb;
@@ -27,7 +27,7 @@ static void fallback_log(enum retro_log_level level, const char *fmt, ...)

 void retro_init(void)
 {
-   frame_buf = calloc(320 * 240, sizeof(uint16_t));
+   frame_buf = calloc(320 * 240, sizeof(uint32_t));
 }

 void retro_deinit(void)
@@ -278,11 +278,29 @@ static void update_input(void)

 static void render_checkered(void)
 {
-   uint16_t color_r = 31 << 11;
-   uint16_t color_g = 63 <<  5;
+   /* Try rendering straight into VRAM if we can. */
+   uint32_t *buf = NULL;
+   unsigned stride = 0;
+   struct retro_framebuffer fb = {0};
+   fb.width = 320;
+   fb.height = 240;
+   fb.access_flags = RETRO_MEMORY_ACCESS_WRITE;
+   if (environ_cb(RETRO_ENVIRONMENT_GET_CURRENT_SOFTWARE_FRAMEBUFFER, &fb) && fb.format == RETRO_PIXEL_FORMAT_XRGB8888)
+   {
+      buf = fb.data;
+      stride = fb.pitch >> 2;
+   }
+   else
+   {
+      buf = frame_buf;
+      stride = 320;
+   }

-   uint16_t *line = frame_buf;
-   for (unsigned y = 0; y < 240; y++, line += 320)
+   uint32_t color_r = 0xff << 16;
+   uint32_t color_g = 0xff <<  8;
+
+   uint32_t *line = buf;
+   for (unsigned y = 0; y < 240; y++, line += stride)
   {
      unsigned index_y = ((y - y_coord) >> 4) & 1;
      for (unsigned x = 0; x < 320; x++)
@@ -294,9 +312,9 @@ static void render_checkered(void)

   for (unsigned y = mouse_rel_y - 5; y <= mouse_rel_y + 5; y++)
      for (unsigned x = mouse_rel_x - 5; x <= mouse_rel_x + 5; x++)
-         frame_buf[y * 320 + x] = 0x1f;
+         buf[y * stride + x] = 0xff;

-   video_cb(frame_buf, 320, 240, 320 << 1);
+   video_cb(buf, 320, 240, stride << 2);
 }

 static void check_variables(void)
@@ -381,10 +399,10 @@ bool retro_load_game(const struct retro_game_info *info)

   environ_cb(RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS, desc);

-   enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_RGB565;
+   enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_XRGB8888;
   if (!environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt))
   {
-      log_cb(RETRO_LOG_INFO, "RGB565 is not supported.\n");
+      log_cb(RETRO_LOG_INFO, "XRGB8888 is not supported.\n");
      return false;
   }

@@ -0,0 +1,146 @@
+STATIC_LINKING := 0
+AR             := ar
+
+ifeq ($(platform),)
+platform = unix
+ifeq ($(shell uname -a),)
+   platform = win
+else ifneq ($(findstring MINGW,$(shell uname -a)),)
+   platform = win
+else ifneq ($(findstring Darwin,$(shell uname -a)),)
+   platform = osx
+else ifneq ($(findstring win,$(shell uname -a)),)
+   platform = win
+endif
+endif
+
+# system platform
+system_platform = unix
+ifeq ($(shell uname -a),)
+	EXE_EXT = .exe
+	system_platform = win
+else ifneq ($(findstring Darwin,$(shell uname -a)),)
+	system_platform = osx
+	arch = intel
+ifeq ($(shell uname -p),powerpc)
+	arch = ppc
+endif
+else ifneq ($(findstring MINGW,$(shell uname -a)),)
+	system_platform = win
+endif
+
+TARGET_NAME := retropad
+LIBM		= -lm
+
+ifeq ($(ARCHFLAGS),)
+ifeq ($(archs),ppc)
+   ARCHFLAGS = -arch ppc -arch ppc64
+else
+   ARCHFLAGS = -arch i386 -arch x86_64
+endif
+endif
+
+ifeq ($(platform), osx)
+ifndef ($(NOUNIVERSAL))
+   CFLAGS += $(ARCHFLAGS)
+   LFLAGS += $(ARCHFLAGS)
+endif
+endif
+
+ifeq ($(STATIC_LINKING), 1)
+EXT := a
+endif
+
+ifeq ($(platform), unix)
+	EXT ?= so
+   TARGET := $(TARGET_NAME)_libretro.$(EXT)
+   fpic := -fPIC
+   SHARED := -shared -Wl,--version-script=link.T -Wl,--no-undefined
+else ifeq ($(platform), linux-portable)
+   TARGET := $(TARGET_NAME)_libretro.$(EXT)
+   fpic := -fPIC -nostdlib
+   SHARED := -shared -Wl,--version-script=link.T
+	LIBM :=
+else ifneq (,$(findstring osx,$(platform)))
+   TARGET := $(TARGET_NAME)_libretro.dylib
+   fpic := -fPIC
+   SHARED := -dynamiclib
+else ifneq (,$(findstring ios,$(platform)))
+   TARGET := $(TARGET_NAME)_libretro_ios.dylib
+	fpic := -fPIC
+	SHARED := -dynamiclib
+
+ifeq ($(IOSSDK),)
+   IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
+endif
+
+	DEFINES := -DIOS
+	CC = cc -arch armv7 -isysroot $(IOSSDK)
+ifeq ($(platform),ios9)
+CC     += -miphoneos-version-min=8.0
+CFLAGS += -miphoneos-version-min=8.0
+else
+CC     += -miphoneos-version-min=5.0
+CFLAGS += -miphoneos-version-min=5.0
+endif
+else ifneq (,$(findstring qnx,$(platform)))
+	TARGET := $(TARGET_NAME)_libretro_qnx.so
+   fpic := -fPIC
+   SHARED := -shared -Wl,--version-script=link.T -Wl,--no-undefined
+else ifeq ($(platform), emscripten)
+   TARGET := $(TARGET_NAME)_libretro_emscripten.bc
+   fpic := -fPIC
+   SHARED := -shared -Wl,--version-script=link.T -Wl,--no-undefined
+else ifeq ($(platform), vita)
+   TARGET := $(TARGET_NAME)_vita.a
+   CC = arm-vita-eabi-gcc
+   AR = arm-vita-eabi-ar
+   CFLAGS += -Wl,-q -Wall -O3
+	STATIC_LINKING = 1
+else
+   CC = gcc
+   TARGET := $(TARGET_NAME)_libretro.dll
+   SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=link.T -Wl,--no-undefined
+endif
+
+
+LDFLAGS += $(LIBM)
+
+ifeq ($(platform), win)
+LDFLAGS += -lws2_32
+endif
+
+ifeq ($(DEBUG), 1)
+   CFLAGS += -O0 -g
+else
+   CFLAGS += -O3
+endif
+
+OBJECTS := ../../libretro-common/net/net_compat.o ../../libretro-common/net/net_socket.o retropad.o
+CFLAGS += -I../../libretro-common/include -Wall -pedantic $(fpic)
+
+ifneq (,$(findstring qnx,$(platform)))
+CFLAGS += -Wc,-std=c99
+else
+CFLAGS += -std=gnu99
+endif
+
+CFLAGS += -I../../libretro-common/include
+
+all: $(TARGET)
+
+$(TARGET): $(OBJECTS)
+ifeq ($(STATIC_LINKING), 1)
+	$(AR) rcs $@ $(OBJECTS)
+else
+	$(CC) $(fpic) $(SHARED) $(INCLUDES) -o $@ $(OBJECTS) $(LDFLAGS)
+endif
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+clean:
+	rm -f $(OBJECTS) $(TARGET)
+
+.PHONY: clean
+
@@ -0,0 +1,25 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+APP_DIR := ../../src
+
+LOCAL_MODULE    := retro
+
+ifeq ($(TARGET_ARCH),arm)
+LOCAL_CFLAGS += -DANDROID_ARM
+endif
+
+ifeq ($(TARGET_ARCH),x86)
+LOCAL_CFLAGS +=  -DANDROID_X86
+endif
+
+ifeq ($(TARGET_ARCH),mips)
+LOCAL_CFLAGS += -DANDROID_MIPS -D__mips__ -D__MIPSEL__
+endif
+
+LOCAL_SRC_FILES    += ../libretro-test.c
+LOCAL_CFLAGS += -O3 -std=gnu99 -ffast-math -funroll-loops
+
+
+include $(BUILD_SHARED_LIBRARY)