Update to version 1.4.1

Add german translations to some of the OSD messages

.editorconfig

@@ -0,0 +1,20 @@
+# EditorConfig: http://EditorConfig.org
+
+# Top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+charset = utf-8
+
+# 3 space indentation
+[*.{c,h,js,css,html}]
+indent_style = space
+indent_size = 3
+
+# Tab indentation
+[Makefile*]
+indent_style = tab

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,35 @@
+# First and foremost consider this:
+- Only RetroArch bugs should be filed here. Not core bugs or game bugs
+- This is not a forum or a help section, this is strictly developer oriented
+
+## Description
+
+[Description of the bug]
+
+### Expected behavior
+
+[What you expected to happen]
+
+### Actual behavior
+
+[What is actually happening]
+
+### Steps to reproduce the bug
+
+1. [First step]
+2. [Second step]
+3. [and so on...]
+
+### Bisect Results
+
+[Try to bisect and tell us when this started happening]
+
+### Version/Commit
+You can find this information under Information/System Information
+
+- RetroArch: [version/commit]
+
+### Environment information
+
+- OS: [The operating system you're running]
+- Compiler: [In case you are running local builds]

.gitignore

@@ -11,6 +11,7 @@ config.log
 /retroarch
 /retroarch.cfg
 /retroarch.exe
+/retroarch_debug.exe
 /config.h
 /config.mk
 /tools/retroarch-joyconfig
@@ -65,6 +66,9 @@ menu/driverspzarch.c
 # Ctags
 /tags
 
+# CLion
+/cmake-build-debug/
+
 # Android
 /pkg/android/phoenix/obj/
 /pkg/android/phoenix/assets/
@@ -85,3 +89,19 @@ pkg/apple/iOS/modules/
 
 obj-unix/
 .vagrant/
+
+.MAKEFILE_DEFINES
+.CONFIG_DEFINES
+/pkg/msvc/Release Cg/*.exe
+/pkg/msvc/Release Cg/*.iobj
+/pkg/msvc/Release Cg/*.ipdb
+/pkg/msvc/Release Cg/*.pdb
+/pkg/msvc/Release Cg/*.lpl
+/pkg/msvc/Release Cg/*.cfg
+/pkg/msvc/*.db
+/pkg/msvc/msvc-2010/Release Cg/RetroArc.27FF7CE1.tlog/*.tlog
+/pkg/msvc/msvc-2010/Release Cg/RetroArc.27FF7CE1.tlog/*.lastbuildstate
+/pkg/msvc/msvc-2010/Release Cg/*.log
+/pkg/msvc/msvc-2010/Release Cg/*.obj
+/pkg/msvc/msvc-2010/Release Cg/*.res
+/pkg/msvc/msvc-2010/Release Cg/*.pdb

.gitmodules

@@ -1,6 +0,0 @@
-[submodule "deps/glslang/glslang"]
-	path = deps/glslang/glslang
-	url = git://github.com/KhronosGroup/glslang.git
-[submodule "deps/SPIRV-Cross"]
-	path = deps/SPIRV-Cross
-	url = git://github.com/KhronosGroup/SPIRV-Cross

.travis.yml

@@ -0,0 +1,48 @@
+# Use 'generic' to be able to override CC/CXX for clang
+language: generic
+
+matrix:
+  include:
+    - compiler: gcc
+    - compiler: clang
+      addons:
+        # Install a more recent clang than the default
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise-3.8
+          packages:
+            - clang-3.8
+      env: COMPILER_NAME=clang-3.8 CXX=clang++-3.8 CC=clang-3.8
+    - os: osx
+      osx_image: xcode7.3
+      script:
+          - xcodebuild -target RetroArch -configuration Release -project pkg/apple/RetroArch.xcodeproj
+
+script:
+  - ./configure
+  - make
+
+env:
+  global:
+   - secure: "qc91ReC3OlzSh2gFaSH6TYzC2qIQvgA2AZff6J13eaH8xijAhuMzttZ0rMQJ0DWCIhPeUb0kIzVyaGoe4MwPALzpw1C1AznIWiZJ53HN+hWCOcS/af7YVPk6HPySnwqrS+Wv3AIIvIKFV2mxv21F/JbT/N+pArlRrp904Xj+KPo="
+addons:
+  apt:
+    packages:
+      - curl
+      - pkg-config
+      - libglu1-mesa-dev
+      - freeglut3-dev
+      - mesa-common-dev
+      - libsdl1.2-dev
+      - libsdl-image1.2-dev
+      - libsdl-mixer1.2-dev
+      - libsdl-ttf2.0-dev
+  coverity_scan:
+    project:
+      name: "RetroArch"
+      description: "RetroArch is the official reference frontend for the libretro API."
+    notification_email: [email protected]
+    build_command_prepend: "./configure; make clean"
+    build_command:   "make"
+    branch_pattern: coverity_scan

Makefile

@@ -1,4 +1,5 @@
 HAVE_FILE_LOGGER=1
+HAVE_CC_RESAMPLER=1
 NEED_CXX_LINKER=0
 MISSING_DECLS   =0
 
@@ -16,11 +17,16 @@ ifeq ($(GLOBAL_CONFIG_DIR),)
    GLOBAL_CONFIG_DIR = /etc
 endif
 
-OBJ := 
+OBJ :=
 LIBS :=
 DEFINES := -DHAVE_CONFIG_H -DRARCH_INTERNAL -DHAVE_OVERLAY
 DEFINES += -DGLOBAL_CONFIG_DIR='"$(GLOBAL_CONFIG_DIR)"'
 
+ifneq ($(findstring DOS,$(OS)),)
+   CFLAGS += -march=i386
+   LDFLAGS += -lemu
+endif
+
 ifneq ($(findstring Win32,$(OS)),)
    LDFLAGS += -static-libgcc
 endif
@@ -31,6 +37,12 @@ ifeq ($(shell $(CC) -v 2>&1 | grep -c "clang"),1)
    DEFINES +=  -Wno-invalid-source-encoding
 endif
 
+ifeq ($(shell $(CC) -v 2>&1 | grep -c "tcc"),1)
+   MD = -MD
+else
+   MD = -MMD
+endif
+
 HEADERS = $(wildcard */*/*.h) $(wildcard */*.h) $(wildcard *.h)
 
 ifeq ($(MISSING_DECLS), 1)
@@ -55,9 +67,10 @@ ifeq ($(DEBUG), 1)
    OPTIMIZE_FLAG = -O0 -g
 else
    OPTIMIZE_FLAG = -O3 -ffast-math
-   ifneq ($(findstring Win32,$(OS)),)
-      LDFLAGS += -mwindows
-   endif
+endif
+
+ifneq ($(findstring Win32,$(OS)),)
+   LDFLAGS += -mwindows
 endif
 
 CFLAGS   += -Wall $(OPTIMIZE_FLAG) $(INCLUDE_DIRS) $(DEBUG_FLAG) -I.
@@ -108,7 +121,7 @@ RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ))
 ifneq ($(SANITIZER),)
     CFLAGS   := -fsanitize=$(SANITIZER) $(CFLAGS)
     CXXFLAGS := -fsanitize=$(SANITIZER) $(CXXFLAGS)
-    LDFLAGS  := -fsanitize=$(SANITIZER) $(LDLAGS)
+    LDFLAGS  := -fsanitize=$(SANITIZER) $(LDFLAGS)
 endif
 
 ifneq ($(findstring $(GPERFTOOLS),profiler),)
@@ -136,12 +149,12 @@ retroarch: $(RARCH_OBJ)
 $(OBJDIR)/%.o: %.c config.h config.mk
 	@mkdir -p $(dir $@)
 	@$(if $(Q), $(shell echo echo CC $<),)
-	$(Q)$(CC) $(CFLAGS) $(DEFINES) -MMD -c -o $@ $<
+	$(Q)$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) $(MD) -c -o $@ $<
 
 $(OBJDIR)/%.o: %.cpp config.h config.mk
 	@mkdir -p $(dir $@)
 	@$(if $(Q), $(shell echo echo CXX $<),)
-	$(Q)$(CXX) $(CXXFLAGS) $(DEFINES) -MMD -c -o $@ $<
+	$(Q)$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(DEFINES) -MMD -c -o $@ $<
 
 $(OBJDIR)/%.o: %.m
 	@mkdir -p $(dir $@)
@@ -167,27 +180,43 @@ $(OBJDIR)/%.o: %.rc $(HEADERS)
 
 install: $(TARGET)
 	rm -f $(OBJDIR)/git_version.o
-	mkdir -p $(DESTDIR)$(PREFIX)/bin 2>/dev/null || /bin/true
+	mkdir -p $(DESTDIR)$(BIN_DIR) 2>/dev/null || /bin/true
 	mkdir -p $(DESTDIR)$(GLOBAL_CONFIG_DIR) 2>/dev/null || /bin/true
 	mkdir -p $(DESTDIR)$(PREFIX)/share/applications 2>/dev/null || /bin/true
 	mkdir -p $(DESTDIR)$(MAN_DIR)/man6 2>/dev/null || /bin/true
 	mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps 2>/dev/null || /bin/true
-	install -m755 $(TARGET) $(DESTDIR)$(PREFIX)/bin 
-	install -m755 tools/cg2glsl.py $(DESTDIR)$(PREFIX)/bin/retroarch-cg2glsl
+	install -m755 $(TARGET) $(DESTDIR)$(BIN_DIR)
+	install -m755 tools/cg2glsl.py $(DESTDIR)$(BIN_DIR)/retroarch-cg2glsl
 	install -m644 retroarch.cfg $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
 	install -m644 retroarch.desktop $(DESTDIR)$(PREFIX)/share/applications
 	install -m644 docs/retroarch.6 $(DESTDIR)$(MAN_DIR)/man6
 	install -m644 docs/retroarch-cg2glsl.6 $(DESTDIR)$(MAN_DIR)/man6
 	install -m644 media/retroarch.svg $(DESTDIR)$(PREFIX)/share/pixmaps
+	@if test -d media/assets; then \
+		echo "Installing media assets..."; \
+		mkdir -p $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb; \
+		mkdir -p $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/glui; \
+		cp -r media/assets/xmb/  $(DESTDIR)$(ASSETS_DIR)/retroarch/assets; \
+		cp -r media/assets/glui/ $(DESTDIR)$(ASSETS_DIR)/retroarch/assets; \
+		echo "Removing unneeded source image files.."; \
+		rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb/flatui/src; \
+		rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb/monochrome/src; \
+		rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb/retroactive/src; \
+		rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb/neoactive/src; \
+		rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb/retroactive_marked/src; \
+		rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb/dot-art/src; \
+		echo "Asset copying done."; \
+	fi
 
 uninstall:
-	rm -f $(DESTDIR)$(PREFIX)/bin/retroarch
-	rm -f $(DESTDIR)$(PREFIX)/bin/retroarch-cg2glsl
+	rm -f $(DESTDIR)$(BIN_DIR)/retroarch
+	rm -f $(DESTDIR)$(BIN_DIR)/retroarch-cg2glsl
 	rm -f $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
 	rm -f $(DESTDIR)$(PREFIX)/share/applications/retroarch.desktop
 	rm -f $(DESTDIR)$(MAN_DIR)/man6/retroarch.6
 	rm -f $(DESTDIR)$(MAN_DIR)/man6/retroarch-cg2glsl.6
 	rm -f $(DESTDIR)$(PREFIX)/share/pixmaps/retroarch.svg
+	rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch
 
 clean:
 	rm -rf $(OBJDIR)

Makefile.ctr

@@ -25,232 +25,86 @@ APP_USE_SVCHAX       = 0
 
 include ctr/Makefile.cores
 
-OBJS :=
-OBJS += gfx/drivers/ctr_shaders/ctr_sprite.o
-OBJS += ctr/ctr_system.o
-OBJS += ctr/ctr_memory.o
-OBJS += ctr/ctr_linear.o
+OBJ :=
+OBJ += gfx/drivers/ctr_shaders/ctr_sprite.o
+OBJ += ctr/ctr_system.o
+OBJ += ctr/ctr_memory.o
+OBJ += ctr/ctr_linear.o
+OBJ += ctr/gpu_old.o
 
 ifeq ($(APP_BIG_TEXT_SECTION), 1)
 	APP_USE_SVCHAX = 1
-    LDFLAGS  += -Wl,--defsym,__ctr_patch_services=__service_ptr
+	LDFLAGS  += -Wl,--defsym,__ctr_patch_services=__service_ptr
 endif
 
 ifeq ($(APP_USE_SVCHAX), 1)
-	OBJS += ctr/ctr_svchax.o
+	OBJ += ctr/ctr_svchax.o
 endif
 
+DEFINES :=
 ifeq ($(GRIFFIN_BUILD), 1)
-	OBJS += griffin/griffin.o
+	OBJ += griffin/griffin.o
+	DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_MENU -DHAVE_RGUI -DHAVE_XMB -DHAVE_MATERIALUI -DHAVE_LIBRETRODB -DHAVE_CC_RESAMPLER
+	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB
 else
-	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
-	OBJS += libretro-common/compat/compat_strcasestr.o
-	OBJS += libretro-common/compat/compat_strl.o
-	OBJS += libretro-common/compat/compat_fnmatch.o
-	OBJS += libretro-common/memmap/memalign.o
-	OBJS += libretro-common/file/config_file.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 += libretro-common/formats/image_texture.o
-	OBJS += libretro-common/formats/tga/rtga.o
-	OBJS += libretro-common/formats/png/rpng.o
-	OBJS += libretro-common/formats/png/rpng_encode.o
-	OBJS += libretro-common/formats/bmp/rbmp_encode.o
-	OBJS += libretro-common/gfx/math/matrix_4x4.o
-	OBJS += libretro-common/gfx/math/matrix_3x3.o
-	OBJS += gfx/drivers/ctr_gfx.o
-	OBJS += gfx/drivers/nullgfx.o
-	OBJS += gfx/font_driver.o
-	OBJS += gfx/drivers_font_renderer/bitmapfont.o
-	OBJS += input/input_autodetect.o
-	OBJS += input/input_joypad_driver.o
-	OBJS += input/input_hid_driver.o
-	OBJS += input/input_config.o
-	OBJS += input/input_keymaps.o
-	OBJS += input/input_remapping.o
-	OBJS += input/input_keyboard.o
-	OBJS += input/drivers/ctr_input.o
-	OBJS += input/drivers_joypad/ctr_joypad.o
-	OBJS += input/autoconf/builtin_ctr.o
-	OBJS += input/drivers/nullinput.o
-	OBJS += input/drivers_joypad/null_joypad.o
-	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_queue.o
-	OBJS += audio/audio_resampler_driver.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
-	OBJS += audio/drivers/ctr_csnd_audio.o
-	OBJS += audio/drivers/ctr_dsp_audio.o
-	OBJS += audio/drivers/nullaudio.o
-	OBJS += gfx/video_driver.o
-	OBJS += gfx/video_coord_array.o
-	OBJS += input/input_driver.o
-	OBJS += audio/audio_driver.o
-	OBJS += camera/camera_driver.o
-	OBJS += location/location_driver.o
-	OBJS += driver.o
-	OBJS += libretro-common/gfx/scaler/scaler_filter.o
-	OBJS += libretro-common/gfx/scaler/pixconv.o
-	OBJS += libretro-common/gfx/scaler/scaler.o
-	OBJS += libretro-common/gfx/scaler/scaler_int.o
-	OBJS += gfx/video_filters/2xsai.o
-	OBJS += gfx/video_filters/super2xsai.o
-	OBJS += gfx/video_filters/supereagle.o
-	OBJS += gfx/video_filters/2xbr.o
-	OBJS += gfx/video_filters/darken.o
-	OBJS += gfx/video_filters/epx.o
-	OBJS += gfx/video_filters/scale2x.o
-	OBJS += gfx/video_filters/blargg_ntsc_snes.o
-	OBJS += gfx/video_filters/lq2x.o
-	OBJS += gfx/video_filters/phosphor2x.o
-	OBJS += audio/audio_filters/echo.o
-	OBJS += audio/audio_filters/eq.o
-	OBJS += audio/audio_filters/chorus.o
-	OBJS += audio/audio_filters/iir.o
-	OBJS += audio/audio_filters/panning.o
-	OBJS += audio/audio_filters/phaser.o
-	OBJS += audio/audio_filters/reverb.o
-	OBJS += audio/audio_filters/wahwah.o
-	OBJS += libretro-common/dynamic/dylib.o
-	OBJS += dynamic.o
-	OBJS += gfx/video_filter.o
-	OBJS += audio/audio_dsp_filter.o
-	OBJS += cores/dynamic_dummy.o
-	OBJS += content.o
-	OBJS += libretro-common/file/file_path.o
-	OBJS += file_path_special.o
-	OBJS += libretro-common/lists/dir_list.o
-	OBJS += libretro-common/file/retro_dirent.o
-	OBJS += libretro-common/streams/file_stream.o
-	OBJS += libretro-common/file/retro_stat.o
-	OBJS += list_special.o
-	OBJS += libretro-common/lists/string_list.o
-	OBJS += libretro-common/string/stdstring.o
-	OBJS += libretro-common/file/nbio/nbio_stdio.o
-	OBJS += libretro-common/lists/file_list.o
-	OBJS += libretro-common/queues/message_queue.o
-	OBJS += patch.o
-	OBJS += configuration.o
-	OBJS += rewind.o
-	OBJS += frontend/frontend_driver.o
-	OBJS += frontend/drivers/platform_ctr.o
-	OBJS += frontend/drivers/platform_null.o
-	OBJS += core_info.o
-	OBJS += ui/ui_companion_driver.o
-	OBJS += ui/drivers/ui_null.o
-	OBJS += frontend/frontend.o
-	OBJS += libretro_version_1.o
-	OBJS += retroarch.o
-	OBJS += runloop.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
-	OBJS += intl/msg_hash_eo.o
-	OBJS += intl/msg_hash_fr.o
-	OBJS += intl/msg_hash_it.o
-	OBJS += intl/msg_hash_nl.o
-	OBJS += intl/msg_hash_pt.o
-	OBJS += intl/msg_hash_pl.o
-	OBJS += intl/msg_hash_us.o
-	OBJS += movie.o
-	OBJS += record/record_driver.o
-	OBJS += record/drivers/record_null.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
-	OBJS += menu/menu_hash.o
-	OBJS += menu/menu_input.o
-	OBJS += menu/menu_entry.o
-	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
-	OBJS += menu/cbs/menu_cbs_start.o
-	OBJS += menu/cbs/menu_cbs_info.o
-	OBJS += menu/cbs/menu_cbs_refresh.o
-	OBJS += menu/cbs/menu_cbs_left.o
-	OBJS += menu/cbs/menu_cbs_right.o
-	OBJS += menu/cbs/menu_cbs_title.o
-	OBJS += menu/cbs/menu_cbs_deferred_push.o
-	OBJS += menu/cbs/menu_cbs_scan.o
-	OBJS += menu/cbs/menu_cbs_get_value.o
-	OBJS += menu/cbs/menu_cbs_up.o
-	OBJS += menu/cbs/menu_cbs_down.o
-	OBJS += menu/cbs/menu_cbs_contentlist_switch.o
-	OBJS += menu/menu_shader.o
-	OBJS += menu/menu_navigation.o
-	OBJS += menu/menu_display.o
-	OBJS += menu/menu_displaylist.o
-	OBJS += menu/menu_animation.o
-	OBJS += menu/intl/menu_hash_de.o
-	OBJS += menu/intl/menu_hash_es.o
-	OBJS += menu/intl/menu_hash_eo.o
-	OBJS += menu/intl/menu_hash_fr.o
-	OBJS += menu/intl/menu_hash_it.o
-	OBJS += menu/intl/menu_hash_nl.o
-	OBJS += menu/intl/menu_hash_pl.o
-	OBJS += menu/intl/menu_hash_pt.o
-	OBJS += menu/intl/menu_hash_us.o
-	OBJS += menu/drivers/null.o
-	OBJS += menu/drivers/menu_generic.o
-	OBJS += menu/drivers_display/menu_display_null.o
-	OBJS += menu/drivers/rgui.o
-	OBJS += command_event.o
-	OBJS += deps/zlib/adler32.o
-	OBJS += deps/zlib/compress.o
-	OBJS += deps/zlib/crc32.o
-	OBJS += deps/zlib/deflate.o
-	OBJS += deps/zlib/gzclose.o
-	OBJS += deps/zlib/gzlib.o
-	OBJS += deps/zlib/gzread.o
-	OBJS += deps/zlib/gzwrite.o
-	OBJS += deps/zlib/inffast.o
-	OBJS += deps/zlib/inflate.o
-	OBJS += deps/zlib/inftrees.o
-	OBJS += deps/zlib/trees.o
-	OBJS += deps/zlib/uncompr.o
-	OBJS += deps/zlib/zutil.o
-	OBJS += audio/audio_utils.o
+	HAVE_CC_RESAMPLER = 1
+	HAVE_MENU_COMMON = 1
+	HAVE_RTGA = 1
+	HAVE_RPNG = 1
+	HAVE_RJPEG = 1
+	HAVE_RBMP = 1
+	HAVE_RGUI = 1
+	HAVE_ZLIB = 1
+	HAVE_7ZIP = 1
+	HAVE_BUILTINZLIB = 1
+	HAVE_LIBRETRODB = 1
+	HAVE_ZARCH = 0
+	HAVE_MATERIALUI = 1
+	HAVE_XMB = 1
+
+	include Makefile.common
+	BLACKLIST :=
+	BLACKLIST += input/input_overlay.o
+	BLACKLIST += tasks/task_overlay.o
+	OBJ := $(filter-out $(BLACKLIST),$(OBJ))
+
+	OBJ += gfx/drivers/ctr_gfx.o
+	OBJ += gfx/drivers_font/ctr_font.o
+	OBJ += menu/drivers_display/menu_display_ctr.o
+	OBJ += input/drivers/ctr_input.o
+	OBJ += input/drivers_joypad/ctr_joypad.o
+	OBJ += audio/drivers/ctr_csnd_audio.o
+	OBJ += audio/drivers/ctr_dsp_audio.o
+	OBJ += frontend/drivers/platform_ctr.o
+	OBJ += gfx/video_filters/2xsai.o
+	OBJ += gfx/video_filters/super2xsai.o
+	OBJ += gfx/video_filters/supereagle.o
+	OBJ += gfx/video_filters/2xbr.o
+	OBJ += gfx/video_filters/darken.o
+	OBJ += gfx/video_filters/epx.o
+	OBJ += gfx/video_filters/scale2x.o
+	OBJ += gfx/video_filters/blargg_ntsc_snes.o
+	OBJ += gfx/video_filters/lq2x.o
+	OBJ += gfx/video_filters/phosphor2x.o
+	OBJ += libretro-common/audio/dsp_filters/echo.o
+	OBJ += libretro-common/audio/dsp_filters/eq.o
+	OBJ += libretro-common/audio/dsp_filters/chorus.o
+	OBJ += libretro-common/audio/dsp_filters/iir.o
+	OBJ += libretro-common/audio/dsp_filters/panning.o
+	OBJ += libretro-common/audio/dsp_filters/phaser.o
+	OBJ += libretro-common/audio/dsp_filters/reverb.o
+	OBJ += libretro-common/audio/dsp_filters/wahwah.o
 endif
 
 
-ifeq ($(strip $(DEVKITARM)),)
-$(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM")
+ifeq ($(strip $(DEVKITPRO)),)
+$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitpro")
 endif
 
 ifeq ($(strip $(CTRULIB)),)
-$(error "Please set CTRULIB in your environment. export CTRULIB=<path to>ctrulib")
+	CTRULIB = $(DEVKITPRO)/libctru
 endif
 
-ifeq ($(strip $(AEMSTRO)),)
-$(error "Please set AEMSTRO in your environment. export AEMSTRO=<path to>aemstro")
-endif
-
-
 APP_TITLE         := $(shell echo "$(APP_TITLE)" | cut -c1-128)
 APP_DESCRIPTION   := $(shell echo "$(APP_DESCRIPTION)" | cut -c1-256)
 APP_AUTHOR        := $(shell echo "$(APP_AUTHOR)" | cut -c1-128)
@@ -291,8 +145,7 @@ endif
 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 -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB -DHAVE_BUILTIN_AUTOCONFIG
+CFLAGS += -DHAVE_FILTERS_BUILTIN $(DEFINES)
 
 CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
 
@@ -321,11 +174,11 @@ endif
 
 all: $(TARGET)
 
-$(TARGET): $(TARGET_3DSX) $(TARGET_3DS) $(TARGET_CIA)
+$(TARGET): $(TARGET_3DSX) $(TARGET_3DS) $(TARGET_CIA) $(TARGET).core
 $(TARGET).3dsx: $(TARGET).elf
-$(TARGET).elf: $(OBJS) libretro_ctr.a
+$(TARGET).elf: $(OBJ) libretro_ctr.a
 
-PREFIX		:=	$(DEVKITARM)/bin/arm-none-eabi-
+PREFIX		:=	$(DEVKITPRO)/devkitARM/bin/arm-none-eabi-
 
 CC      := $(PREFIX)gcc
 CXX     := $(PREFIX)g++
@@ -348,13 +201,13 @@ else
 endif
 
 %.o: %.vsh %.gsh
-	$(DEVKITARM)/bin/picasso $^ -o $*.shbin
-	$(DEVKITARM)/bin/bin2s $*.shbin | $(PREFIX)as -o $@
+	$(DEVKITPRO)/devkitARM/bin/picasso $^ -o $*.shbin
+	$(DEVKITPRO)/devkitARM/bin/bin2s $*.shbin | $(PREFIX)as -o $@
 	rm $*.shbin
 
 %.o: %.vsh
-	$(DEVKITARM)/bin/picasso $^ -o $*.shbin
-	$(DEVKITARM)/bin/bin2s $*.shbin | $(PREFIX)as -o $@
+	$(DEVKITPRO)/devkitARM/bin/picasso $^ -o $*.shbin
+	$(DEVKITPRO)/devkitARM/bin/bin2s $*.shbin | $(PREFIX)as -o $@
 	rm $*.shbin
 
 %.o: %.cpp
@@ -386,7 +239,7 @@ endif
 	-3dsxtool $< $@ $(_3DSXFLAGS)
 
 $(TARGET).elf: ctr/3dsx_custom_crt0.o
-	$(LD) $(LDFLAGS) $(OBJS) $(LIBDIRS) $(LIBS) -o $@
+	$(LD) $(LDFLAGS) $(OBJ) $(LIBDIRS) $(LIBS) -o $@
 	$(NM) -CSn $@ > $(notdir $*.lst)
 
 $(TARGET).bnr: $(APP_BANNER) $(APP_AUDIO)
@@ -401,13 +254,17 @@ $(TARGET).3ds: $(TARGET).elf $(TARGET).bnr $(TARGET).icn $(APP_RSF)
 $(TARGET).cia: $(TARGET).elf $(TARGET).bnr $(TARGET).icn $(APP_RSF)
 	$(MAKEROM) -f cia -o $@ $(MAKEROM_ARGS_COMMON) -DAPP_ENCRYPTED=false
 
+$(TARGET).core: $(TARGET).elf
+	echo $(APP_UNIQUE_ID) > $(TARGET).core
+
 
 clean:
-	rm -f $(OBJS)
+	rm -f $(OBJ)
 	rm -f $(TARGET).3dsx
 	rm -f $(TARGET).elf
 	rm -f $(TARGET).3ds
 	rm -f $(TARGET).cia
+	rm -f $(TARGET).core
 	rm -f $(TARGET).smdh
 	rm -f $(TARGET).bnr
 	rm -f $(TARGET).icn
@@ -416,3 +273,4 @@ clean:
 
 .PHONY: clean
 
+

Makefile.ctr.salamander

@@ -0,0 +1,203 @@
+TARGET := retroarch_3ds_salamander
+LIBRETRO =
+
+DEBUG                   = 0
+BUILD_3DSX              = 0
+BUILD_3DS               = 0
+BUILD_CIA               = 1
+
+APP_TITLE            = Retroarch 3DS
+APP_DESCRIPTION      = Retroarch 3DS
+APP_AUTHOR           = Team Libretro
+APP_PRODUCT_CODE     = RETROARCH-3DS
+APP_UNIQUE_ID        = 0xBAC00
+APP_ICON             = ctr/assets/default.png
+APP_BANNER           = ctr/assets/libretro_banner.png
+APP_AUDIO            = ctr/assets/silent.wav
+APP_RSF              = ctr/tools/template.rsf
+APP_SYSTEM_MODE      = 64MB
+APP_SYSTEM_MODE_EXT  = 124MB
+
+OBJ := ctr/ctr_system.o \
+		 ctr/ctr_memory.o \
+		 ctr/ctr_linear.o \
+		 frontend/frontend_salamander.o \
+		 frontend/frontend_driver.o \
+		 frontend/drivers/platform_ctr.o \
+		 frontend/drivers/platform_null.o \
+		 libretro-common/compat/compat_strcasestr.o \
+		 libretro-common/file/file_path.o \
+		 libretro-common/string/stdstring.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/streams/file_stream.o \
+		 libretro-common/file/retro_stat.o \
+		 libretro-common/hash/rhash.o \
+		 file_path_str.o \
+		 verbosity.o
+
+ifeq ($(strip $(DEVKITPRO)),)
+	$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitpro")
+endif
+
+ifeq ($(strip $(CTRULIB)),)
+	CTRULIB = $(DEVKITPRO)/ctrulib
+endif
+
+APP_TITLE         := $(shell echo "$(APP_TITLE)" | cut -c1-128)
+APP_DESCRIPTION   := $(shell echo "$(APP_DESCRIPTION)" | cut -c1-256)
+APP_AUTHOR        := $(shell echo "$(APP_AUTHOR)" | cut -c1-128)
+APP_PRODUCT_CODE  := $(shell echo $(APP_PRODUCT_CODE) | cut -c1-16)
+APP_UNIQUE_ID     := $(shell echo $(APP_UNIQUE_ID) | cut -c1-7)
+
+MAKEROM_ARGS_COMMON = -rsf $(APP_RSF) -exefslogo -elf $(TARGET).elf -icon $(TARGET).icn -banner $(TARGET).bnr -DAPP_TITLE="$(APP_TITLE)" -DAPP_PRODUCT_CODE="$(APP_PRODUCT_CODE)" -DAPP_UNIQUE_ID=$(APP_UNIQUE_ID) -DAPP_SYSTEM_MODE=$(APP_SYSTEM_MODE) -DAPP_SYSTEM_MODE_EXT=$(APP_SYSTEM_MODE_EXT)
+
+INCDIRS := -I$(CTRULIB)/include
+LIBDIRS := -L. -L$(CTRULIB)/lib
+
+ARCH     := -march=armv6k -mtune=mpcore -mfloat-abi=hard -marm -mfpu=vfp -mtp=soft
+
+CFLAGS	+=	-mword-relocations \
+			-fomit-frame-pointer -ffast-math \
+         -Werror=implicit-function-declaration \
+			$(ARCH)
+
+#CFLAGS	+= -Wall
+CFLAGS	+=	-DARM11 -D_3DS
+
+ifeq ($(DEBUG), 1)
+   CFLAGS	+= -O0 -g
+else
+   CFLAGS	+= -O3
+endif
+
+CFLAGS += -I. -Ideps/zlib -Ideps/7zip -Ilibretro-common/include
+
+#CFLAGS += -DRARCH_INTERNAL
+CFLAGS += -DRARCH_CONSOLE -DIS_SALAMANDER
+
+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)
+
+CFLAGS   += -std=gnu99 -ffast-math
+
+
+LIBS	:= -lctru -lm
+
+
+ifeq ($(BUILD_3DSX), 1)
+TARGET_3DSX := $(TARGET).3dsx $(TARGET).smdh
+endif
+
+ifeq ($(BUILD_3DS), 1)
+TARGET_3DS := $(TARGET).3ds
+endif
+
+ifeq ($(BUILD_CIA), 1)
+TARGET_CIA := $(TARGET).cia
+endif
+
+.PHONY: $(BUILD) clean all
+
+all: $(TARGET)
+
+$(TARGET): $(TARGET_3DSX) $(TARGET_3DS) $(TARGET_CIA)
+$(TARGET).3dsx: $(TARGET).elf
+$(TARGET).elf: $(OBJ)
+
+PREFIX		:=	$(DEVKITPRO)/devkitARM/bin/arm-none-eabi-
+
+CC      := $(PREFIX)gcc
+CXX     := $(PREFIX)g++
+AS      := $(PREFIX)as
+AR      := $(PREFIX)ar
+OBJCOPY := $(PREFIX)objcopy
+STRIP   := $(PREFIX)strip
+NM      := $(PREFIX)nm
+LD      := $(CXX)
+
+ifneq ($(findstring Linux,$(shell uname -a)),)
+	MAKEROM    = ctr/tools/makerom-linux
+	BANNERTOOL = ctr/tools/bannertool-linux
+else ifneq ($(findstring Darwin,$(shell uname -a)),)
+	MAKEROM    = ctr/tools/makerom-mac
+	BANNERTOOL = ctr/tools/bannertool-mac
+else
+	MAKEROM    = ctr/tools/makerom.exe
+	BANNERTOOL = ctr/tools/bannertool.exe
+endif
+
+%.o: %.vsh %.gsh
+	$(DEVKITPRO)/devkitARM/bin/picasso $^ -o $*.shbin
+	$(DEVKITPRO)/devkitARM/bin/bin2s $*.shbin | $(PREFIX)as -o $@
+	rm $*.shbin
+
+%.o: %.vsh
+	$(DEVKITPRO)/devkitARM/bin/picasso $^ -o $*.shbin
+	$(DEVKITPRO)/devkitARM/bin/bin2s $*.shbin | $(PREFIX)as -o $@
+	rm $*.shbin
+
+%.o: %.cpp
+	$(CXX) -c -o $@ $< $(CXXFLAGS) $(INCDIRS)
+
+%.o: %.c
+	$(CC) -c -o $@ $< $(CFLAGS) $(INCDIRS)
+
+%.o: %.s
+	$(CC) -c -o $@ $< $(ASFLAGS)
+
+%.o: %.S
+	$(CC) -c -o $@ $< $(ASFLAGS)
+
+%.a:
+	$(AR) -rc $@ $^
+
+%.vsh:
+
+$(TARGET).smdh: $(APP_ICON)
+	smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@
+
+$(TARGET).3dsx: $(TARGET).elf
+ifeq ($(APP_BIG_TEXT_SECTION), 1)
+	cp ctr/big_text_section.xml $(TARGET).xml
+else
+	rm -f $(TARGET).xml
+endif
+	-3dsxtool $< $@ $(_3DSXFLAGS)
+
+$(TARGET).elf: ctr/3dsx_custom_crt0.o
+	$(LD) $(LDFLAGS) $(OBJ) $(LIBDIRS) $(LIBS) -o $@
+	$(NM) -CSn $@ > $(notdir $*.lst)
+
+$(TARGET).bnr: $(APP_BANNER) $(APP_AUDIO)
+	$(BANNERTOOL) makebanner -i "$(APP_BANNER)" -a "$(APP_AUDIO)" -o $@
+
+$(TARGET).icn: $(APP_ICON)
+	$(BANNERTOOL) makesmdh -s "$(APP_TITLE)" -l "$(APP_TITLE)" -p "$(APP_AUTHOR)" -i $(APP_ICON) -o $@
+
+$(TARGET).3ds: $(TARGET).elf $(TARGET).bnr $(TARGET).icn $(APP_RSF)
+	$(MAKEROM) -f cci -o $@ $(MAKEROM_ARGS_COMMON) -DAPP_ENCRYPTED=true
+
+$(TARGET).cia: $(TARGET).elf $(TARGET).bnr $(TARGET).icn $(APP_RSF)
+	$(MAKEROM) -f cia -o $@ $(MAKEROM_ARGS_COMMON) -DAPP_ENCRYPTED=false
+
+clean:
+	rm -f $(OBJ)
+	rm -f $(TARGET).3dsx
+	rm -f $(TARGET).elf
+	rm -f $(TARGET).3ds
+	rm -f $(TARGET).cia
+	rm -f $(TARGET).smdh
+	rm -f $(TARGET).bnr
+	rm -f $(TARGET).icn
+	rm -f ctr/ctr_config_*.o
+	rm -f ctr/3dsx_custom_crt0.o
+
+.PHONY: clean
+
+

Makefile.emscripten

@@ -1,21 +1,28 @@
-TARGET = retroarch.js
+TARGET := retroarch.js
 
+EOPT = USE_ZLIB=1 USE_SDL=2 # Emscripten specific options
+EOPTS = $(addprefix -s $(EMPTY), $(EOPT)) # Add '-s ' to each option
+
+PTHREAD = 0
 OS = Emscripten
 OBJ :=
-DEFINES := -DRARCH_INTERNAL -DHAVE_OVERLAY -DHAVE_MAIN
+DEFINES := -DRARCH_INTERNAL -DHAVE_OVERLAY -DHAVE_MAIN -s USE_PTHREADS=$(PTHREAD)
 DEFINES += -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_EGL -DHAVE_OVERLAY -DHAVE_GLSL -DHAVE_FILTERS_BUILTIN
 
+HAVE_CC_RESAMPLER = 1
 HAVE_EGL    = 1
-HAVE_OPENGL = 1
-HAVE_GLES = 1
+HAVE_OPENGLES = 1
+HAVE_RJPEG  = 0
+HAVE_RPNG   = 1
 HAVE_EMSCRIPTEN = 1
 HAVE_RGUI = 1
 HAVE_SDL = 0
+HAVE_SDL2 = 1
 HAVE_ZLIB = 1
 HAVE_FBO = 1
 WANT_ZLIB = 1
-MEMORY = 268435456
-LTO = 0
+MEMORY = 536870912
+
 # XXX: setting this to 1/2 currently crashes Firefox nightly
 PRECISE_F32 = 2
 
@@ -23,12 +30,25 @@ ifneq ($(NATIVE_ZLIB),)
    WANT_ZLIB = 0
 endif
 
-LIBS    :=
-LDFLAGS := -L. --no-heap-copy -s USE_ZLIB=1 -s TOTAL_MEMORY=$(MEMORY) -s OUTLINING_LIMIT=50000 \
+ifeq ($(HAVE_SDL2), 1)
+DEFINES += -DHAVE_SDL2
+endif
+
+#if you compile with SDL2 flag add this Emscripten flag "-s USE_SDL=2" to LDFLAGS:
+
+LIBS    := -s USE_SDL=2 -s USE_ZLIB=1
+LDFLAGS := -L. --no-heap-copy -s USE_ZLIB=1 -s TOTAL_MEMORY=$(MEMORY) \
            -s EXPORTED_FUNCTIONS="['_main', '_malloc', '_cmd_savefiles', '_cmd_save_state', '_cmd_load_state', '_cmd_take_screenshot']" \
            --js-library emscripten/library_rwebaudio.js \
            --js-library emscripten/library_rwebinput.js \
            --js-library emscripten/library_rwebcam.js
+ifneq ($(PTHREAD), 0)
+   LDFLAGS += -s USE_PTHREADS=$(PTHREAD) -s PTHREAD_POOL_SIZE=2
+endif
+
+ifeq ($(ASYNC), 1)
+   LDFLAGS += -s ASYNCIFY=$(ASYNC)
+endif  
 
 include Makefile.common
 
@@ -43,14 +63,14 @@ OBJ += gfx/video_filters/blargg_ntsc_snes.o
 OBJ += gfx/video_filters/lq2x.o
 OBJ += gfx/video_filters/phosphor2x.o
 
-OBJ += audio/audio_filters/echo.o
-OBJ += audio/audio_filters/eq.o
-OBJ += audio/audio_filters/chorus.o
-OBJ += audio/audio_filters/iir.o
-OBJ += audio/audio_filters/panning.o
-OBJ += audio/audio_filters/phaser.o
-OBJ += audio/audio_filters/reverb.o
-OBJ += audio/audio_filters/wahwah.o
+OBJ += libretro-common/audio/dsp_filters/echo.o
+OBJ += libretro-common/audio/dsp_filters/eq.o
+OBJ += libretro-common/audio/dsp_filters/chorus.o
+OBJ += libretro-common/audio/dsp_filters/iir.o
+OBJ += libretro-common/audio/dsp_filters/panning.o
+OBJ += libretro-common/audio/dsp_filters/phaser.o
+OBJ += libretro-common/audio/dsp_filters/reverb.o
+OBJ += libretro-common/audio/dsp_filters/wahwah.o
 
 CFLAGS += -Ideps/zlib/
 libretro = libretro_emscripten.bc
@@ -72,7 +92,7 @@ else
    CFLAGS += -O2
 endif
 
-CFLAGS += -DHAVE_RPNG -DHAVE_RJPEG -Wall -Wno-unused-result -Wno-unused-variable -I. -Ilibretro-common/include -std=gnu99 -s USE_ZLIB=1 \
+CFLAGS += -DHAVE_RPNG -Wall -Wno-unused-result -Wno-unused-variable -I. -Ilibretro-common/include -std=gnu99 -s USE_ZLIB=1 \
           -s EXPORTED_FUNCTIONS="['_main', '_malloc', '_cmd_savefiles', '_cmd_save_state', '_cmd_take_screenshot']"
 
 all: $(TARGET)
@@ -83,11 +103,11 @@ $(TARGET): $(OBJ)
 
 %.o: %.c
 	@$(if $(Q), $(shell echo echo CC $<),)
-	$(Q)$(CC) $(CFLAGS) $(DEFINES) -c -o $@ $<
+	$(Q)$(CC) $(CFLAGS) $(DEFINES) $(EOPTS) -c -o $@ $<
 
 %.o: %.cpp
 	@$(if $(Q), $(shell echo echo CXX $<),)
-	$(Q)$(CXX) $(CXXFLAGS) $(DEFINES) -c -o $@ $<
+	$(Q)$(CXX) $(CXXFLAGS) $(DEFINES) $(EOPTS) -c -o $@ $<
 
 clean:
 	rm -f *.o

Makefile.griffin

@@ -1,12 +1,15 @@
-DEBUG			               = 0
-HAVE_LOGGER		            = 0
-HAVE_FILE_LOGGER	         = 0
-WHOLE_ARCHIVE_LINK         = 0
-BIG_STACK		            = 1
+ROOT_DIR			:= .
+DEPS_DIR			:= $(ROOT_DIR)/deps
+DEBUG			 	= 0
+HAVE_LOGGER			= 0
+HAVE_FILE_LOGGER		= 0
+HAVE_CC_RESAMPLER		= 1
+WHOLE_ARCHIVE_LINK		= 0
+BIG_STACK   			= 1
 PC_DEVELOPMENT_IP_ADDRESS	= 255.255.255.255
 PC_DEVELOPMENT_UDP_PORT		= 3490
-RARCH_CONSOLE					= 0
-USBGECKO                   = 0
+RARCH_CONSOLE			= 0
+USBGECKO			= 0
 
 ifneq ($(EMSCRIPTEN),)
    platform = emscripten
@@ -122,7 +125,7 @@ ifeq ($(HAVE_LOGGER), 1)
 endif
 endif
 
-  CFLAGS += -DGEKKO
+  CFLAGS += -DGEKKO -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int
 
   HAVE_FILTERS_BUILTIN     := 1
   HAVE_THREADS             := 1
@@ -131,8 +134,8 @@ endif
   HAVE_RBMP					   := 1
   HAVE_RTGA					   := 1
   HAVE_OVERLAY             := 1
-  HAVE_BUILTIN_AUTOCONFIG  := 1
   HAVE_ZLIB                := 1
+  WANT_ZLIB						:= 1
   HAVE_7ZIP                := 1
   RARCH_CONSOLE          = 1
 
@@ -208,31 +211,51 @@ else ifeq ($(platform), vita)
   EXT_TARGET := $(TARGET_NAME)_$(platform).velf
   EXT_INTER_TARGET := $(TARGET_NAME)_$(platform).elf
   MACHDEP := -DVITA
-  PLATCFLAGS :=  -O3 -mfloat-abi=hard -ffast-math -fsingle-precision-constant 
-  LIBS += -lSceKernel_stub -lSceDisplay_stub -lSceGxm_stub -lSceNet_stub -lSceNetCtl_stub\
-			 -lSceSysmodule_stub -lSceCtrl_stub -lSceAudio_stub -lUVLoader_stub \
-			 -lScePower_stub -lSceRtc_stub -lSceCommonDialog_stub -lfreetype -lz -lm -lc -lpng
+  WANT_ZLIB						:= 1
+  INCLUDE += -Ideps/libvita2d/include
+  INCLUDE += -Ideps/zlib
+  PLATCFLAGS := -marm -mfloat-abi=hard -fsingle-precision-constant \
+       -mword-relocations -fno-unwind-tables -fno-asynchronous-unwind-tables -ftree-vectorize -fno-optimize-sibling-calls
+  LIBS += -lSceDisplay_stub -lSceGxm_stub -lSceNet_stub -lSceNetCtl_stub\
+			 -lSceSysmodule_stub -lSceCtrl_stub -lSceTouch_stub -lSceAudio_stub -lSceFiber_stub\
+			 -lScePower_stub -lSceRtc_stub -lSceCommonDialog_stub -lScePgf_stub \
+			 -lSceMotion_stub -lSceAppMgr_stub -lpng -lm -lc
 
-  PLATOBJS += libretro-common/conversion/s16_to_float_neon.o \
-				  audio/drivers_resampler/sinc_resampler_neon.o \
-              audio/drivers_resampler/cc_resampler_neon.o
+  PLATOBJS += $(DEPS_DIR)/libvita2d/shader/clear_v_gxp.o \
+		 $(DEPS_DIR)/libvita2d/shader/clear_f_gxp.o \
+		 $(DEPS_DIR)/libvita2d/shader/color_v_gxp.o \
+		 $(DEPS_DIR)/libvita2d/shader/color_f_gxp.o \
+		 $(DEPS_DIR)/libvita2d/shader/texture_v_gxp.o \
+		 $(DEPS_DIR)/libvita2d/shader/texture_f_gxp.o \
+		 $(DEPS_DIR)/libvita2d/shader/texture_tint_f_gxp.o
+
+  PLATOBJS += \
+		libretro-common/audio/conversion/s16_to_float_neon.o \
+		libretro-common/audio/conversion/float_to_s16_neon.o \
+		memory/neon/memcpy-neon.o \
+		libretro-common/audio/resampler/drivers/sinc_resampler_neon.o \
+		audio/drivers_resampler/cc_resampler_neon.o
 
   LIBDIRS += -L.
   LDFLAGS +=  -Wl,-q
 
   HAVE_FILTERS_BUILTIN     := 1
-  HAVE_BUILTIN_AUTOCONFIG  := 1
   HAVE_LANGEXTRA				:= 1
   HAVE_RPNG                := 1
   HAVE_RJPEG					:= 1
   HAVE_RBMP					   := 1
   HAVE_RTGA					   := 1
   HAVE_ZLIB                := 1
+  HAVE_7ZIP                := 1
   HAVE_VITA2D              := 1
   HAVE_NETWORKING          := 1
-  HAVE_NETPLAY             := 1
   HAVE_OVERLAY             := 1
+  HAVE_MATERIALUI				:= 1
+  HAVE_XMB						:= 1
+  HAVE_STB_FONT :=1
   RARCH_CONSOLE          = 1
+  HAVE_THREADS     := 1
+  HAVE_LIBRETRODB := 1
 endif
 
 
@@ -288,7 +311,11 @@ CFLAGS      += -DHAVE_RARCH_EXEC
 endif
 
 ifeq ($(HAVE_ZLIB), 1)
-CFLAGS      += -DHAVE_ZLIB -DWANT_ZLIB
+CFLAGS      += -DHAVE_ZLIB
+endif
+
+ifeq ($(WANT_ZLIB), 1)
+CFLAGS		+= -DWANT_ZLIB
 endif
 
 ifeq ($(HAVE_RPNG), 1)
@@ -303,6 +330,10 @@ ifeq ($(HAVE_RTGA), 1)
 CFLAGS		+=	-DHAVE_RTGA
 endif
 
+ifeq ($(HAVE_IMAGEVIEWER), 1)
+CFLAGS		+=	-DHAVE_IMAGEVIEWER
+endif
+
 ifeq ($(HAVE_7ZIP), 1)
 CFLAGS      += -DHAVE_7ZIP
 endif
@@ -311,18 +342,10 @@ ifeq ($(HAVE_OVERLAY), 1)
 CFLAGS      += -DHAVE_OVERLAY
 endif
 
-ifeq ($(HAVE_BUILTIN_AUTOCONFIG), 1)
-CFLAGS      += -DHAVE_BUILTIN_AUTOCONFIG
-endif
-
 ifeq ($(HAVE_NETWORKING), 1)
 CFLAGS      += -DHAVE_NETWORKING
 endif
 
-ifeq ($(HAVE_NETPLAY), 1)
-CFLAGS      += -DHAVE_NETPLAY
-endif
-
 ifeq ($(RARCH_CONSOLE), 1)
 CFLAGS += -DRARCH_CONSOLE
 endif
@@ -333,6 +356,18 @@ endif
 
 CFLAGS += -std=gnu99 -DSINC_LOWER_QUALITY -DHAVE_RGUI -DHAVE_MENU -DHAVE_GRIFFIN=1 -Wno-char-subscripts  -DRARCH_INTERNAL
 
+ifeq ($(HAVE_MATERIALUI), 1)
+CFLAGS += -DHAVE_MATERIALUI
+endif
+
+ifeq ($(HAVE_XMB), 1)
+CFLAGS += -DHAVE_XMB
+endif
+
+ifeq ($(HAVE_STB_FONT), 1)
+CFLAGS += -DHAVE_STB_FONT
+endif
+
 ifeq ($(HAVE_LANGEXTRA), 1)
 CFLAGS += -DHAVE_LANGEXTRA
 endif
@@ -346,10 +381,9 @@ CFLAGS += -DHAVE_THREADS
 ifeq ($(platform), psp1)
 LIBS += -lpthread-psp
 endif
+ifeq ($(platform), vita)
+LIBS += -lpthread
 endif
-
-ifeq ($(HAVE_VITA2D), 1)
-LIBS := -lvita2d $(LIBS)
 endif
 
 ifeq ($(HAVE_RSOUND), 1)
@@ -364,6 +398,8 @@ ifeq ($(DEBUG), 1)
    CFLAGS += -O0 -g -DDEBUG
 else ifeq ($(platform), psp1)
    CFLAGS += -O2
+else ifeq ($(platform), vita)
+   CFLAGS += -O3
 else
    CFLAGS += -O3
 endif
@@ -374,8 +410,11 @@ all: $(EXT_TARGET)
 	$(ELF2DOL) $< $@
 
 %.velf: %.elf
+ifneq ($(DEBUG), 1)
 	arm-vita-eabi-strip -g $<
-	vita-elf-create $< $@ $(VITASDK)/share/db.json $(VITASDK)/share/extra.json
+endif
+	vita-elf-create $< $@
+	vita-make-fself -s $@ eboot.bin
 
 %.elf32: %.elf
 ifeq ($(platform), xenon360)
@@ -388,7 +427,7 @@ ifeq ($(platform),psp1)
 endif
 
 $(EXT_INTER_TARGET): $(OBJ)
-	$(CXX) -o $@ $(LDFLAGS) $(LIBDIRS) $(OBJ) $(LIBS)
+	$(CXX) -o $@ $(LDFLAGS) $(LIBDIRS) $(OBJ) $(PLATEXTRA) $(LIBS)
 
 %.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $<

Makefile.ps3

@@ -68,7 +68,7 @@ ifeq ($(HAVE_RLAUNCH), 1)
 	DEFINES += -DHAVE_RLAUNCH
 endif
 
-DEFINES += -DHAVE_MENU -DHAVE_RGUI -DHAVE_XMB -DHAVE_MATERIALUI -DHAVE_SHADERPIPELINE -DRARCH_INTERNAL -DMSB_FIRST -DHAVE_OVERLAY
+DEFINES += -DHAVE_MENU -DHAVE_RGUI -DHAVE_XMB -DHAVE_LIBRETRODB -DHAVE_MATERIALUI -DHAVE_SHADERPIPELINE -DRARCH_INTERNAL -DMSB_FIRST -DHAVE_OVERLAY -DHAVE_CC_RESAMPLER
 
 ifeq ($(HAVE_GCMGL), 1)
 DEFINES			+= -DHAVE_GCMGL
@@ -106,7 +106,9 @@ 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_LANGEXTRA -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_RJPEG -DHAVE_RBMP -DHAVE_RTGA -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_LANGEXTRA -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_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_7Z -DWANT_ZLIB -DSINC_LOWER_QUALITY -D__CELLOS_LV2__ -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
+
+#DEFINES += -DHAVE_IMAGEVIEWER
 
 ifeq ($(DEBUG), 1)
    PPU_OPTIMIZE_LV	:= -O0 -g

Makefile.ps3.cobra

@@ -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_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_NETWORKING=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

Makefile.ps3.salamander

@@ -31,6 +31,7 @@ PPU_SRCS		= frontend/frontend_salamander.c \
 				  libretro-common/hash/rhash.c \
 				  libretro-common/string/stdstring.c \
 				  libretro-common/compat/compat_strl.c \
+				  libretro-common/compat/compat_strcasestr.c \
 				  libretro-common/streams/file_stream.c \
 				  libretro-common/file/config_file.c \
 				  file_path_str.c \

Makefile.psl1ght

@@ -89,7 +89,7 @@ ifeq ($(HAVE_FILE_LOGGER), 1)
 CFLAGS		+= -DHAVE_FILE_LOGGER
 endif
 
-SHARED_FLAGS := -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_GCMGL -DHAVE_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_MOUSE  -DHAVE_ZLIB -DHAVE_RPNG -DWANT_ZLIB   -DHAVE_GRIFFIN=1 -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -Wno-char-subscripts
+SHARED_FLAGS := -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_GCMGL -DHAVE_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_MOUSE  -DHAVE_ZLIB -DHAVE_RPNG -DWANT_ZLIB   -DHAVE_GRIFFIN=1 -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -Wno-char-subscripts -DHAVE_CC_RESAMPLER
 CFLAGS += -std=gnu99 $(SHARED_FLAGS)
 CXXFLAGS += $(SHARED_FLAGS)
 

Makefile.psp1

@@ -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_LANGEXTRA -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DWANT_ZLIB -DHAVE_GRIFFIN=1 -DRARCH_INTERNAL -DRARCH_CONSOLE -DHAVE_MENU -DHAVE_RGUI -DSINC_LOWEST_QUALITY -DHAVE_BUILTIN_AUTOCONFIG -DHAVE_FILTERS_BUILTIN -DHAVE_7ZIP
+RARCH_DEFINES = -DPSP -D_MIPS_ARCH_ALLEGREX -DHAVE_LANGEXTRA -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DWANT_ZLIB -DHAVE_GRIFFIN=1 -DRARCH_INTERNAL -DRARCH_CONSOLE -DHAVE_MENU -DHAVE_RGUI -DSINC_LOWEST_QUALITY -DHAVE_FILTERS_BUILTIN -DHAVE_7ZIP -DHAVE_CC_RESAMPLER
 
 LIBDIR =
 LDFLAGS =

Makefile.psp1.salamander

@@ -41,6 +41,7 @@ OBJS = frontend/frontend_salamander.o \
 		 libretro-common/lists/dir_list.o \
 		 libretro-common/file/retro_dirent.o \
 		 libretro-common/compat/compat_strl.o \
+		 libretro-common/compat/compat_strcasestr.o \
 		 libretro-common/file/config_file.o \
 		 libretro-common/streams/file_stream.o \
 		 libretro-common/file/retro_stat.o \

Makefile.vita

@@ -0,0 +1,198 @@
+TARGET		    := retroarch_vita
+DEBUG               ?= 0
+GRIFFIN_BUILD        = 0
+WHOLE_ARCHIVE_LINK   = 0
+
+VITA_TITLE_ID	:= RETROARCH
+VITA_TITLE_NAME	:= RetroArch
+
+PC_DEVELOPMENT_IP_ADDRESS  =
+PC_DEVELOPMENT_UDP_PORT	   =
+
+OBJ :=
+
+DEFINES :=
+
+ifeq ($(GRIFFIN_BUILD), 1)
+	OBJ += griffin/griffin.o
+	DEFINES += -DHAVE_GRIFFIN=1
+	DEFINES += -DHAVE_NEON -DHAVE_MENU -DHAVE_XMB -DHAVE_MATERIALUI -DHAVE_LIBRETRODB
+	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB -DHAVE_CC_RESAMPLER
+	ifeq ($(DEBUG), 1)
+		DEFINES += -DHAVE_NETLOGGER
+	endif
+else
+
+	HAVE_NEON		:= 1
+	HAVE_FILTERS_BUILTIN	:= 1
+	HAVE_LANGEXTRA		:= 1
+	HAVE_RPNG		:= 1
+	HAVE_RJPEG		:= 1
+	HAVE_RBMP		:= 1
+	HAVE_RTGA		:= 1
+	HAVE_ZLIB		:= 1
+	HAVE_7ZIP		:= 1
+	HAVE_VITA2D		:= 1
+	HAVE_NETWORKING		:= 1
+	HAVE_SOCKET_LEGACY	:= 1
+	HAVE_MENU		:= 1
+	HAVE_MENU_COMMON	:= 1
+	HAVE_OVERLAY		:= 1
+	HAVE_MATERIALUI		:= 1
+	HAVE_XMB		:= 1
+	HAVE_RGUI		:= 1
+	HAVE_STB_FONT		:= 1
+	HAVE_THREADS		:= 1
+	HAVE_LIBRETRODB		:= 1
+	HAVE_CC_RESAMPLER	:= 1
+	RARCH_CONSOLE		:= 1
+
+	ifeq ($(DEBUG), 1)
+		HAVE_NETLOGGER = 1
+	endif
+
+	include Makefile.common
+	BLACKLIST :=
+	OBJ := $(filter-out $(BLACKLIST),$(OBJ))
+
+	OBJ += input/drivers/psp_input.o
+	OBJ += input/drivers_joypad/psp_joypad.o
+	OBJ += audio/drivers/psp_audio.o
+	OBJ += frontend/drivers/platform_psp.o
+	OBJ += gfx/video_filters/2xsai.o
+	OBJ += gfx/video_filters/super2xsai.o
+	OBJ += gfx/video_filters/supereagle.o
+	OBJ += gfx/video_filters/2xbr.o
+	OBJ += gfx/video_filters/darken.o
+	OBJ += gfx/video_filters/epx.o
+	OBJ += gfx/video_filters/scale2x.o
+	OBJ += gfx/video_filters/blargg_ntsc_snes.o
+	OBJ += gfx/video_filters/lq2x.o
+	OBJ += gfx/video_filters/phosphor2x.o
+	OBJ += libretro-common/audio/dsp_filters/echo.o
+	OBJ += libretro-common/audio/dsp_filters/eq.o
+	OBJ += libretro-common/audio/dsp_filters/chorus.o
+	OBJ += libretro-common/audio/dsp_filters/iir.o
+	OBJ += libretro-common/audio/dsp_filters/panning.o
+	OBJ += libretro-common/audio/dsp_filters/phaser.o
+	OBJ += libretro-common/audio/dsp_filters/reverb.o
+	OBJ += libretro-common/audio/dsp_filters/wahwah.o
+endif
+
+
+ifeq ($(strip $(VITASDK)),)
+$(error "Please set VITASDK in your environment. export VITASDK=<path to>vitasdk")
+endif
+
+export PATH := $(PATH):$(VITASDK)/bin
+
+PREFIX := arm-vita-eabi-
+
+CC      := $(PREFIX)gcc
+CXX     := $(PREFIX)g++
+AS      := $(PREFIX)as
+AR      := $(PREFIX)ar
+OBJCOPY := $(PREFIX)objcopy
+STRIP   := $(PREFIX)strip
+NM      := $(PREFIX)nm
+LD      := $(CXX)
+
+INCDIRS := -I. -Ideps/zlib -Ideps/7zip -Ilibretro-common/include
+LIBDIRS := -L.
+
+ARCHFLAGS := -march=armv7-a -mfpu=neon -mfloat-abi=hard -DVITA
+CFLAGS    += $(ARCHFLAGS) -mword-relocations -fno-optimize-sibling-calls
+
+ifeq ($(DEBUG), 1)
+   CFLAGS += -O2 -g
+else
+   CFLAGS += -O3
+endif
+
+ASFLAGS := $(CFLAGS)
+LDFLAGS := -Wl,-q
+
+CFLAGS += -Wall -ffast-math
+CFLAGS += -DRARCH_INTERNAL -DRARCH_CONSOLE
+CFLAGS += -DHAVE_FILTERS_BUILTIN $(DEFINES)
+
+ifneq ($(PC_DEVELOPMENT_IP_ADDRESS),)
+   CFLAGS += -DPC_DEVELOPMENT_IP_ADDRESS='"$(PC_DEVELOPMENT_IP_ADDRESS)"'
+endif
+
+ifneq ($(PC_DEVELOPMENT_UDP_PORT),)
+   CFLAGS += -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
+endif
+
+ifeq ($(WHOLE_ARCHIVE_LINK), 1)
+   WHOLE_START := -Wl,--whole-archive
+   WHOLE_END := -Wl,--no-whole-archive
+endif
+CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions
+
+VITA_LIBS := -lSceDisplay_stub -lSceGxm_stub -lSceNet_stub -lSceNetCtl_stub \
+	-lSceSysmodule_stub -lSceCtrl_stub -lSceTouch_stub -lSceAudio_stub \
+	-lScePower_stub -lSceRtc_stub -lSceCommonDialog_stub -lScePgf_stub \
+	-lSceFiber_stub -lSceMotion_stub -lSceAppMgr_stub -lpthread -lpng -lz
+
+LIBS	:= $(WHOLE_START) -lretro_vita $(WHOLE_END) $(VITA_LIBS) -lm -lc
+
+TARGETS := $(TARGET).vpk
+
+DEPFLAGS    = -MT $@ -MMD -MP -MF $*.Tdepend
+POSTCOMPILE = mv -f $*.Tdepend $*.depend
+
+
+all: $(TARGETS)
+
+%.o: %.cpp
+%.o: %.cpp %.depend
+	$(CXX) -c -o $@ $< $(CXXFLAGS) $(INCDIRS) $(DEPFLAGS)
+	$(POSTCOMPILE)
+
+%.o: %.c
+%.o: %.c %.depend
+	$(CC) -c -o $@ $< $(CFLAGS) $(INCDIRS) $(DEPFLAGS)
+	$(POSTCOMPILE)
+
+
+%.o: %.S
+%.o: %.S %.depend
+	$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
+	$(POSTCOMPILE)
+
+%.o: %.s
+%.o: %.s %.depend
+	$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
+	$(POSTCOMPILE)
+
+%.depend: ;
+
+$(TARGET).elf: $(OBJ) libretro_vita.a
+	$(LD) $(OBJ) $(LDFLAGS) $(LIBDIRS) $(LIBS) -o $@
+
+%.velf: %.elf
+	vita-elf-create $< $@
+
+%.self: %.velf
+	vita-make-fself -c -s $< $@
+
+%.vpk: %.self
+	vita-mksfoex -s TITLE_ID=$(VITA_TITLE_ID) "$(VITA_TITLE_NAME)" param.sfo
+	vita-pack-vpk -s param.sfo -b $< $@
+
+clean:
+	rm -f $(OBJ) $(TARGET).elf $(TARGET).velf $(TARGET).self param.sfo $(TARGET).vpk
+	rm -f $(OBJ:.o=.depend)
+
+# Useful for developers
+vpksend: $(TARGET).vpk
+	curl -T $< ftp://$(PSVITAIP):1337/ux0:/
+
+send: $(TARGET).self
+	curl -T $< ftp://$(PSVITAIP):1337/ux0:/app/$(VITA_TITLE_ID)/eboot.bin
+
+.PHONY: clean all send vpksend
+.PRECIOUS: %.depend
+
+-include $(OBJ:.o=.depend)

Makefile.vita.salamander

@@ -0,0 +1,83 @@
+HAVE_FILE_LOGGER  = 0
+DEBUG             = 0
+
+TARGET = retroarchvita_salamander
+TITLE_ID = RETROVITA
+
+ifeq ($(DEBUG), 1)
+   OPTIMIZE_LV	:= -O0 -g
+else
+   OPTIMIZE_LV	:= -O2
+endif
+
+PREFIX  = arm-vita-eabi
+CC      = $(PREFIX)-gcc
+
+INCDIR = libretro-common/include
+CFLAGS = -Wl,-q $(OPTIMIZE_LV) -I$(INCDIR) -std=gnu99 -mfloat-abi=hard -ffast-math -fsingle-precision-constant -mword-relocations
+ASFLAGS = $(CFLAGS)
+
+RARCH_DEFINES = -DVITA -DIS_SALAMANDER -DRARCH_CONSOLE
+
+LIBDIR =
+LDFLAGS =
+LIBS = -lSceDisplay_stub -lSceGxm_stub -lSceNet_stub -lSceNetCtl_stub\
+     -lSceSysmodule_stub -lSceCtrl_stub -lSceAudio_stub -lSceFiber_stub\
+     -lScePower_stub -lSceRtc_stub -lSceCommonDialog_stub -lScePgf_stub \
+     -lSceMotion_stub -lSceAppMgr_stub -lfreetype -lpng -lm -lc
+
+ifeq ($(HAVE_FILE_LOGGER), 1)
+CFLAGS		+= -DHAVE_FILE_LOGGER
+endif
+
+CFLAGS += $(RARCH_DEFINES)
+
+OBJS = frontend/frontend_salamander.o \
+		 frontend/frontend_driver.o \
+		 frontend/drivers/platform_psp.o \
+		 frontend/drivers/platform_null.o \
+		 libretro-common/file/file_path.o \
+		 libretro-common/string/stdstring.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/compat/compat_strcasestr.o \
+		 libretro-common/file/config_file.o \
+		 libretro-common/streams/file_stream.o \
+		 libretro-common/file/retro_stat.o \
+		 libretro-common/hash/rhash.o \
+		 file_path_str.o \
+		 verbosity.o
+
+all: $(TARGET).vpk
+
+%.vpk: eboot.bin
+	vita-mksfoex -s TITLE_ID=$(TITLE_ID) "$(TARGET)" param.sfo
+	vita-pack-vpk -s param.sfo -b eboot.bin $@
+
+eboot.bin: $(TARGET).velf
+	vita-make-fself $< $@
+
+%.velf: %.elf
+	vita-elf-create $< $@
+
+$(TARGET).elf: $(OBJS)
+	$(CC) $(CFLAGS) $^ $(LIBS) -o $@
+
+%.o: %.png
+	$(PREFIX)-ld -r -b binary -o $@ $^
+
+clean:
+	@rm -rf $(TARGET).vpk $(TARGET).velf $(TARGET).elf $(OBJS) \
+		eboot.bin param.sfo
+
+vpksend: $(TARGET).vpk
+	curl -T $(TARGET).vpk ftp://$(PSVITAIP):1337/ux0:/
+	@echo "Sent."
+
+PSVITAIP = 192.168.1.15
+
+send: eboot.bin
+	curl -T eboot.bin ftp://$(PSVITAIP):1337/ux0:/app/$(TITLE_ID)/
+	@echo "Sent."

Makefile.wii.salamander

@@ -53,6 +53,7 @@ OBJ = frontend/frontend_salamander.o \
 		libretro-common/file/retro_dirent.o \
 		libretro-common/file/retro_stat.o \
 		libretro-common/compat/compat_strl.o \
+		libretro-common/compat/compat_strcasestr.o \
 		libretro-common/file/config_file.o \
 		file_path_str.o \
 		verbosity.o \

Makefile.wiiu

@@ -0,0 +1,218 @@
+TARGET		    := retroarch_wiiu
+BUILD_HBL_ELF	     = 1
+BUILD_RPX	     = 1
+DEBUG                = 0
+GRIFFIN_BUILD        = 0
+WHOLE_ARCHIVE_LINK   = 0
+
+PC_DEVELOPMENT_IP_ADDRESS  =
+PC_DEVELOPMENT_TCP_PORT	   =
+
+OBJ :=
+OBJ += wiiu/system/memory.o
+OBJ += wiiu/system/exception_handler.o
+OBJ += wiiu/fs/sd_fat_devoptab.o
+OBJ += wiiu/fs/fs_utils.o
+OBJ += wiiu/tex_shader.o
+OBJ += wiiu/hbl.o
+
+DEFINES :=
+
+ifeq ($(GRIFFIN_BUILD), 1)
+	OBJ += griffin/griffin.o
+	DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_MENU -DHAVE_RGUI -DHAVE_LIBRETRODB
+	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB -DHAVE_CC_RESAMPLER
+#	DEFINES += -DHAVE_XMB -DHAVE_MATERIALUI
+else
+	HAVE_MENU_COMMON = 1
+	HAVE_RTGA = 1
+	HAVE_RPNG = 1
+	HAVE_RJPEG = 1
+	HAVE_RBMP = 1
+	HAVE_RGUI = 1
+	HAVE_ZLIB = 1
+	HAVE_7ZIP = 1
+	HAVE_BUILTINZLIB = 1
+	HAVE_LIBRETRODB = 1
+	HAVE_ZARCH = 0
+	HAVE_MATERIALUI = 0
+	HAVE_XMB = 0
+
+	include Makefile.common
+	BLACKLIST :=
+	BLACKLIST += input/input_overlay.o
+	BLACKLIST += tasks/task_overlay.o
+	OBJ := $(filter-out $(BLACKLIST),$(OBJ))
+
+	OBJ += gfx/drivers/wiiu_gfx.o
+#	OBJ += gfx/drivers_font/wiiu_font.o
+#	OBJ += menu/drivers_display/menu_display_wiiu.o
+	OBJ += input/drivers/wiiu_input.o
+	OBJ += input/drivers_joypad/wiiu_joypad.o
+	OBJ += audio/drivers/wiiu_audio.o
+	OBJ += frontend/drivers/platform_wiiu.o
+	OBJ += gfx/video_filters/2xsai.o
+	OBJ += gfx/video_filters/super2xsai.o
+	OBJ += gfx/video_filters/supereagle.o
+	OBJ += gfx/video_filters/2xbr.o
+	OBJ += gfx/video_filters/darken.o
+	OBJ += gfx/video_filters/epx.o
+	OBJ += gfx/video_filters/scale2x.o
+	OBJ += gfx/video_filters/blargg_ntsc_snes.o
+	OBJ += gfx/video_filters/lq2x.o
+	OBJ += gfx/video_filters/phosphor2x.o
+	OBJ += libretro-common/audio/dsp_filters/echo.o
+	OBJ += libretro-common/audio/dsp_filters/eq.o
+	OBJ += libretro-common/audio/dsp_filters/chorus.o
+	OBJ += libretro-common/audio/dsp_filters/iir.o
+	OBJ += libretro-common/audio/dsp_filters/panning.o
+	OBJ += libretro-common/audio/dsp_filters/phaser.o
+	OBJ += libretro-common/audio/dsp_filters/reverb.o
+	OBJ += libretro-common/audio/dsp_filters/wahwah.o
+endif
+
+
+ifeq ($(strip $(DEVKITPPC)),)
+$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
+endif
+ifeq ($(strip $(DEVKITPRO)),)
+$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitPRO")
+endif
+
+export PATH	  := $(PATH):$(DEVKITPPC)/bin
+
+PREFIX := powerpc-eabi-
+
+CC      := $(PREFIX)gcc
+CXX     := $(PREFIX)g++
+AS      := $(PREFIX)as
+AR      := $(PREFIX)ar
+OBJCOPY := $(PREFIX)objcopy
+STRIP   := $(PREFIX)strip
+NM      := $(PREFIX)nm
+LD      := $(CXX)
+
+ELF2RPL   := wiiu/wut/elf2rpl/elf2rpl
+
+ifneq ($(findstring Linux,$(shell uname -a)),)
+else ifneq ($(findstring Darwin,$(shell uname -a)),)
+else
+   ELF2RPL   := $(ELF2RPL).exe
+endif
+
+
+INCDIRS := -I. -Ideps/zlib -Ideps/7zip -Ilibretro-common/include -Iwiiu -Iwiiu/include -I$(DEVKITPRO)/portlibs/ppc/include
+LIBDIRS := -L. -L$(DEVKITPRO)/portlibs/ppc/lib
+
+CFLAGS  := -mwup -mcpu=750 -meabi -mhard-float
+LDFLAGS :=
+
+ifeq ($(DEBUG), 1)
+   CFLAGS += -O0 -g
+else
+   CFLAGS += -O3
+endif
+LDFLAGS := $(CFLAGS)
+
+ASFLAGS := $(CFLAGS) -mregnames
+
+CFLAGS +=  -ffast-math -Werror=implicit-function-declaration
+#CFLAGS += -fomit-frame-pointer -mword-relocations
+#CFLAGS	+= -Wall
+
+#todo: remove -DWIIU and use the built-in macros instead (HW_WUP or __wiiu__).
+CFLAGS += -DWIIU -DMSB_FIRST
+CFLAGS += -DHAVE_MAIN
+CFLAGS += -DRARCH_INTERNAL -DRARCH_CONSOLE
+CFLAGS += -DHAVE_FILTERS_BUILTIN $(DEFINES)
+
+ifneq ($(PC_DEVELOPMENT_IP_ADDRESS),)
+   CFLAGS += -DPC_DEVELOPMENT_IP_ADDRESS='"$(PC_DEVELOPMENT_IP_ADDRESS)"'
+endif
+
+ifneq ($(PC_DEVELOPMENT_TCP_PORT),)
+   CFLAGS += -DPC_DEVELOPMENT_TCP_PORT=$(PC_DEVELOPMENT_TCP_PORT)
+endif
+
+ifeq ($(WHOLE_ARCHIVE_LINK), 1)
+   WHOLE_START := -Wl,--whole-archive
+   WHOLE_END := -Wl,--no-whole-archive
+endif
+CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions
+
+LDFLAGS  += -Wl,--gc-sections
+
+LIBS	:= $(WHOLE_START) -lretro_wiiu $(WHOLE_END) -lm -lfat -liosuhax
+
+
+RPX_OBJ           = wiiu/system/stubs_rpl.o
+HBL_ELF_OBJ       = wiiu/system/dynamic.o wiiu/system/stubs_elf.o
+
+RPX_LDFLAGS      := -pie -fPIE
+RPX_LDFLAGS      += -z common-page-size=64 -z max-page-size=64
+RPX_LDFLAGS      += -T wiiu/link_rpl.ld
+RPX_LDFLAGS      += -nostartfiles
+
+HBL_ELF_LDFLAGS  := -T wiiu/link_elf.ld
+
+TARGETS :=
+ifeq ($(BUILD_RPX), 1)
+TARGETS += $(TARGET).rpx
+endif
+
+ifeq ($(BUILD_HBL_ELF), 1)
+TARGETS += $(TARGET).elf
+endif
+
+DEPFLAGS    = -MT $@ -MMD -MP -MF $*.Tdepend
+POSTCOMPILE = mv -f $*.Tdepend $*.depend
+
+
+all: $(TARGETS)
+
+%.o: %.cpp
+%.o: %.cpp %.depend
+	$(CXX) -c -o $@ $< $(CXXFLAGS) $(INCDIRS) $(DEPFLAGS)
+	$(POSTCOMPILE)
+
+%.o: %.c
+%.o: %.c %.depend
+	$(CC) -c -o $@ $< $(CFLAGS) $(INCDIRS) $(DEPFLAGS)
+	$(POSTCOMPILE)
+
+
+%.o: %.S
+%.o: %.S %.depend
+	$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
+	$(POSTCOMPILE)
+
+%.o: %.s
+%.o: %.s %.depend
+	$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
+	$(POSTCOMPILE)
+%.a:
+	$(AR) -rc $@ $^
+
+%.depend: ;
+
+
+$(ELF2RPL):
+	$(MAKE) -C wiiu/wut/elf2rpl/
+
+$(TARGET).elf: $(OBJ) $(HBL_ELF_OBJ) libretro_wiiu.a wiiu/link_elf.ld
+	$(LD) $(OBJ) $(HBL_ELF_OBJ) $(LDFLAGS) $(HBL_ELF_LDFLAGS) $(LIBDIRS) $(LIBS) -o $@
+
+$(TARGET).rpx.elf: $(OBJ) $(RPX_OBJ) libretro_wiiu.a wiiu/link_elf.ld
+	$(LD) $(OBJ) $(RPX_OBJ) $(LDFLAGS) $(RPX_LDFLAGS) $(LIBDIRS)  $(LIBS) -o $@
+
+$(TARGET).rpx: $(TARGET).rpx.elf $(ELF2RPL)
+	-$(ELF2RPL) $(TARGET).rpx.elf $@
+
+clean:
+	rm -f $(OBJ) $(RPX_OBJ) $(HBL_ELF_OBJ) $(TARGET).elf $(TARGET).rpx.elf $(TARGET).rpx
+	rm -f $(OBJ:.o=.depend) $(RPX_OBJ:.o=.depend) $(HBL_ELF_OBJ:.o=.depend)
+
+.PHONY: clean all
+.PRECIOUS: %.depend
+
+-include $(OBJ:.o=.depend) $(RPX_OBJ:.o=.depend) $(HBL_ELF_OBJ:.o=.depend)

Makefile.wiiu.salamander

@@ -0,0 +1,176 @@
+TARGET		    := retroarch_wiiu_salamander
+BUILD_HBL_ELF	     = 1
+BUILD_RPX	     = 1
+DEBUG                = 0
+
+PC_DEVELOPMENT_IP_ADDRESS  =
+PC_DEVELOPMENT_TCP_PORT	   =
+
+OBJ :=
+OBJ += wiiu/system/memory.o
+OBJ += wiiu/system/exception_handler.o
+OBJ += wiiu/fs/sd_fat_devoptab.o
+OBJ += wiiu/fs/fs_utils.o
+OBJ += wiiu/hbl.o
+OBJ += frontend/frontend_salamander.o
+OBJ += frontend/frontend_driver.o
+OBJ += frontend/drivers/platform_wiiu.o
+OBJ += frontend/drivers/platform_null.o
+OBJ += libretro-common/compat/compat_strcasestr.o
+OBJ += libretro-common/file/file_path.o
+OBJ += libretro-common/string/stdstring.o
+OBJ += libretro-common/lists/string_list.o
+OBJ += libretro-common/lists/dir_list.o
+OBJ += libretro-common/file/retro_dirent.o
+OBJ += libretro-common/compat/compat_strl.o
+OBJ += libretro-common/file/config_file.o
+OBJ += libretro-common/streams/file_stream.o
+OBJ += libretro-common/file/retro_stat.o
+OBJ += libretro-common/hash/rhash.o
+OBJ += file_path_str.o
+OBJ += verbosity.o
+
+ifeq ($(strip $(DEVKITPPC)),)
+$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
+endif
+ifeq ($(strip $(DEVKITPRO)),)
+$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitPRO")
+endif
+
+export PATH	  := $(PATH):$(DEVKITPPC)/bin
+
+PREFIX := powerpc-eabi-
+
+CC      := $(PREFIX)gcc
+CXX     := $(PREFIX)g++
+AS      := $(PREFIX)as
+AR      := $(PREFIX)ar
+OBJCOPY := $(PREFIX)objcopy
+STRIP   := $(PREFIX)strip
+NM      := $(PREFIX)nm
+LD      := $(CXX)
+
+ELF2RPL   := wiiu/wut/elf2rpl/elf2rpl
+
+ifneq ($(findstring Linux,$(shell uname -a)),)
+else ifneq ($(findstring Darwin,$(shell uname -a)),)
+else
+   ELF2RPL   := $(ELF2RPL).exe
+endif
+
+
+INCDIRS := -I. -Ideps/zlib -Ideps/7zip -Ilibretro-common/include -Iwiiu -Iwiiu/include -I$(DEVKITPRO)/portlibs/ppc/include
+LIBDIRS := -L. -L$(DEVKITPRO)/portlibs/ppc/lib
+
+CFLAGS  := -mwup -mcpu=750 -meabi -mhard-float
+LDFLAGS :=
+
+ifeq ($(DEBUG), 1)
+   CFLAGS += -O0 -g
+else
+   CFLAGS += -O3
+endif
+LDFLAGS := $(CFLAGS)
+
+ASFLAGS := $(CFLAGS) -mregnames
+
+CFLAGS +=  -ffast-math -Werror=implicit-function-declaration
+#CFLAGS += -fomit-frame-pointer -mword-relocations
+#CFLAGS	+= -Wall
+
+#todo: remove -DWIIU and use the built-in macros instead (HW_WUP or __wiiu__).
+CFLAGS += -DWIIU -DMSB_FIRST
+CFLAGS += -DHAVE_MAIN
+CFLAGS += -DRARCH_CONSOLE -DIS_SALAMANDER
+
+ifneq ($(PC_DEVELOPMENT_IP_ADDRESS),)
+   CFLAGS += -DPC_DEVELOPMENT_IP_ADDRESS='"$(PC_DEVELOPMENT_IP_ADDRESS)"'
+endif
+
+ifneq ($(PC_DEVELOPMENT_TCP_PORT),)
+   CFLAGS += -DPC_DEVELOPMENT_TCP_PORT=$(PC_DEVELOPMENT_TCP_PORT)
+endif
+
+ifeq ($(WHOLE_ARCHIVE_LINK), 1)
+   WHOLE_START := -Wl,--whole-archive
+   WHOLE_END := -Wl,--no-whole-archive
+endif
+CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions
+
+LDFLAGS  += -Wl,--gc-sections
+
+LIBS	:= $(WHOLE_START) -lretro_wiiu $(WHOLE_END) -lm -lfat -liosuhax
+
+
+RPX_OBJ           = wiiu/system/stubs_rpl.o
+HBL_ELF_OBJ       = wiiu/system/dynamic.o wiiu/system/stubs_elf.o
+
+RPX_LDFLAGS      := -pie -fPIE
+RPX_LDFLAGS      += -z common-page-size=64 -z max-page-size=64
+RPX_LDFLAGS      += -T wiiu/link_rpl.ld
+RPX_LDFLAGS      += -nostartfiles
+
+HBL_ELF_LDFLAGS  := -T wiiu/link_elf.ld
+
+TARGETS :=
+ifeq ($(BUILD_RPX), 1)
+TARGETS += $(TARGET).rpx
+endif
+
+ifeq ($(BUILD_HBL_ELF), 1)
+TARGETS += $(TARGET).elf
+endif
+
+DEPFLAGS    = -MT $@ -MMD -MP -MF $*.Tdepend
+POSTCOMPILE = mv -f $*.Tdepend $*.depend
+
+
+all: $(TARGETS)
+
+%.o: %.cpp
+%.o: %.cpp %.depend
+	$(CXX) -c -o $@ $< $(CXXFLAGS) $(INCDIRS) $(DEPFLAGS)
+	$(POSTCOMPILE)
+
+%.o: %.c
+%.o: %.c %.depend
+	$(CC) -c -o $@ $< $(CFLAGS) $(INCDIRS) $(DEPFLAGS)
+	$(POSTCOMPILE)
+
+
+%.o: %.S
+%.o: %.S %.depend
+	$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
+	$(POSTCOMPILE)
+
+%.o: %.s
+%.o: %.s %.depend
+	$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
+	$(POSTCOMPILE)
+%.a:
+	$(AR) -rc $@ $^
+
+%.depend: ;
+
+
+$(ELF2RPL):
+	$(MAKE) -C wiiu/wut/elf2rpl/
+
+$(TARGET).elf: $(OBJ) $(HBL_ELF_OBJ) libretro_wiiu.a wiiu/link_elf.ld
+	$(LD) $(OBJ) $(HBL_ELF_OBJ) $(LDFLAGS) $(HBL_ELF_LDFLAGS) $(LIBDIRS) $(LIBS) -o $@
+
+$(TARGET).rpx.elf: $(OBJ) $(RPX_OBJ) libretro_wiiu.a wiiu/link_elf.ld
+	$(LD) $(OBJ) $(RPX_OBJ) $(LDFLAGS) $(RPX_LDFLAGS) $(LIBDIRS)  $(LIBS) -o $@
+
+$(TARGET).rpx: $(TARGET).rpx.elf $(ELF2RPL)
+	-$(ELF2RPL) $(TARGET).rpx.elf $@
+
+clean:
+	rm -f $(OBJ) $(RPX_OBJ) $(HBL_ELF_OBJ) $(TARGET).elf $(TARGET).rpx.elf $(TARGET).rpx
+	rm -f $(OBJ:.o=.depend) $(RPX_OBJ:.o=.depend) $(HBL_ELF_OBJ:.o=.depend)
+
+.PHONY: clean all
+.PRECIOUS: %.depend
+
+-include $(OBJ:.o=.depend) $(RPX_OBJ:.o=.depend) $(HBL_ELF_OBJ:.o=.depend)
+

Makefile.win

@@ -7,7 +7,6 @@ HAVE_OPENGL = 1
 HAVE_FBO = 1
 HAVE_DYLIB = 1
 HAVE_D3D9 = 1
-HAVE_NETPLAY = 1
 HAVE_NETWORKING = 1
 HAVE_STDIN_CMD = 1
 HAVE_COMMAND = 1
@@ -15,7 +14,6 @@ HAVE_THREADS = 1
 HAVE_RGUI = 1
 HAVE_MATERIALUI = 1
 HAVE_7ZIP = 1
-HAVE_ZLIB_DEFLATE = 1
 HAVE_PYTHON = 0
 DYNAMIC = 1
 
@@ -34,6 +32,7 @@ HAVE_CG       := 1
 HAVE_LIBXML2  := 0
 HAVE_ZLIB     := 1
 WANT_ZLIB     := 1
+HAVE_CC_RESAMPLER := 1
 
 ifeq ($(HAVE_CG), 1)
 CG_LIBS          := -lcg -lcgGL

README-mali_fbdev_r4p0.md

@@ -18,7 +18,7 @@ So we will use
 First we will clone and build the kernel:
 git clone https://github.com/mireq/linux-sunxi.git -b sunxi-3.4 --depth 1
 
-Now we edit drivers/video/sunxi/disp/dev_fb.c, and uncoment the line 1074:
+Now we edit drivers/video/sunxi/disp/dev_fb.c, and uncomment the line 1074:
 // Fb_wait_for_vsync(info); 
 
 It is assumed you have a cross-compiler installed, so we configure and build the kernel and modules:

README.md

@@ -1,3 +1,6 @@
+[![Build Status](https://travis-ci.org/libretro/RetroArch.svg?branch=master)](https://travis-ci.org/libretro/RetroArch)
+[![Coverity Scan Build Status](https://scan.coverity.com/projects/8936/badge.svg)](https://scan.coverity.com/projects/retroarch)
+
 # RetroArch
 
 RetroArch is the reference frontend for the libretro API.
@@ -18,11 +21,11 @@ interface to include support for emulators and/or game engines. libretro is comp
 
 ## Binaries
 
-Latest Windows binaries are currently hosted on the buildbot -(http://buildbot.libretro.com/).
+Latest Windows binaries are currently hosted on the [buildbot](http://buildbot.libretro.com/).
 
 ## Support
 
-To reach developers, either make an issue here on Github, make a thread on the [forum](http://www.libretro.com/forums/),
+To reach developers, either make an issue here on GitHub, make a thread on the [forum](http://www.libretro.com/forums/),
 or visit our IRC channel: #retroarch @ irc.freenode.org.
 
 ## Documentation
@@ -51,7 +54,7 @@ RetroArch also emphasizes on being easy to integrate into various launcher front
 
 RetroArch has been ported to the following platforms outside PC:
 
-   - PlayStation3
+   - PlayStation 3
    - Xbox 360 (Libxenon/XeXDK)
    - Xbox 1
    - Wii, Gamecube (Libogc)
@@ -113,10 +116,11 @@ A sample configuration file is installed to /etc/retroarch.cfg. This is the syst
 RetroArch will on startup create a config file in $XDG\_CONFIG\_HOME/retroarch/retroarch.cfg if doesn't exist.
 Users only need to configure a certain option if the desired value deviates from the value defined in config.def.h.
 
-To configure joypads, use the built-in menu or the <tt>retroarch-joyconfig</tt> command-line tool.
+To configure joypads, use the built-in menu or the `retroarch-joyconfig` command-line tool.
 
 ## Compiling and installing
-<b>Linux</b><br/>
+**Linux**
+
 - Prerequisites:
 ```bash
 sudo apt-get install -y make git-core curl g++ pkg-config libglu1-mesa-dev freeglut3-dev mesa-common-dev libsdl1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev
@@ -127,7 +131,8 @@ sudo apt-get install -y make git-core curl g++ pkg-config libglu1-mesa-dev freeg
 make
 ```
 
-<b>Mac</b><br/>
+**Mac**
+
 - Prerequisites: [XCode](https://www.google.com/url?sa=t&rct=j&q=&esrc=s&source=web&cd=1&cad=rja&uact=8&ved=0CB4QFjAA&url=https%3A%2F%2Fitunes.apple.com%2Fus%2Fapp%2Fxcode%2Fid497799835%3Fmt%3D12&ei=ZmfeVNPtIILVoASBnoCYBw&usg=AFQjCNGrxKmVtXUdvUU3MhqZhP4MHT6Gtg&sig2=RIXKsWQ79YTQBt_lK5fdKA&bvm=bv.85970519,d.cGU), [Cg](https://developer.nvidia.com/cg-toolkit-download).
 - You can open the project (**pkg/apple/RetroArch.xcodeproj**) in the Xcode IDE and build (**&#8984;-B**) and run (**&#8984;-R**) it there. Or you can use the command line...
 - Debug:
@@ -145,62 +150,63 @@ xcodebuild -target RetroArch -configuration Release -project pkg/apple/RetroArch
 open ./pkg/apple/build/Release/RetroArch.app/
 ```
 
-<b>PC</b><br/>
+**PC**
+
 Instructions for compiling on PC can be found in the [wiki](https://github.com/Themaister/RetroArch/wiki).
 
-<b>PlayStation3</b><br/>
+**PlayStation 3**
 
 RetroArch PS3 needs to be compiled in the following order:
 
 1) Compile RetroArch Salamander
 
-<tt>make -f Makefile.ps3.salamander</tt>
+    make -f Makefile.ps3.salamander
 
 2) Finally, compile RetroArch packed together with the GUI:
 
-<tt>make -f Makefile.ps3</tt>
+    make -f Makefile.ps3
 
-<b>PlayStation3 - Creating a PKG installable file</b><br />
+**PlayStation 3 - Creating a PKG installable file**
 
 You can add `pkg` as a parameter in order to make a PKG file - for example:
 
-<tt>make -f Makefile.ps3 pkg</tt>
+    make -f Makefile.ps3 pkg
 
 This creates an NPDRM package. This can be installed on debug PS3s.
 
 To make a non-NPDRM package that can be installed on a jailbroken/CFW PS3 (such as PSGroove or PS3 CFWs and other 3.55 CFW derivatives), do:
 
-<tt>make -f Makefile.ps3 pkg-signed</tt>
+    make -f Makefile.ps3 pkg-signed
 
 If you're using Kmeaw 3.55 firmware, the package needs to be signed:
 
-<tt>make -f Makefile.ps3 pkg-signed-cfw</tt>
+    make -f Makefile.ps3 pkg-signed-cfw
 
-NOTE: A pre-existing libretro library needs to be present in the root directory in order to link RetroArch PS3. This file needs to be called <em><b>`libretro_ps3.a`</b></em>.
+NOTE: A pre-existing libretro library needs to be present in the root directory in order to link RetroArch PS3. This file needs to be called ***`libretro_ps3.a`***.
 
-<b> Xbox 360 (XeXDK)</b><br />
+**Xbox 360 (XeXDK)**
 
 You will need Microsoft Visual Studio 2010 installed (or higher) in order to compile RetroArch 360.
 
 The solution file can be found at the following location:
 
-<tt>pkg/msvc-360/RetroArch-360.sln</tt>
+    pkg/msvc-360/RetroArch-360.sln
 
 NOTE: A pre-existing libretro library needs to be present in the `pkg/msvc-360/RetroArch-360/Release` directory in order to link RetroArch 360. This file needs to be
-called <em><b>`libretro_xdk360.lib`</b></em>.
+called ***`libretro_xdk360.lib`***.
 
-<b> Xbox 360 (Libxenon)</b><br />
+**Xbox 360 (Libxenon)**
 
 You will need to have the libxenon libraries and a working Devkit Xenon toolchain installed in order to compile RetroArch 360 Libxenon.
 
-<tt>make -f Makefile.xenon</tt>
+    make -f Makefile.xenon
 
-NOTE: A pre-existing libretro library needs to be present in the root directory in order to link RetroArch 360 Libxenon. This file needs to be called <em><b>`libretro_xenon360.a`</b></em>.
+NOTE: A pre-existing libretro library needs to be present in the root directory in order to link RetroArch 360 Libxenon. This file needs to be called ***`libretro_xenon360.a`***.
 
-<b> Wii</b><br >
+**Wii**
 
 You will need to have the libogc libraries and a working Devkit PPC toolchain installed in order to compile RetroArch Wii.
 
-<tt>make -f Makefile.griffin platform=wii</tt>
+    make -f Makefile.griffin platform=wii
 
-NOTE: A pre-existing libretro library needs to be present in the root directory in order to link RetroArch Wii. This file needs to be called <em><b>`libretro_wii.a`</b></em>.
+NOTE: A pre-existing libretro library needs to be present in the root directory in order to link RetroArch Wii. This file needs to be called ***`libretro_wii.a`***.

audio/audio_driver.h

@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2011-2017 - 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-
@@ -24,9 +24,6 @@
 #include <boolean.h>
 #include <retro_common_api.h>
 
-#include "audio_dsp_filter.h"
-#include "audio_resampler_driver.h"
-
 RETRO_BEGIN_DECLS
 
 #define AUDIO_CHUNK_SIZE_BLOCKING      512
@@ -42,7 +39,8 @@ typedef struct audio_driver
     *
     * Returns: audio driver handle on success, otherwise NULL.
     **/
-   void *(*init)(const char *device, unsigned rate, unsigned latency);
+   void *(*init)(const char *device, unsigned rate,
+         unsigned latency, unsigned block_frames, unsigned *new_rate);
 
    /*
     * @data         : Pointer to audio data handle.
@@ -50,26 +48,57 @@ typedef struct audio_driver
     * @size         : Size of audio buffer.
     *
     * Write samples to audio driver.
-    **/
-   ssize_t (*write)(void *data, const void *buf, size_t size);
+    *
+    * Write data in buffer to audio driver.
+    * A frame here is defined as one combined sample of left and right
+    * channels. (I.e. 44.1kHz, 16-bit stereo has 88.2k samples/s, and
+    * 44.1k frames/s.)
+    *
+    * Samples are interleaved in format LRLRLRLRLR ...
+    * If the driver returns true in use_float(), a floating point
+    * format will be used, with range [-1.0, 1.0].
+    * If not, signed 16-bit samples in native byte ordering will be used.
+    *
+    * This function returns the number of frames successfully written.
+    * If an error occurs, -1 should be returned.
+    * Note that non-blocking behavior that cannot write at this time
+    * should return 0 as returning -1 will terminate the driver.
+    *
+    * Unless said otherwise with set_nonblock_state(), all writes
+    * are blocking, and it should block till it has written all frames.
+    */
+   ssize_t (*write)(void *data, const void *buf, size_t size,
+         bool is_perfcnt_enable);
 
-   /* Stops driver. */
+   /* Temporarily pauses the audio driver. */
    bool (*stop)(void *data);
 
-   /* Starts driver. */
-   bool (*start)(void *data);
+   /* Resumes audio driver from the paused state. */
+   bool (*start)(void *data, bool is_shutdown);
 
    /* Is the audio driver currently running? */
    bool (*alive)(void *data);
 
-   /* Should we care about blocking in audio thread? Fast forwarding. */
+   /* Should we care about blocking in audio thread? Fast forwarding. 
+    *
+    * If state is true, nonblocking operation is assumed.
+    * This is typically used for fast-forwarding. If driver cannot
+    * implement nonblocking writes, this can be disregarded, but should
+    * log a message to stderr.
+    * */
    void (*set_nonblock_state)(void *data, bool toggle);
 
-   /* Frees driver data. */
+   /* Stops and frees driver data. */
    void (*free)(void *data);
 
    /* Defines if driver will take standard floating point samples,
-    * or int16_t samples. */
+    * or int16_t samples. 
+    *
+    * If true is returned, the audio driver is capable of using
+    * floating point data. This will likely increase performance as the
+    * resampler unit uses floating point. The sample range is
+    * [-1.0, 1.0].
+    * */
    bool (*use_float)(void *data);
 
    /* Human-readable identifier. */
@@ -97,16 +126,10 @@ void audio_driver_set_active(void);
 
 void audio_driver_unset_active(void);
 
-bool audio_driver_is_active(void);
-
 void audio_driver_destroy(void);
 
 void audio_driver_deinit_resampler(void);
 
-bool audio_driver_init_resampler(void);
-
-void audio_driver_process_resampler(struct resampler_data *data);
-
 bool audio_driver_free_devices_list(void);
 
 bool audio_driver_new_devices_list(void);
@@ -179,7 +202,7 @@ bool audio_driver_find_driver(void);
 
 bool audio_driver_toggle_mute(void);
 
-bool audio_driver_start(void);
+bool audio_driver_start(bool is_shutdown);
 
 bool audio_driver_stop(void);
 
@@ -211,6 +234,7 @@ extern audio_driver_t audio_coreaudio;
 extern audio_driver_t audio_xenon360;
 extern audio_driver_t audio_ps3;
 extern audio_driver_t audio_gx;
+extern audio_driver_t audio_ax;
 extern audio_driver_t audio_psp;
 extern audio_driver_t audio_ctr_csnd;
 extern audio_driver_t audio_ctr_dsp;

audio/audio_filters/panning.c

@@ -1,96 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *
- *  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 "dspfilter.h"
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-
-struct panning_data
-{
-   float left[2];
-   float right[2];
-};
-
-static void panning_free(void *data)
-{
-   free(data);
-}
-
-static void panning_process(void *data, struct dspfilter_output *output,
-      const struct dspfilter_input *input)
-{
-   unsigned i;
-   float *out;
-   struct panning_data *pan = (struct panning_data*)data;
-
-   output->samples          = input->samples;
-   output->frames           = input->frames;
-   out                      = output->samples;
-
-   for (i = 0; i < input->frames; i++, out += 2)
-   {
-      float left = out[0];
-      float right = out[1];
-      out[0] = left * pan->left[0]  + right * pan->left[1];
-      out[1] = left * pan->right[0] + right * pan->right[1];
-   }
-}
-
-static void *panning_init(const struct dspfilter_info *info,
-      const struct dspfilter_config *config, void *userdata)
-{
-   static const float default_left[] = { 1.0f, 0.0f };
-   static const float default_right[] = { 0.0f, 1.0f };
-   float *left = NULL, *right = NULL;
-   unsigned num_left = 0, num_right = 0;
-   struct panning_data *pan = (struct panning_data*)calloc(1, sizeof(*pan));
-   if (!pan)
-      return NULL;
-
-   config->get_float_array(userdata, "left_mix", &left, &num_left, default_left, 2);
-   config->get_float_array(userdata, "right_mix", &right, &num_right, default_right, 2);
-
-   memcpy(pan->left,  (num_left  == 2) ? left :  default_left,  sizeof(pan->left));
-   memcpy(pan->right, (num_right == 2) ? right : default_right, sizeof(pan->right));
-
-   config->free(left);
-   config->free(right);
-
-   return pan;
-}
-
-static const struct dspfilter_implementation panning = {
-   panning_init,
-   panning_process,
-   panning_free,
-
-   DSPFILTER_API_VERSION,
-   "Panning",
-   "panning",
-};
-
-#ifdef HAVE_FILTERS_BUILTIN
-#define dspfilter_get_implementation panning_dspfilter_get_implementation
-#endif
-
-const struct dspfilter_implementation *dspfilter_get_implementation(dspfilter_simd_mask_t mask)
-{
-   (void)mask;
-   return &panning;
-}
-
-#undef dspfilter_get_implementation
-

audio/audio_thread_wrapper.c

@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2011-2017 - 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-
@@ -21,7 +21,6 @@
 #include <rthreads/rthreads.h>
 
 #include "audio_thread_wrapper.h"
-#include "../performance_counters.h"
 #include "../verbosity.h"
 
 typedef struct audio_thread
@@ -36,14 +35,17 @@ typedef struct audio_thread
    bool stopped;
    bool stopped_ack;
    bool is_paused;
+   bool is_shutdown;
    bool use_float;
 
    int inited;
 
    /* Initialization options. */
    const char *device;
+   unsigned *new_rate;
    unsigned out_rate;
    unsigned latency;
+   unsigned block_frames;
 } audio_thread_t;
 
 static void audio_thread_loop(void *data)
@@ -54,7 +56,8 @@ static void audio_thread_loop(void *data)
       return;
 
    RARCH_LOG("[Audio Thread]: Initializing audio driver.\n");
-   thr->driver_data   = thr->driver->init(thr->device, thr->out_rate, thr->latency);
+   thr->driver_data   = thr->driver->init(thr->device, thr->out_rate, thr->latency, 
+         thr->block_frames, thr->new_rate);
    slock_lock(thr->lock);
    thr->inited        = thr->driver_data ? 1 : -1;
    if (thr->inited > 0 && thr->driver->use_float)
@@ -98,7 +101,7 @@ static void audio_thread_loop(void *data)
 
             scond_wait(thr->cond, thr->lock);
          }
-         thr->driver->start(thr->driver_data);
+         thr->driver->start(thr->driver_data, thr->is_shutdown);
       }
 
       slock_unlock(thr->lock);
@@ -195,7 +198,7 @@ static bool audio_thread_stop(void *data)
    return true;
 }
 
-static bool audio_thread_start(void *data)
+static bool audio_thread_start(void *data, bool is_shutdown)
 {
    audio_thread_t *thr = (audio_thread_t*)data;
 
@@ -204,7 +207,8 @@ static bool audio_thread_start(void *data)
 
    audio_driver_enable_callback();
 
-   thr->is_paused = false;
+   thr->is_paused   = false;
+   thr->is_shutdown = is_shutdown;
    audio_thread_unblock(thr);
 
    return true;
@@ -224,7 +228,8 @@ static bool audio_thread_use_float(void *data)
    return thr->use_float;
 }
 
-static ssize_t audio_thread_write(void *data, const void *buf, size_t size)
+static ssize_t audio_thread_write(void *data, const void *buf, size_t size,
+      bool is_perfcnt_enable)
 {
    ssize_t ret;
    audio_thread_t *thr = (audio_thread_t*)data;
@@ -232,7 +237,8 @@ static ssize_t audio_thread_write(void *data, const void *buf, size_t size)
    if (!thr)
       return 0;
 
-   ret = thr->driver->write(thr->driver_data, buf, size);
+   ret = thr->driver->write(thr->driver_data, buf, size,
+         is_perfcnt_enable);
 
    if (ret < 0)
    {
@@ -277,7 +283,8 @@ static const audio_driver_t audio_thread = {
  **/
 bool audio_init_thread(const audio_driver_t **out_driver,
       void **out_data, const char *device, unsigned audio_out_rate,
-      unsigned latency, const audio_driver_t *drv)
+      unsigned *new_rate, unsigned latency,
+      unsigned block_frames, const audio_driver_t *drv)
 {
    audio_thread_t *thr = (audio_thread_t*)calloc(1, sizeof(*thr));
    if (!thr)
@@ -286,7 +293,9 @@ bool audio_init_thread(const audio_driver_t **out_driver,
    thr->driver         = (const audio_driver_t*)drv;
    thr->device         = device;
    thr->out_rate       = audio_out_rate;
+   thr->new_rate       = new_rate;
    thr->latency        = latency;
+   thr->block_frames   = block_frames;
 
    if (!(thr->cond     = scond_new()))
       goto error;

audio/audio_thread_wrapper.h

@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2011-2017 - 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-
@@ -27,6 +27,7 @@
  * @out_data                  : output audio data
  * @device                    : audio device (optional)
  * @out_rate                  : output audio rate
+ * @new_rate                  : new output audio rate
  * @latency                   : audio latency
  * @driver                    : audio driver
  *
@@ -37,7 +38,8 @@
  * Returns: true (1) if successful, otherwise false (0).
  **/
 bool audio_init_thread(const audio_driver_t **out_driver, void **out_data,
-      const char *device, unsigned out_rate, unsigned latency,
+      const char *device, unsigned out_rate, unsigned *new_rate, unsigned latency,
+      unsigned block_frames,
       const audio_driver_t *driver);
 
 #endif

audio/drivers/alsa.c

@@ -1,5 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2017 - 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-
@@ -16,11 +17,11 @@
 #include <stdlib.h>
 
 #include <lists/string_list.h>
+#include <string/stdstring.h>
 
 #include <alsa/asoundlib.h>
 
 #include "../audio_driver.h"
-#include "../../configuration.h"
 #include "../../verbosity.h"
 
 typedef struct alsa
@@ -53,19 +54,20 @@ static bool find_float_format(snd_pcm_t *pcm, void *data)
    return false;
 }
 
-static void *alsa_init(const char *device, unsigned rate, unsigned latency)
+static void *alsa_init(const char *device, unsigned rate, unsigned latency,
+      unsigned block_frames,
+      unsigned *new_rate)
 {
    snd_pcm_format_t format;
    snd_pcm_uframes_t buffer_size;
-   snd_pcm_hw_params_t *params = NULL;
+   snd_pcm_hw_params_t *params    = NULL;
    snd_pcm_sw_params_t *sw_params = NULL;
-
-   unsigned latency_usec = latency * 1000;
-   unsigned channels = 2;
-   unsigned periods = 4;
-
-   const char *alsa_dev = "default";
-   alsa_t *alsa = (alsa_t*)calloc(1, sizeof(alsa_t));
+   unsigned latency_usec          = latency * 1000;
+   unsigned channels              = 2;
+   unsigned periods               = 4;
+   unsigned orig_rate             = rate;
+   const char *alsa_dev           = "default";
+   alsa_t *alsa                   = (alsa_t*)calloc(1, sizeof(alsa_t));
 
    if (!alsa)
       return NULL;
@@ -96,9 +98,14 @@ static void *alsa_init(const char *device, unsigned rate, unsigned latency)
    if (snd_pcm_hw_params_set_channels(alsa->pcm, params, channels) < 0)
       goto error;
 
-   if (snd_pcm_hw_params_set_rate(alsa->pcm, params, rate, 0) < 0)
+   /* Don't allow rate resampling when probing for the default rate (but ignore if this call fails) */
+   snd_pcm_hw_params_set_rate_resample(alsa->pcm, params, 0 );
+   if (snd_pcm_hw_params_set_rate_near(alsa->pcm, params, &rate, 0) < 0)
       goto error;
 
+   if (rate != orig_rate)
+      *new_rate = rate;
+
    if (snd_pcm_hw_params_set_buffer_time_near(
             alsa->pcm, params, &latency_usec, NULL) < 0)
       goto error;
@@ -166,7 +173,8 @@ error:
    return NULL;
 }
 
-static ssize_t alsa_write(void *data, const void *buf_, size_t size_)
+static ssize_t alsa_write(void *data, const void *buf_, size_t size_,
+      bool is_perfcnt_enable)
 {
    alsa_t *alsa              = (alsa_t*)data;
    const uint8_t *buf        = (const uint8_t*)buf_;
@@ -224,7 +232,7 @@ static ssize_t alsa_write(void *data, const void *buf_, size_t size_)
          return written;
       else if (frames < 0)
       {
-         RARCH_ERR("[ALSA]: Unknown error occured (%s).\n",
+         RARCH_ERR("[ALSA]: Unknown error occurred (%s).\n",
                snd_strerror(frames));
          return -1;
       }
@@ -270,7 +278,7 @@ static void alsa_set_nonblock_state(void *data, bool state)
    alsa->nonblock = state;
 }
 
-static bool alsa_start(void *data)
+static bool alsa_start(void *data, bool is_shutdown)
 {
    alsa_t *alsa = (alsa_t*)data;
 
@@ -356,7 +364,7 @@ static void *alsa_device_list_new(void *data)
       /* description of device IOID - input / output identifcation
        * ("Input" or "Output"), NULL means both) */
 
-      if (!io || !strcmp(io,"Output"))
+      if (!io || string_is_equal(io,"Output"))
          string_list_append(s, name, attr);
 
       if (name)

audio/drivers/alsa_qsa.c

@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2011-2017 - 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-
@@ -19,7 +19,6 @@
 #include <sys/asoundlib.h>
 
 #include "../audio_driver.h"
-#include "../../configuration.h"
 
 #define MAX_FRAG_SIZE 3072
 #define DEFAULT_RATE 48000
@@ -46,14 +45,14 @@ typedef struct alsa
 typedef long snd_pcm_sframes_t;
 
 static void *alsa_qsa_init(const char *device,
-      unsigned rate, unsigned latency)
+      unsigned rate, unsigned latency, unsigned block_frames,
+      unsigned *new_rate)
 {
    int err, card, dev, i;
-   snd_pcm_channel_params_t params = {0};
    snd_pcm_channel_info_t pi;
-   snd_pcm_channel_setup_t setup = {0};
-   settings_t *settings = config_get_ptr();
-   alsa_t *alsa = (alsa_t*)calloc(1, sizeof(alsa_t));
+   snd_pcm_channel_params_t params = {0};
+   snd_pcm_channel_setup_t setup   = {0};
+   alsa_t *alsa                    = (alsa_t*)calloc(1, sizeof(alsa_t));
    if (!alsa)
       return NULL;
 
@@ -122,8 +121,8 @@ static void *alsa_qsa_init(const char *device,
       goto error;
    }
 
-   if (settings->audio.block_frames)
-      alsa->buf_size = settings->audio.block_frames * 4;
+   if (block_frames)
+      alsa->buf_size = block_frames * 4;
    else
       alsa->buf_size = next_pow2(32 * latency);
 
@@ -164,9 +163,9 @@ error:
 
 static int check_pcm_status(void *data, int channel_type)
 {
-   alsa_t *alsa = (alsa_t*)data;
    snd_pcm_channel_status_t status;
-   int ret = EOK;
+   alsa_t *alsa = (alsa_t*)data;
+   int ret      = EOK;
 
    memset(&status, 0, sizeof (status));
    status.channel = channel_type;
@@ -220,7 +219,8 @@ static int check_pcm_status(void *data, int channel_type)
 }
 
 
-static ssize_t alsa_qsa_write(void *data, const void *buf, size_t size)
+static ssize_t alsa_qsa_write(void *data, const void *buf, size_t size,
+      bool is_perfcnt_enable)
 {
    alsa_t              *alsa = (alsa_t*)data;
    snd_pcm_sframes_t written = 0;
@@ -291,7 +291,7 @@ static bool alsa_qsa_alive(void *data)
    return false;
 }
 
-static bool alsa_qsa_start(void *data)
+static bool alsa_qsa_start(void *data, bool is_shutdown)
 {
    alsa_t *alsa = (alsa_t*)data;
 

audio/drivers/alsathread.c

@@ -22,14 +22,13 @@
 
 #include <rthreads/rthreads.h>
 #include <queues/fifo_queue.h>
+#include <string/stdstring.h>
 
 #include "../audio_driver.h"
-#include "../../configuration.h"
 #include "../../verbosity.h"
 
-#define TRY_ALSA(x) if (x < 0) { \
-                  goto error; \
-               }
+#define TRY_ALSA(x) if (x < 0) \
+                  goto error;
 
 typedef struct alsa_thread
 {
@@ -53,8 +52,8 @@ typedef struct alsa_thread
 static void alsa_worker_thread(void *data)
 {
    alsa_thread_t *alsa = (alsa_thread_t*)data;
+   uint8_t        *buf = (uint8_t *)calloc(1, alsa->period_size);
 
-   uint8_t *buf = (uint8_t *)calloc(1, alsa->period_size);
    if (!buf)
    {
       RARCH_ERR("failed to allocate audio buffer");
@@ -92,7 +91,7 @@ static void alsa_worker_thread(void *data)
       }
       else if (frames < 0)
       {
-         RARCH_ERR("[ALSA]: Unknown error occured (%s).\n",
+         RARCH_ERR("[ALSA]: Unknown error occurred (%s).\n",
                snd_strerror(frames));
          break;
       }
@@ -155,21 +154,20 @@ static void alsa_thread_free(void *data)
 }
 
 static void *alsa_thread_init(const char *device,
-      unsigned rate, unsigned latency)
+      unsigned rate, unsigned latency,
+      unsigned block_frames,
+      unsigned *new_rate)
 {
-   alsa_thread_t *alsa = (alsa_thread_t*)calloc(1, sizeof(alsa_thread_t));
-
-   snd_pcm_hw_params_t *params = NULL;
-   snd_pcm_sw_params_t *sw_params = NULL;
-
-   const char *alsa_dev = device ? device : "default";
-
-   unsigned latency_usec = latency * 1000 / 2;
-
-   unsigned channels = 2;
-   unsigned periods = 4;
    snd_pcm_uframes_t buffer_size;
    snd_pcm_format_t format;
+   snd_pcm_hw_params_t *params    = NULL;
+   snd_pcm_sw_params_t *sw_params = NULL;
+   const char *alsa_dev           = device ? device : "default";
+   unsigned latency_usec          = latency * 1000 / 2;
+   unsigned channels              = 2;
+   unsigned periods               = 4;
+   alsa_thread_t            *alsa = (alsa_thread_t*)
+      calloc(1, sizeof(alsa_thread_t));
 
    if (!alsa)
       return NULL;
@@ -245,7 +243,8 @@ error:
    return NULL;
 }
 
-static ssize_t alsa_thread_write(void *data, const void *buf, size_t size)
+static ssize_t alsa_thread_write(void *data, const void *buf, size_t size,
+      bool is_perfcnt_enable)
 {
    alsa_thread_t *alsa = (alsa_thread_t*)data;
 
@@ -286,7 +285,8 @@ static ssize_t alsa_thread_write(void *data, const void *buf, size_t size)
          else
          {
             size_t write_amt = MIN(size - written, avail);
-            fifo_write(alsa->buffer, (const char*)buf + written, write_amt);
+            fifo_write(alsa->buffer,
+                  (const char*)buf + written, write_amt);
             slock_unlock(alsa->fifo_lock);
             written += write_amt;
          }
@@ -318,7 +318,7 @@ static void alsa_thread_set_nonblock_state(void *data, bool state)
    alsa->nonblock = state;
 }
 
-static bool alsa_thread_start(void *data)
+static bool alsa_thread_start(void *data, bool is_shutdown)
 {
    alsa_thread_t *alsa = (alsa_thread_t*)data;
 
@@ -371,7 +371,7 @@ static void *alsa_device_list_new(void *data)
       /* description of device IOID - input / output identifcation
        * ("Input" or "Output"), NULL means both) */
 
-      if (!io || !strcmp(io,"Output"))
+      if (!io || string_is_equal(io,"Output"))
          string_list_append(s, name, attr);
 
       if (name)

audio/drivers/coreaudio.c

@@ -33,23 +33,14 @@
 #include <string/stdstring.h>
 
 #include "../audio_driver.h"
-#include "../../configuration.h"
 #include "../../verbosity.h"
 
-#if defined(__powerpc__) || defined(__ppc__) || defined(__POWERPC__)
-
-#ifndef OSX_PPC
-#define OSX_PPC
-#endif
-
-#endif
-
 typedef struct coreaudio
 {
    slock_t *lock;
    scond_t *cond;
 
-#ifdef OSX_PPC
+#if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
    ComponentInstance dev;
 #else
    AudioComponentInstance dev;
@@ -74,7 +65,7 @@ static void coreaudio_free(void *data)
    if (dev->dev_alive)
    {
       AudioOutputUnitStop(dev->dev);
-#ifdef OSX_PPC
+#if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
       CloseComponent(dev->dev);
 #else
       AudioComponentInstanceDispose(dev->dev);
@@ -95,8 +86,8 @@ static OSStatus audio_write_cb(void *userdata,
       const AudioTimeStamp *time_stamp, UInt32 bus_number,
       UInt32 number_frames, AudioBufferList *io_data)
 {
-   void *outbuf;
    unsigned write_avail;
+   void     *outbuf = NULL;
    coreaudio_t *dev = (coreaudio_t*)userdata;
 
    (void)time_stamp;
@@ -143,35 +134,41 @@ static void coreaudio_interrupt_listener(void *data, UInt32 interrupt_state)
 static void choose_output_device(coreaudio_t *dev, const char* device)
 {
    unsigned i;
-   AudioDeviceID *devices;
-   AudioObjectPropertyAddress propaddr =
-   { 
-      kAudioHardwarePropertyDevices, 
-      kAudioObjectPropertyScopeGlobal, 
-      kAudioObjectPropertyElementMaster 
-   };
+   UInt32 deviceCount;
+   AudioObjectPropertyAddress propaddr;
+   AudioDeviceID *devices              = NULL;
+   UInt32 size                         = 0;
 
-   UInt32 size = 0, deviceCount;
+   propaddr.mSelector = kAudioHardwarePropertyDevices;
+#if MAC_OS_X_VERSION_10_12
+   propaddr.mScope    = kAudioObjectPropertyScopeOutput;
+#else
+   propaddr.mScope    = kAudioObjectPropertyScopeGlobal;
+#endif
+   propaddr.mElement  = kAudioObjectPropertyElementMaster;
 
    if (AudioObjectGetPropertyDataSize(kAudioObjectSystemObject,
             &propaddr, 0, 0, &size) != noErr)
       return;
 
    deviceCount = size / sizeof(AudioDeviceID);
-   devices = (AudioDeviceID*)malloc(size);
+   devices     = (AudioDeviceID*)malloc(size);
 
    if (!devices || AudioObjectGetPropertyData(kAudioObjectSystemObject,
             &propaddr, 0, 0, &size, devices) != noErr)
       goto done;
 
-   propaddr.mScope = kAudioDevicePropertyScopeOutput;
+#if MAC_OS_X_VERSION_10_12
+#else
+   propaddr.mScope    = kAudioDevicePropertyScopeOutput;
+#endif
    propaddr.mSelector = kAudioDevicePropertyDeviceName;
-   size = 1024;
 
    for (i = 0; i < deviceCount; i ++)
    {
       char device_name[1024];
       device_name[0] = 0;
+      size           = 1024;
 
       if (AudioObjectGetPropertyData(devices[i],
                &propaddr, 0, 0, &size, device_name) == noErr 
@@ -189,12 +186,14 @@ done:
 #endif
 
 static void *coreaudio_init(const char *device,
-      unsigned rate, unsigned latency)
+      unsigned rate, unsigned latency,
+      unsigned block_frames,
+      unsigned *new_rate)
 {
    size_t fifo_size;
    UInt32 i_size;
    AudioStreamBasicDescription real_desc;
-#ifdef OSX_PPC
+#if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
    Component comp;
 #else
    AudioComponent comp;
@@ -206,21 +205,19 @@ static void *coreaudio_init(const char *device,
    AudioStreamBasicDescription stream_desc = {0};
    bool component_unavailable              = false;
    static bool session_initialized         = false;
-   coreaudio_t *dev                        = NULL;
-#ifdef OSX_PPC
+#if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
    ComponentDescription desc               = {0};
 #else
    AudioComponentDescription desc          = {0};
 #endif
-   settings_t *settings                    = config_get_ptr();
+   coreaudio_t *dev                        = (coreaudio_t*)
+      calloc(1, sizeof(*dev));
+   if (!dev)
+      return NULL;
 
    (void)session_initialized;
    (void)device;
 
-   dev = (coreaudio_t*)calloc(1, sizeof(*dev));
-   if (!dev)
-      return NULL;
-
    dev->lock = slock_new();
    dev->cond = scond_new();
 
@@ -242,7 +239,7 @@ static void *coreaudio_init(const char *device,
 #endif
    desc.componentManufacturer = kAudioUnitManufacturer_Apple;
 
-#ifdef OSX_PPC
+#if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
    comp = FindNextComponent(NULL, &desc);
 #else
    comp = AudioComponentFindNext(NULL, &desc);
@@ -250,7 +247,7 @@ static void *coreaudio_init(const char *device,
    if (comp == NULL)
       goto error;
    
-#ifdef OSX_PPC
+#if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
    component_unavailable = (OpenAComponent(comp, &dev->dev) != noErr);
 #else
    component_unavailable = (AudioComponentInstanceNew(comp, &dev->dev) != noErr);
@@ -299,7 +296,7 @@ static void *coreaudio_init(const char *device,
 
    RARCH_LOG("[CoreAudio]: Using output sample rate of %.1f Hz\n",
          (float)real_desc.mSampleRate);
-   settings->audio.out_rate = real_desc.mSampleRate;
+   *new_rate = real_desc.mSampleRate;
 
    /* Set channel layout (fails on iOS). */
 #ifndef TARGET_OS_IPHONE
@@ -320,7 +317,7 @@ static void *coreaudio_init(const char *device,
    if (AudioUnitInitialize(dev->dev) != noErr)
       goto error;
 
-   fifo_size = (latency * settings->audio.out_rate) / 1000;
+   fifo_size = (latency * (*new_rate)) / 1000;
    fifo_size *= 2 * sizeof(float);
    dev->buffer_size = fifo_size;
 
@@ -342,11 +339,12 @@ error:
    return NULL;
 }
 
-static ssize_t coreaudio_write(void *data, const void *buf_, size_t size)
+static ssize_t coreaudio_write(void *data, const void *buf_, size_t size,
+      bool is_perfcnt_enable)
 {
-   coreaudio_t *dev = (coreaudio_t*)data;
+   coreaudio_t *dev   = (coreaudio_t*)data;
    const uint8_t *buf = (const uint8_t*)buf_;
-   size_t written = 0;
+   size_t written     = 0;
 
    while (!g_interrupted && size > 0)
    {
@@ -407,7 +405,7 @@ static bool coreaudio_stop(void *data)
    return dev->is_paused ? true : false;
 }
 
-static bool coreaudio_start(void *data)
+static bool coreaudio_start(void *data, bool is_shutdown)
 {
    coreaudio_t *dev = (coreaudio_t*)data;
    if (!dev)

audio/drivers/ctr_csnd_audio.c

@@ -1,5 +1,5 @@
 /*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2014-2016 - Ali Bouhlel
+ *  Copyright (C) 2014-2017 - Ali Bouhlel
  *
  *  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-
@@ -15,11 +15,12 @@
 
 #include <3ds.h>
 #include <string.h>
+#include <malloc.h>
+#include <retro_miscellaneous.h>
 
 #include "../audio_driver.h"
-#include "../../configuration.h"
+
 #include "../../performance_counters.h"
-#include "../../runloop.h"
 
 typedef struct
 {
@@ -48,37 +49,40 @@ typedef struct
 
 static void ctr_csnd_audio_update_playpos(ctr_csnd_audio_t* ctr)
 {
-   uint32_t samples_played;
-   uint64_t current_tick;
+   uint64_t current_tick   = svcGetSystemTick();
+   uint32_t samples_played = (current_tick - ctr->cpu_ticks_last) 
+      / CTR_CSND_CPU_TICKS_PER_SAMPLE;
 
-   current_tick   = svcGetSystemTick();
-   samples_played = (current_tick - ctr->cpu_ticks_last) / CTR_CSND_CPU_TICKS_PER_SAMPLE;
    ctr->playpos   = (ctr->playpos + samples_played) & CTR_CSND_AUDIO_COUNT_MASK;
    ctr->cpu_ticks_last += samples_played * CTR_CSND_CPU_TICKS_PER_SAMPLE;
 }
 
 
-Result csndPlaySound_custom(int chn, u32 flags, float vol, float pan, void* data0, void* data1, u32 size)
+Result csndPlaySound_custom(int chn, u32 flags, float vol, float pan,
+      void* data0, void* data1, u32 size)
 {
-	if (!(csndChannels & BIT(chn)))
-		return 1;
-
-	u32 paddr0 = 0, paddr1 = 0;
-
+	u32 paddr0   = 0;
+   u32 paddr1   = 0;
 	int encoding = (flags >> 12) & 3;
 	int loopMode = (flags >> 10) & 3;
 
-	if (!loopMode) flags |= SOUND_ONE_SHOT;
+	if (!(csndChannels & BIT(chn)))
+		return 1;
+
+	if (!loopMode)
+      flags |= SOUND_ONE_SHOT;
 
 	if (encoding != CSND_ENCODING_PSG)
 	{
-		if (data0) paddr0 = osConvertVirtToPhys(data0);
-		if (data1) paddr1 = osConvertVirtToPhys(data1);
+		if (data0)
+         paddr0 = osConvertVirtToPhys(data0);
+		if (data1)
+         paddr1 = osConvertVirtToPhys(data1);
 
 		if (data0 && encoding == CSND_ENCODING_ADPCM)
 		{
 			int adpcmSample = ((s16*)data0)[-2];
-			int adpcmIndex = ((u8*)data0)[-2];
+			int adpcmIndex  = ((u8*)data0)[-2];
 			CSND_SetAdpcmState(chn, 0, adpcmSample, adpcmIndex);
 		}
 	}
@@ -91,7 +95,8 @@ Result csndPlaySound_custom(int chn, u32 flags, float vol, float pan, void* data
 
 	if (loopMode == CSND_LOOPMODE_NORMAL && paddr1 > paddr0)
 	{
-		// Now that the first block is playing, configure the size of the subsequent blocks
+		/* Now that the first block is playing, 
+       * configure the size of the subsequent blocks */
 		size -= paddr1 - paddr0;
 		CSND_SetBlock(chn, 1, paddr1, size);
 	}
@@ -99,10 +104,11 @@ Result csndPlaySound_custom(int chn, u32 flags, float vol, float pan, void* data
 	return 0;
 }
 
-static void *ctr_csnd_audio_init(const char *device, unsigned rate, unsigned latency)
+static void *ctr_csnd_audio_init(const char *device, unsigned rate, unsigned latency,
+      unsigned block_frames,
+      unsigned *new_rate)
 {
    ctr_csnd_audio_t *ctr = (ctr_csnd_audio_t*)calloc(1, sizeof(ctr_csnd_audio_t));
-   settings_t *settings = config_get_ptr();
 
    if (!ctr)
       return NULL;
@@ -111,7 +117,7 @@ static void *ctr_csnd_audio_init(const char *device, unsigned rate, unsigned lat
    (void)rate;
    (void)latency;
 
-   settings->audio.out_rate  = CTR_CSND_AUDIO_RATE;
+   *new_rate                 = CTR_CSND_AUDIO_RATE;
 
    ctr->l                    = linearAlloc(CTR_CSND_AUDIO_SIZE);
    ctr->r                    = linearAlloc(CTR_CSND_AUDIO_SIZE);
@@ -144,7 +150,9 @@ static void ctr_csnd_audio_free(void *data)
 {
    ctr_csnd_audio_t* ctr = (ctr_csnd_audio_t*)data;
 
-//   csndExit();
+#if 0
+   csndExit();
+#endif
    CSND_SetPlayState(0x8, 0);
    CSND_SetPlayState(0x9, 0);
    csndExecCmds(false);
@@ -155,22 +163,23 @@ static void ctr_csnd_audio_free(void *data)
    free(ctr);
 }
 
-static ssize_t ctr_csnd_audio_write(void *data, const void *buf, size_t size)
+static ssize_t ctr_csnd_audio_write(void *data, const void *buf, size_t size,
+      bool is_perfcnt_enable)
 {
    int i;
-   uint32_t samples_played = 0;
-   uint64_t current_tick   = 0;
+   uint32_t samples_played                     = 0;
+   uint64_t current_tick                       = 0;
    static struct retro_perf_counter ctraudio_f = {0};
-   const uint16_t *src = buf;
-   ctr_csnd_audio_t    *ctr = (ctr_csnd_audio_t*)data;
+   const uint16_t                         *src = buf;
+   ctr_csnd_audio_t                       *ctr = (ctr_csnd_audio_t*)data;
 
    (void)data;
    (void)buf;
    (void)samples_played;
    (void)current_tick;
 
-   performance_counter_init(&ctraudio_f, "ctraudio_f");
-   performance_counter_start(&ctraudio_f);
+   performance_counter_init(ctraudio_f, "ctraudio_f");
+   performance_counter_start_plus(is_perfcnt_enable, ctraudio_f);
 
    ctr_csnd_audio_update_playpos(ctr);
 
@@ -202,7 +211,7 @@ static ssize_t ctr_csnd_audio_write(void *data, const void *buf, size_t size)
    GSPGPU_FlushDataCache(ctr->l, CTR_CSND_AUDIO_SIZE);
    GSPGPU_FlushDataCache(ctr->r, CTR_CSND_AUDIO_SIZE);
 
-   performance_counter_stop(&ctraudio_f);
+   performance_counter_stop_plus(is_perfcnt_enable, ctraudio_f);
 
    return size;
 }
@@ -237,14 +246,13 @@ static bool ctr_csnd_audio_alive(void *data)
    return ctr->playing;
 }
 
-static bool ctr_csnd_audio_start(void *data)
+static bool ctr_csnd_audio_start(void *data, bool is_shutdown)
 {
    ctr_csnd_audio_t* ctr = (ctr_csnd_audio_t*)data;
 
    /* Prevents restarting audio when the menu
     * is toggled off on shutdown */
-
-   if (runloop_ctl(RUNLOOP_CTL_IS_SHUTDOWN, NULL))
+   if (is_shutdown)
       return true;
 
 #if 0

audio/drivers/ctr_dsp_audio.c

@@ -1,5 +1,5 @@
 /*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2014-2016 - Ali Bouhlel
+ *  Copyright (C) 2014-2017 - Ali Bouhlel
  *
  *  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-
@@ -15,11 +15,10 @@
 
 #include <3ds.h>
 #include <string.h>
+#include <malloc.h>
 
 #include "../audio_driver.h"
-#include "../../configuration.h"
 #include "../../performance_counters.h"
-#include "../../runloop.h"
 #include "../../ctr/ctr_debug.h"
 
 typedef struct
@@ -37,10 +36,11 @@ typedef struct
 #define CTR_DSP_AUDIO_SIZE        (CTR_DSP_AUDIO_COUNT * sizeof(int16_t) * 2)
 #define CTR_DSP_AUDIO_SIZE_MASK   (CTR_DSP_AUDIO_SIZE  - 1u)
 
-static void *ctr_dsp_audio_init(const char *device, unsigned rate, unsigned latency)
+static void *ctr_dsp_audio_init(const char *device, unsigned rate, unsigned latency,
+      unsigned block_frames,
+      unsigned *new_rate)
 {
-   ctr_dsp_audio_t *ctr;
-   settings_t *settings = config_get_ptr();
+   ctr_dsp_audio_t *ctr = NULL;
 
    (void)device;
    (void)rate;
@@ -54,12 +54,12 @@ static void *ctr_dsp_audio_init(const char *device, unsigned rate, unsigned late
    if (!ctr)
       return NULL;
 
-   settings->audio.out_rate  = 32730;
+   *new_rate    = 32730;
 
    ctr->channel = 0;
 
    ndspSetOutputMode(NDSP_OUTPUT_STEREO);
-   ndspSetClippingMode(NDSP_CLIP_SOFT); //??
+   ndspSetClippingMode(NDSP_CLIP_SOFT); /* ?? */
    ndspSetOutputCount(1);
    ndspChnReset(ctr->channel);
    ndspChnSetFormat(ctr->channel, NDSP_FORMAT_STEREO_PCM16);
@@ -93,12 +93,13 @@ static void ctr_dsp_audio_free(void *data)
    ndspExit();
 }
 
-static ssize_t ctr_dsp_audio_write(void *data, const void *buf, size_t size)
+static ssize_t ctr_dsp_audio_write(void *data, const void *buf, size_t size,
+      bool is_perfcnt_enable)
 {
-   static struct retro_perf_counter ctraudio_dsp_f = {0};
-   ctr_dsp_audio_t* ctr = (ctr_dsp_audio_t*)data;
    u32 pos;
-   uint32_t sample_pos = ndspChnGetSamplePos(ctr->channel);
+   static struct retro_perf_counter ctraudio_dsp_f = {0};
+   ctr_dsp_audio_t                           * ctr = (ctr_dsp_audio_t*)data;
+   uint32_t sample_pos                             = ndspChnGetSamplePos(ctr->channel);
 
    if((((sample_pos  - ctr->pos) & CTR_DSP_AUDIO_COUNT_MASK) < (CTR_DSP_AUDIO_COUNT >> 2)) ||
       (((ctr->pos - sample_pos ) & CTR_DSP_AUDIO_COUNT_MASK) < (CTR_DSP_AUDIO_COUNT >> 4)) ||
@@ -116,8 +117,8 @@ static ssize_t ctr_dsp_audio_write(void *data, const void *buf, size_t size)
       }
    }
 
-   performance_counter_init(&ctraudio_dsp_f, "ctraudio_dsp_f");
-   performance_counter_start(&ctraudio_dsp_f);
+   performance_counter_init(ctraudio_dsp_f, "ctraudio_dsp_f");
+   performance_counter_start_plus(is_perfcnt_enable, ctraudio_dsp_f);
 
    pos = ctr->pos << 2;
 
@@ -140,7 +141,7 @@ static ssize_t ctr_dsp_audio_write(void *data, const void *buf, size_t size)
    ctr->pos += size >> 2;
    ctr->pos &= CTR_DSP_AUDIO_COUNT_MASK;
 
-   performance_counter_stop(&ctraudio_dsp_f);
+   performance_counter_stop_plus(is_perfcnt_enable, ctraudio_dsp_f);
 
    return size;
 }
@@ -161,14 +162,13 @@ static bool ctr_dsp_audio_alive(void *data)
    return ctr->playing;
 }
 
-static bool ctr_dsp_audio_start(void *data)
+static bool ctr_dsp_audio_start(void *data, bool is_shutdown)
 {
    ctr_dsp_audio_t* ctr = (ctr_dsp_audio_t*)data;
 
    /* Prevents restarting audio when the menu
     * is toggled off on shutdown */
-
-   if (runloop_ctl(RUNLOOP_CTL_IS_SHUTDOWN, NULL))
+   if (is_shutdown)
       return true;
 
    ndspSetMasterVol(1.0);

audio/drivers/dsound.c

@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2011-2017 - 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-
@@ -35,7 +35,6 @@
 #include <queues/fifo_queue.h>
 
 #include "../audio_driver.h"
-#include "../../configuration.h"
 #include "../../verbosity.h"
 
 #ifdef _XBOX
@@ -68,7 +67,8 @@ typedef struct dsound
    volatile bool thread_alive;
 } dsound_t;
 
-static INLINE unsigned write_avail(unsigned read_ptr, unsigned write_ptr, unsigned buffer_size)
+static INLINE unsigned write_avail(unsigned read_ptr,
+      unsigned write_ptr, unsigned buffer_size)
 {
    return (read_ptr + buffer_size - write_ptr) % buffer_size;
 }
@@ -91,8 +91,8 @@ struct audio_lock
 static INLINE bool grab_region(dsound_t *ds, uint32_t write_ptr,
       struct audio_lock *region)
 {
-   const char *err;
-   HRESULT res = IDirectSoundBuffer_Lock(ds->dsb, write_ptr, CHUNK_SIZE, 
+   const char *err = NULL;
+   HRESULT     res = IDirectSoundBuffer_Lock(ds->dsb, write_ptr, CHUNK_SIZE, 
          &region->chunk1, &region->size1, &region->chunk2, &region->size2, 0);
 
    if (res == DSERR_BUFFERLOST)
@@ -132,7 +132,8 @@ static INLINE bool grab_region(dsound_t *ds, uint32_t write_ptr,
 
 static INLINE void release_region(dsound_t *ds, const struct audio_lock *region)
 {
-   IDirectSoundBuffer_Unlock(ds->dsb, region->chunk1, region->size1, region->chunk2, region->size2);
+   IDirectSoundBuffer_Unlock(ds->dsb, region->chunk1,
+         region->size1, region->chunk2, region->size2);
 }
 
 static void dsound_thread(void *data)
@@ -236,8 +237,9 @@ static bool dsound_start_thread(dsound_t *ds)
 
 static void dsound_clear_buffer(dsound_t *ds)
 {
-   void *ptr;
    DWORD size;
+   void *ptr  = NULL;
+
    IDirectSoundBuffer_SetCurrentPosition(ds->dsb, 0);
 
    if (IDirectSoundBuffer_Lock(ds->dsb, 0, 0, &ptr, &size,
@@ -300,7 +302,9 @@ static BOOL CALLBACK enumerate_cb(LPGUID guid, LPCSTR desc, LPCSTR module, LPVOI
    return TRUE;
 }
 
-static void *dsound_init(const char *device, unsigned rate, unsigned latency)
+static void *dsound_init(const char *device, unsigned rate, unsigned latency,
+      unsigned block_frames,
+      unsigned *new_rate)
 {
    WAVEFORMATEX wfx      = {0};
    DSBUFFERDESC bufdesc  = {0};
@@ -377,7 +381,7 @@ static void *dsound_init(const char *device, unsigned rate, unsigned latency)
    return ds;
 
 error:
-   RARCH_ERR("[DirectSound] Error occured in init.\n");
+   RARCH_ERR("[DirectSound] Error occurred in init.\n");
    dsound_free(ds);
    return NULL;
 }
@@ -392,7 +396,7 @@ static bool dsound_stop(void *data)
    return (ds->is_paused) ? true : false;
 }
 
-static bool dsound_start(void *data)
+static bool dsound_start(void *data, bool is_shutdown)
 {
    dsound_t *ds = (dsound_t*)data;
 
@@ -422,10 +426,11 @@ static void dsound_set_nonblock_state(void *data, bool state)
       ds->nonblock = state;
 }
 
-static ssize_t dsound_write(void *data, const void *buf_, size_t size)
+static ssize_t dsound_write(void *data, const void *buf_, size_t size,
+      bool is_perfcnt_enable)
 {
-   size_t written = 0;
-   dsound_t *ds = (dsound_t*)data;
+   size_t     written = 0;
+   dsound_t       *ds = (dsound_t*)data;
    const uint8_t *buf = (const uint8_t*)buf_;
 
    if (!ds->thread_alive)

audio/drivers/gx_audio.c

@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2011-2017 - 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-
@@ -28,7 +28,6 @@
 #include <retro_inline.h>
 
 #include "../audio_driver.h"
-#include "../../configuration.h"
 #include "../../defines/gx_defines.h"
 
 typedef struct
@@ -45,8 +44,8 @@ typedef struct
    bool is_paused;
 } gx_audio_t;
 
-static volatile gx_audio_t *gx_audio_data;
-static volatile bool stop_audio;
+static volatile gx_audio_t *gx_audio_data = NULL;
+static volatile bool stop_audio           = false;
 
 static void dma_callback(void)
 {
@@ -69,9 +68,10 @@ static void dma_callback(void)
 }
 
 static void *gx_audio_init(const char *device,
-      unsigned rate, unsigned latency)
+      unsigned rate, unsigned latency,
+      unsigned block_frames,
+      unsigned *new_rate)
 {
-   settings_t *settings = config_get_ptr();
    gx_audio_t *wa       = (gx_audio_t*)memalign(32, sizeof(*wa));
    if (!wa)
       return NULL;
@@ -86,12 +86,12 @@ static void *gx_audio_init(const char *device,
    if (rate < 33000)
    {
       AISetDSPSampleRate(AI_SAMPLERATE_32KHZ);
-      settings->audio.out_rate = 32000;
+      *new_rate = 32000;
    }
    else
    {
       AISetDSPSampleRate(AI_SAMPLERATE_48KHZ);
-      settings->audio.out_rate = 48000;
+      *new_rate = 48000;
    }
 
    OSInitThreadQueue(&wa->cond);
@@ -116,11 +116,12 @@ static INLINE void copy_swapped(uint32_t * restrict dst,
    }while(--size);
 }
 
-static ssize_t gx_audio_write(void *data, const void *buf_, size_t size)
+static ssize_t gx_audio_write(void *data, const void *buf_, size_t size,
+      bool is_perfcnt_enable)
 {
-   size_t frames = size >> 2;
+   size_t       frames = size >> 2;
    const uint32_t *buf = buf_;
-   gx_audio_t *wa = data;
+   gx_audio_t      *wa = data;
 
    while (frames)
    {
@@ -173,7 +174,7 @@ static void gx_audio_set_nonblock_state(void *data, bool state)
       wa->nonblock = state;
 }
 
-static bool gx_audio_start(void *data)
+static bool gx_audio_start(void *data, bool is_shutdown)
 {
    gx_audio_t *wa = (gx_audio_t*)data;
 

audio/drivers/jack.c

@@ -24,6 +24,7 @@
 #include <jack/ringbuffer.h>
 
 #include <boolean.h>
+#include <retro_assert.h>
 #include <rthreads/rthreads.h>
 
 #include "../audio_driver.h"
@@ -51,7 +52,7 @@ typedef struct jack
 static int process_cb(jack_nframes_t nframes, void *data)
 {
    int i;
-   jack_nframes_t f, avail[2], min_avail;
+   jack_nframes_t avail[2], min_avail;
    jack_t *jd = (jack_t*)data;
 
    if (nframes <= 0)
@@ -62,8 +63,8 @@ static int process_cb(jack_nframes_t nframes, void *data)
       return 0;
    }
 
-   avail[0] = jack_ringbuffer_read_space(jd->buffer[0]);
-   avail[1] = jack_ringbuffer_read_space(jd->buffer[1]);
+   avail[0]  = jack_ringbuffer_read_space(jd->buffer[0]);
+   avail[1]  = jack_ringbuffer_read_space(jd->buffer[1]);
    min_avail = ((avail[0] < avail[1]) ? avail[0] : avail[1]) / sizeof(jack_default_audio_sample_t);
 
    if (min_avail > nframes)
@@ -71,8 +72,10 @@ static int process_cb(jack_nframes_t nframes, void *data)
 
    for (i = 0; i < 2; i++)
    {
+      jack_nframes_t f;
       jack_default_audio_sample_t *out = (jack_default_audio_sample_t*)jack_port_get_buffer(jd->ports[i], nframes);
-      assert(out);
+
+      retro_assert(out);
       jack_ringbuffer_read(jd->buffer[i], (char*)out, min_avail * sizeof(jack_default_audio_sample_t));
 
       for (f = min_avail; f < nframes; f++)
@@ -100,10 +103,11 @@ static void shutdown_cb(void *data)
 static int parse_ports(char **dest_ports, const char **jports)
 {
    int i;
-   char *save = NULL;
-   int parsed = 0;
-   settings_t *settings = config_get_ptr();
-   const char *con = strtok_r(settings->audio.device, ",", &save);
+   char           *save   = NULL;
+   int           parsed   = 0;
+   settings_t *settings   = config_get_ptr();
+   char *audio_device_cpy = strdup(settings->audio.device);
+   const char      *con   = strtok_r(audio_device_cpy, ",", &save);
 
    if (con)
       dest_ports[parsed++] = strdup(con);
@@ -114,15 +118,16 @@ static int parse_ports(char **dest_ports, const char **jports)
    for (i = parsed; i < 2; i++)
       dest_ports[i] = strdup(jports[i]);
 
+   free(audio_device_cpy);
    return 2;
 }
 
-static size_t find_buffersize(jack_t *jd, int latency)
+static size_t find_buffersize(jack_t *jd, int latency, unsigned out_rate)
 {
    jack_latency_range_t range;
-   int i, buffer_frames, min_buffer_frames, jack_latency = 0;
-   settings_t *settings = config_get_ptr();
-   int frames = latency * settings->audio.out_rate / 1000;
+   int i, buffer_frames, min_buffer_frames;
+   int jack_latency     = 0;
+   int           frames = latency * out_rate / 1000;
 
    for (i = 0; i < 2; i++)
    {
@@ -144,15 +149,16 @@ static size_t find_buffersize(jack_t *jd, int latency)
    return buffer_frames * sizeof(jack_default_audio_sample_t);
 }
 
-static void *ja_init(const char *device, unsigned rate, unsigned latency)
+static void *ja_init(const char *device, unsigned rate, unsigned latency,
+      unsigned block_frames,
+      unsigned *new_rate)
 {
    int i;
-   const char **jports = NULL;
    char *dest_ports[2];
-   size_t bufsize = 0;
-   int parsed = 0;
-   settings_t *settings = config_get_ptr();
-   jack_t *jd = (jack_t*)calloc(1, sizeof(jack_t));
+   const char **jports = NULL;
+   size_t       bufsize = 0;
+   int           parsed = 0;
+   jack_t           *jd = (jack_t*)calloc(1, sizeof(jack_t));
 
    if (!jd)
       return NULL;
@@ -166,7 +172,7 @@ static void *ja_init(const char *device, unsigned rate, unsigned latency)
    if (jd->client == NULL)
       goto error;
 
-   settings->audio.out_rate = jack_get_sample_rate(jd->client);
+   *new_rate = jack_get_sample_rate(jd->client);
 
    jack_set_process_callback(jd->client, process_cb, jd);
    jack_on_shutdown(jd->client, shutdown_cb, jd);
@@ -186,7 +192,7 @@ static void *ja_init(const char *device, unsigned rate, unsigned latency)
       goto error;
    }
 
-   bufsize = find_buffersize(jd, latency);
+   bufsize = find_buffersize(jd, latency, *new_rate);
    jd->buffer_size = bufsize;
 
    RARCH_LOG("JACK: Internal buffer size: %d frames.\n", (int)(bufsize / sizeof(jack_default_audio_sample_t)));
@@ -224,6 +230,8 @@ static void *ja_init(const char *device, unsigned rate, unsigned latency)
    return jd;
 
 error:
+   for (i = 0; i < parsed; i++)
+      free(dest_ports[i]);
    if (jports != NULL)
       jack_free(jports);
    free(jd);
@@ -233,10 +241,9 @@ error:
 static size_t write_buffer(jack_t *jd, const float *buf, size_t size)
 {
    int i;
-   size_t j, frames, written = 0;
+   size_t j, written = 0;
    jack_default_audio_sample_t out_deinterleaved_buffer[2][AUDIO_CHUNK_SIZE_NONBLOCKING * AUDIO_MAX_RATIO];
-
-   frames = FRAMES(size);
+   size_t frames = FRAMES(size);
 
    /* Avoid buffer overflow if a DSP plugin generated a huge number of frames. */
    if (frames > AUDIO_CHUNK_SIZE_NONBLOCKING * AUDIO_MAX_RATIO)
@@ -285,7 +292,8 @@ static size_t write_buffer(jack_t *jd, const float *buf, size_t size)
    return written * sizeof(float) * 2;
 }
 
-static ssize_t ja_write(void *data, const void *buf, size_t size)
+static ssize_t ja_write(void *data, const void *buf, size_t size,
+      bool is_perfcnt_enable)
 {
    jack_t *jd = (jack_t*)data;
 
@@ -315,7 +323,7 @@ static void ja_set_nonblock_state(void *data, bool state)
       jd->nonblock = state;
 }
 
-static bool ja_start(void *data)
+static bool ja_start(void *data, bool is_shutdown)
 {
    jack_t *jd = (jack_t*)data;
    if (jd)

audio/drivers/nullaudio.c

@@ -1,5 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2017 - 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-
@@ -16,13 +17,16 @@
 #include "../audio_driver.h"
 #include "../../verbosity.h"
 
-static void *null_audio_init(const char *device, unsigned rate, unsigned latency)
+static void *null_audio_init(const char *device, unsigned rate, unsigned latency,
+      unsigned block_frames,
+      unsigned *new_rate)
 {
    RARCH_ERR("Using the null audio driver. RetroArch will be silent.");
 
    (void)device;
    (void)rate;
    (void)latency;
+   (void)new_rate;
    return (void*)-1;
 }
 
@@ -31,7 +35,8 @@ static void null_audio_free(void *data)
    (void)data;
 }
 
-static ssize_t null_audio_write(void *data, const void *buf, size_t size)
+static ssize_t null_audio_write(void *data, const void *buf, size_t size,
+      bool is_perfcnt_enable)
 {
    (void)data;
    (void)buf;
@@ -51,7 +56,7 @@ static bool null_audio_alive(void *data)
    return true;
 }
 
-static bool null_audio_start(void *data)
+static bool null_audio_start(void *data, bool is_shutdown)
 {
    (void)data;
    return true;

audio/drivers/openal.c

@@ -1,5 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2017 - 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-
@@ -13,6 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
@@ -28,8 +30,9 @@
 #include <windows.h>
 #endif
 
+#include <retro_miscellaneous.h>
+
 #include "../audio_driver.h"
-#include "../../configuration.h"
 #include "../../verbosity.h"
 
 #define BUFSIZE 1024
@@ -78,7 +81,9 @@ static void al_free(void *data)
    free(al);
 }
 
-static void *al_init(const char *device, unsigned rate, unsigned latency)
+static void *al_init(const char *device, unsigned rate, unsigned latency,
+      unsigned block_frames,
+      unsigned *new_rate)
 {
    al_t *al;
 
@@ -168,11 +173,12 @@ static size_t al_fill_internal_buf(al_t *al, const void *buf, size_t size)
    return read_size;
 }
 
-static ssize_t al_write(void *data, const void *buf_, size_t size)
+static ssize_t al_write(void *data, const void *buf_, size_t size,
+      bool is_perfcnt_enable)
 {
-   al_t *al = (al_t*)data;
+   al_t           *al = (al_t*)data;
    const uint8_t *buf = (const uint8_t*)buf_;
-   size_t written = 0;
+   size_t     written = 0;
 
    while (size)
    {
@@ -230,7 +236,7 @@ static void al_set_nonblock_state(void *data, bool state)
       al->nonblock = state;
 }
 
-static bool al_start(void *data)
+static bool al_start(void *data, bool is_shutdown)
 {
    al_t *al = (al_t*)data;
    if (al)

audio/drivers/opensl.c

@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2011-2017 - 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-
@@ -22,7 +22,6 @@
 #include <rthreads/rthreads.h>
 
 #include "../audio_driver.h"
-#include "../../configuration.h"
 
 /* Helper macros, COM-style. */
 #define SLObjectItf_Realize(a, ...) ((*(a))->Realize(a, __VA_ARGS__))
@@ -98,27 +97,22 @@ static void sl_free(void *data)
    free(sl);
 }
 
-static void *sl_init(const char *device, unsigned rate, unsigned latency)
+static void *sl_init(const char *device, unsigned rate, unsigned latency,
+      unsigned block_frames,
+      unsigned *new_rate)
 {
    unsigned i;
-   SLInterfaceID id;
-   SLboolean req;
-   SLresult res;
-   sl_t *sl;
-   SLDataFormat_PCM fmt_pcm = {0};
-   SLDataSource audio_src   = {0};
-   SLDataSink audio_sink    = {0};
+   SLDataFormat_PCM fmt_pcm                        = {0};
+   SLDataSource audio_src                          = {0};
+   SLDataSink audio_sink                           = {0};
    SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {0};
    SLDataLocator_OutputMix loc_outmix              = {0};
-   settings_t *settings = config_get_ptr();
+   SLresult res                                    = 0;
+   SLInterfaceID                                id = SL_IID_ANDROIDSIMPLEBUFFERQUEUE;
+   SLboolean                                req    = SL_BOOLEAN_TRUE;
+   sl_t                                        *sl = (sl_t*)calloc(1, sizeof(sl_t));
 
    (void)device;
-
-   id = SL_IID_ANDROIDSIMPLEBUFFERQUEUE;
-   req    = SL_BOOLEAN_TRUE;
-
-   res = 0;
-   sl = (sl_t*)calloc(1, sizeof(sl_t));
    if (!sl)
       goto error;
 
@@ -131,15 +125,15 @@ static void *sl_init(const char *device, unsigned rate, unsigned latency)
    GOTO_IF_FAIL(SLEngineItf_CreateOutputMix(sl->engine, &sl->output_mix, 0, NULL, NULL));
    GOTO_IF_FAIL(SLObjectItf_Realize(sl->output_mix, SL_BOOLEAN_FALSE));
 
-   if (settings->audio.block_frames)
-      sl->buf_size = settings->audio.block_frames * 4;
+   if (block_frames)
+      sl->buf_size  = block_frames * 4;
    else
-      sl->buf_size = next_pow2(32 * latency);
+      sl->buf_size  = next_pow2(32 * latency);
 
-   sl->buf_count = (latency * 4 * rate + 500) / 1000;
-   sl->buf_count = (sl->buf_count + sl->buf_size / 2) / sl->buf_size;
+   sl->buf_count    = (latency * 4 * rate + 500) / 1000;
+   sl->buf_count    = (sl->buf_count + sl->buf_size / 2) / sl->buf_size;
 
-   sl->buffer = (uint8_t**)calloc(sizeof(uint8_t*), sl->buf_count);
+   sl->buffer       = (uint8_t**)calloc(sizeof(uint8_t*), sl->buf_count);
    if (!sl->buffer)
       goto error;
 
@@ -153,24 +147,24 @@ static void *sl_init(const char *device, unsigned rate, unsigned latency)
    RARCH_LOG("[SLES]: Setting audio latency: Block size = %u, Blocks = %u, Total = %u ...\n",
          sl->buf_size, sl->buf_count, sl->buf_size * sl->buf_count);
 
-   fmt_pcm.formatType    = SL_DATAFORMAT_PCM;
-   fmt_pcm.numChannels   = 2;
-   fmt_pcm.samplesPerSec = rate * 1000; // Samplerate is in milli-Hz.
-   fmt_pcm.bitsPerSample = 16;
-   fmt_pcm.containerSize = 16;
-   fmt_pcm.channelMask   = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
-   fmt_pcm.endianness    = SL_BYTEORDER_LITTLEENDIAN; /* Android only. */
+   fmt_pcm.formatType     = SL_DATAFORMAT_PCM;
+   fmt_pcm.numChannels    = 2;
+   fmt_pcm.samplesPerSec  = rate * 1000; // Samplerate is in milli-Hz.
+   fmt_pcm.bitsPerSample  = 16;
+   fmt_pcm.containerSize  = 16;
+   fmt_pcm.channelMask    = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
+   fmt_pcm.endianness     = SL_BYTEORDER_LITTLEENDIAN; /* Android only. */
 
-   audio_src.pLocator = &loc_bufq;
-   audio_src.pFormat  = &fmt_pcm;
+   audio_src.pLocator     = &loc_bufq;
+   audio_src.pFormat      = &fmt_pcm;
 
-   loc_bufq.locatorType = SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE;
-   loc_bufq.numBuffers  = sl->buf_count;
+   loc_bufq.locatorType   = SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE;
+   loc_bufq.numBuffers    = sl->buf_count;
 
    loc_outmix.locatorType = SL_DATALOCATOR_OUTPUTMIX;
    loc_outmix.outputMix   = sl->output_mix;
 
-   audio_sink.pLocator = &loc_outmix;
+   audio_sink.pLocator    = &loc_outmix;
 
    GOTO_IF_FAIL(SLEngineItf_CreateAudioPlayer(sl->engine, &sl->buffer_queue_object,
             &audio_src, &audio_sink,
@@ -180,14 +174,15 @@ static void *sl_init(const char *device, unsigned rate, unsigned latency)
    GOTO_IF_FAIL(SLObjectItf_GetInterface(sl->buffer_queue_object, SL_IID_ANDROIDSIMPLEBUFFERQUEUE,
             &sl->buffer_queue));
 
-   sl->cond = scond_new();
-   sl->lock = slock_new();
+   sl->cond               = scond_new();
+   sl->lock               = slock_new();
 
    (*sl->buffer_queue)->RegisterCallback(sl->buffer_queue, opensl_callback, sl);
 
    /* Enqueue a bit to get stuff rolling. */
-   sl->buffered_blocks = sl->buf_count;
-   sl->buffer_index = 0;
+   sl->buffered_blocks    = sl->buf_count;
+   sl->buffer_index       = 0;
+
    for (i = 0; i < sl->buf_count; i++)
       (*sl->buffer_queue)->Enqueue(sl->buffer_queue, sl->buffer[i], sl->buf_size);
 
@@ -204,8 +199,10 @@ error:
 
 static bool sl_stop(void *data)
 {
-   sl_t *sl = (sl_t*)data;
-   sl->is_paused = (SLPlayItf_SetPlayState(sl->player, SL_PLAYSTATE_STOPPED) == SL_RESULT_SUCCESS) ? true : false;
+   sl_t      *sl = (sl_t*)data;
+   sl->is_paused = (SLPlayItf_SetPlayState(sl->player, SL_PLAYSTATE_STOPPED) 
+         == SL_RESULT_SUCCESS) ? true : false;
+
    return sl->is_paused ? true : false;
 }
 
@@ -224,18 +221,20 @@ static void sl_set_nonblock_state(void *data, bool state)
       sl->nonblock = state;
 }
 
-static bool sl_start(void *data)
+static bool sl_start(void *data, bool is_shutdown)
 {
-   sl_t *sl = (sl_t*)data;
-   sl->is_paused = (SLPlayItf_SetPlayState(sl->player, SL_PLAYSTATE_PLAYING) == SL_RESULT_SUCCESS) ? false : true;
+   sl_t      *sl = (sl_t*)data;
+   sl->is_paused = (SLPlayItf_SetPlayState(sl->player, SL_PLAYSTATE_PLAYING)
+         == SL_RESULT_SUCCESS) ? false : true;
    return sl->is_paused ? false : true;
 }
 
 
-static ssize_t sl_write(void *data, const void *buf_, size_t size)
+static ssize_t sl_write(void *data, const void *buf_, size_t size,
+      bool is_perfcnt_enable)
 {
-   sl_t *sl = (sl_t*)data;
-   size_t written = 0;
+   sl_t           *sl = (sl_t*)data;
+   size_t     written = 0;
    const uint8_t *buf = (const uint8_t*)buf_;
 
    while (size)
@@ -268,10 +267,10 @@ static ssize_t sl_write(void *data, const void *buf_, size_t size)
 
       if (sl->buffer_ptr >= sl->buf_size)
       {
-         SLresult res = (*sl->buffer_queue)->Enqueue(sl->buffer_queue, sl->buffer[sl->buffer_index], sl->buf_size);
+         SLresult res     = (*sl->buffer_queue)->Enqueue(sl->buffer_queue, sl->buffer[sl->buffer_index], sl->buf_size);
          sl->buffer_index = (sl->buffer_index + 1) % sl->buf_count;
          __sync_fetch_and_add(&sl->buffered_blocks, 1);
-         sl->buffer_ptr = 0;
+         sl->buffer_ptr   = 0;
 
          if (res != SL_RESULT_SUCCESS)
          {

audio/drivers/oss.c

@@ -1,5 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2017 - 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-
@@ -12,6 +13,7 @@
  *  You should have received a copy of the GNU General Public License along with RetroArch.
  *  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <fcntl.h>
@@ -32,7 +34,6 @@
 #endif
 
 #include "../audio_driver.h"
-#include "../../configuration.h"
 #include "../../verbosity.h"
 
 #ifdef HAVE_OSS_BSD
@@ -41,17 +42,17 @@
 #define DEFAULT_OSS_DEV "/dev/dsp"
 #endif
 
-static bool oss_is_paused;
+static bool oss_is_paused = false;
 
-static void *oss_init(const char *device, unsigned rate, unsigned latency)
+static void *oss_init(const char *device, unsigned rate, unsigned latency,
+      unsigned block_frames,
+      unsigned *new_out_rate)
 {
    int frags, frag, channels, format, new_rate;
-   int *fd = (int*)calloc(1, sizeof(int));
-   settings_t *settings = config_get_ptr();
-
+   int              *fd   = (int*)calloc(1, sizeof(int));
    const char *oss_device = device ? device : DEFAULT_OSS_DEV;
    
-   if (fd == NULL)
+   if (!fd)
       return NULL;
 
    if ((*fd = open(oss_device, O_WRONLY)) < 0)
@@ -62,50 +63,42 @@ static void *oss_init(const char *device, unsigned rate, unsigned latency)
    }
 
    frags = (latency * rate * 4) / (1000 * (1 << 10));
-   frag = (frags << 16) | 10;
+   frag  = (frags << 16) | 10;
 
    if (ioctl(*fd, SNDCTL_DSP_SETFRAGMENT, &frag) < 0)
       RARCH_WARN("Cannot set fragment sizes. Latency might not be as expected ...\n");
 
    channels = 2;
-   format = is_little_endian() ? AFMT_S16_LE : AFMT_S16_BE;
+   format   = is_little_endian() ? AFMT_S16_LE : AFMT_S16_BE;
 
    if (ioctl(*fd, SNDCTL_DSP_CHANNELS, &channels) < 0)
-   {
-      close(*fd);
-      free(fd);
-      perror("ioctl");
-      return NULL;
-   }
+      goto error;
 
    if (ioctl(*fd, SNDCTL_DSP_SETFMT, &format) < 0)
-   {
-      close(*fd);
-      free(fd);
-      perror("ioctl");
-      return NULL;
-   }
+      goto error;
 
    new_rate = rate;
 
    if (ioctl(*fd, SNDCTL_DSP_SPEED, &new_rate) < 0)
-   {
-      close(*fd);
-      free(fd);
-      perror("ioctl");
-      return NULL;
-   }
+      goto error;
 
    if (new_rate != (int)rate)
    {
       RARCH_WARN("Requested sample rate not supported. Adjusting output rate to %d Hz.\n", new_rate);
-      settings->audio.out_rate = new_rate;
+      *new_out_rate = new_rate;
    }
 
    return fd;
+
+error:
+   close(*fd);
+   free(fd);
+   perror("ioctl");
+   return NULL;
 }
 
-static ssize_t oss_write(void *data, const void *buf, size_t size)
+static ssize_t oss_write(void *data, const void *buf, size_t size,
+      bool is_perfcnt_enable)
 {
    ssize_t ret;
    int *fd = (int*)data;
@@ -133,7 +126,7 @@ static bool oss_stop(void *data)
    return true;
 }
 
-static bool oss_start(void *data)
+static bool oss_start(void *data, bool is_shutdown)
 {
    (void)data;
    oss_is_paused = false;

audio/drivers/ps3_audio.c

@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2011-2017 - 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-
@@ -20,7 +20,6 @@
 #include <queues/fifo_queue.h>
 
 #include "../audio_driver.h"
-#include "../../configuration.h"
 
 #include "../../defines/ps3_defines.h"
 
@@ -52,7 +51,7 @@ static void event_loop(uint64_t data)
    sys_event_queue_t id;
    sys_ipc_key_t key;
    sys_event_t event;
-   ps3_audio_t *aud = data;
+   ps3_audio_t *aud = (ps3_audio_t*)(uintptr_t)data;
 
    cellAudioCreateNotifyEventQueue(&id, &key);
    cellAudioSetNotifyEventQueue(key);
@@ -78,23 +77,23 @@ static void event_loop(uint64_t data)
 }
 
 static void *ps3_audio_init(const char *device,
-      unsigned rate, unsigned latency)
+      unsigned rate, unsigned latency,
+      unsigned block_frames,
+      unsigned *new_rate)
 {
    CellAudioPortParam params;
-   ps3_audio_t *data = NULL;
+   ps3_audio_t *data = calloc(1, sizeof(*data));
+   if (!data)
+      return NULL;
 
    (void)latency;
    (void)device;
    (void)rate;
 
-   data = calloc(1, sizeof(*data));
-   if (!data)
-      return NULL;
-
    cellAudioInit();
 
    params.numChannels = AUDIO_CHANNELS;
-   params.numBlocks = AUDIO_BLOCKS;
+   params.numBlocks   = AUDIO_BLOCKS;
 #if 0
 #ifdef HAVE_HEADSET
    if(global->console.sound.mode == SOUND_MODE_HEADSET)
@@ -147,7 +146,8 @@ static void *ps3_audio_init(const char *device,
    return data;
 }
 
-static ssize_t ps3_audio_write(void *data, const void *buf, size_t size)
+static ssize_t ps3_audio_write(void *data, const void *buf, size_t size,
+      bool is_perfcnt_enable)
 {
    ps3_audio_t *aud = data;
 
@@ -178,7 +178,7 @@ static bool ps3_audio_stop(void *data)
    return true;
 }
 
-static bool ps3_audio_start(void *data)
+static bool ps3_audio_start(void *data, bool is_shutdown)
 {
    ps3_audio_t *aud = data;
    if (!aud->started)
@@ -210,7 +210,7 @@ static void ps3_audio_free(void *data)
    ps3_audio_t *aud = data;
 
    aud->quit_thread = true;
-   ps3_audio_start(aud);
+   ps3_audio_start(aud, false);
    sys_ppu_thread_join(aud->thread, &val);
 
    ps3_audio_stop(aud);

audio/drivers/psp_audio.c

@@ -1,7 +1,7 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2016 - Daniel De Matteis
- *  Copyright (C) 2014-2016 - Ali Bouhlel
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *  Copyright (C) 2014-2017 - Ali Bouhlel
  *
  *  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-
@@ -17,6 +17,8 @@
 
 #include <stdint.h>
 #include <malloc.h>
+#include <stdio.h>
+#include <string.h>
 
 #ifdef VITA
 #include <psp2/kernel/processmgr.h>
@@ -29,19 +31,26 @@
 #endif
 
 #include "../audio_driver.h"
-#include "../../configuration.h"
 
 typedef struct psp_audio
 {
    bool nonblocking;
+
    uint32_t* buffer;
    uint32_t* zeroBuffer;
+
    SceUID thread;
    int rate;
 
    volatile bool running;
-   volatile uint16_t readPos;
-   volatile uint16_t writePos;
+   volatile uint16_t read_pos;
+   volatile uint16_t write_pos;
+
+#ifdef VITA
+   char lock[32] __attribute__ ((aligned (8)));
+   char cond_lock[32] __attribute__ ((aligned (8)));
+   char cond[32] __attribute__ ((aligned (8)));
+#endif
 } psp_audio_t;
 
 #define AUDIO_OUT_COUNT 512u
@@ -58,48 +67,61 @@ typedef struct psp_audio
 static int audioMainLoop(SceSize args, void* argp)
 {
    psp_audio_t* psp = *((psp_audio_t**)argp);
-
 #ifdef VITA
-   int port = sceAudioOutOpenPort(SCE_AUDIO_OUT_PORT_TYPE_MAIN, AUDIO_OUT_COUNT,
-      psp->rate, SCE_AUDIO_OUT_MODE_STEREO);
+   int port         = sceAudioOutOpenPort(
+         SCE_AUDIO_OUT_PORT_TYPE_MAIN, AUDIO_OUT_COUNT,
+         psp->rate, SCE_AUDIO_OUT_MODE_STEREO);
 #else
    sceAudioSRCChReserve(AUDIO_OUT_COUNT, psp->rate, 2);
 #endif
 
    while (psp->running)
    {
-      /* Get a non-volatile copy. */
-      uint16_t readPos = psp->readPos;
-      bool cond        = ((uint16_t)(psp->writePos - readPos) & AUDIO_BUFFER_SIZE_MASK)
-            < (AUDIO_OUT_COUNT * 2);
+      bool cond           = false;
+      uint16_t read_pos   = psp->read_pos;
+      uint16_t read_pos_2 = psp->read_pos;
 
 #ifdef VITA
-      sceAudioOutOutput(port,
-            cond ? psp->zeroBuffer : (psp->buffer + readPos));
-#else
-      sceAudioSRCOutputBlocking(PSP_AUDIO_VOLUME_MAX, cond ? (psp->zeroBuffer)
-            : (psp->buffer + readPos));
+      sceKernelLockLwMutex((struct SceKernelLwMutexWork*)&psp->lock, 1, 0);
 #endif
 
+      cond                = ((uint16_t)(psp->write_pos - read_pos) & AUDIO_BUFFER_SIZE_MASK)
+            < (AUDIO_OUT_COUNT * 2);
+
+#ifndef VITA
+      sceAudioSRCOutputBlocking(PSP_AUDIO_VOLUME_MAX, cond ? (psp->zeroBuffer)
+            : (psp->buffer + read_pos));
+#endif
       if (!cond)
       {
-         readPos += AUDIO_OUT_COUNT;
-         readPos &= AUDIO_BUFFER_SIZE_MASK;
-         psp->readPos = readPos;
+         read_pos      += AUDIO_OUT_COUNT;
+         read_pos      &= AUDIO_BUFFER_SIZE_MASK;
+         psp->read_pos  = read_pos;
       }
+
+#ifdef VITA
+      sceKernelUnlockLwMutex((struct SceKernelLwMutexWork*)&psp->lock, 1);
+      sceKernelSignalLwCond((struct SceKernelLwCondWork*)&psp->cond);
+
+      sceAudioOutOutput(port,
+        cond ? (psp->zeroBuffer)
+              : (psp->buffer + read_pos_2));
+#endif
    }
 
 #ifdef VITA
    sceAudioOutReleasePort(port);
 #else
    sceAudioSRCChRelease();
-#endif
    sceKernelExitThread(0);
+#endif
    return 0;
 }
 
 static void *psp_audio_init(const char *device,
-      unsigned rate, unsigned latency)
+      unsigned rate, unsigned latency,
+      unsigned block_frames,
+      unsigned *new_rate)
 {
    psp_audio_t *psp = (psp_audio_t*)calloc(1, sizeof(psp_audio_t));
 
@@ -109,27 +131,31 @@ static void *psp_audio_init(const char *device,
    (void)device;
    (void)latency;
 
+
    /* Cache aligned, not necessary but helpful. */
    psp->buffer      = (uint32_t*)
       memalign(64, AUDIO_BUFFER_SIZE * sizeof(uint32_t));
    memset(psp->buffer, 0, AUDIO_BUFFER_SIZE * sizeof(uint32_t));
-
    psp->zeroBuffer  = (uint32_t*)
       memalign(64, AUDIO_OUT_COUNT   * sizeof(uint32_t));
    memset(psp->zeroBuffer, 0, AUDIO_OUT_COUNT * sizeof(uint32_t));
 
-   psp->readPos     = 0;
-   psp->writePos    = 0;
+   psp->read_pos    = 0;
+   psp->write_pos   = 0;
    psp->rate        = rate;
 #if defined(VITA)
+
+   sceKernelCreateLwMutex((struct SceKernelLwMutexWork*)&psp->lock, "audio_get_lock", 0, 0, 0);
+   sceKernelCreateLwMutex((struct SceKernelLwMutexWork*)&psp->cond_lock, "audio_get_cond_lock", 0, 0, 0);
+   sceKernelCreateLwCond((struct SceKernelLwCondWork*)&psp->cond, "audio_get_cond", 0, (struct SceKernelLwMutexWork*)&psp->cond_lock, 0);
    psp->thread      = sceKernelCreateThread
       ("audioMainLoop", audioMainLoop, 0x10000100, 0x10000, 0, 0, NULL);
 #else
    psp->thread      = sceKernelCreateThread
       ("audioMainLoop", audioMainLoop, 0x08, 0x10000, 0, NULL);
 #endif
-   psp->nonblocking = false;
 
+   psp->nonblocking = false;
    psp->running     = true;
    sceKernelStartThread(psp->thread, sizeof(psp_audio_t*), &psp);
 
@@ -146,23 +172,60 @@ static void psp_audio_free(void *data)
    psp->running    = false;
 #if defined(VITA)
    sceKernelWaitThreadEnd(psp->thread, NULL, &timeout);
+   sceKernelDeleteLwMutex((struct SceKernelLwMutexWork*)&psp->lock);
+   sceKernelDeleteLwMutex((struct SceKernelLwMutexWork*)&psp->cond_lock);
+   sceKernelDeleteLwCond((struct SceKernelLwCondWork*)&psp->cond);
 #else
    sceKernelWaitThreadEnd(psp->thread, &timeout);
 #endif
-   sceKernelDeleteThread(psp->thread);
-
    free(psp->buffer);
+   sceKernelDeleteThread(psp->thread);
    free(psp->zeroBuffer);
    free(psp);
 }
 
-static ssize_t psp_audio_write(void *data, const void *buf, size_t size)
+static ssize_t psp_audio_write(void *data, const void *buf, size_t size,
+       bool is_perfcnt_enable)
 {
-   uint16_t sampleCount;
-   psp_audio_t* psp = (psp_audio_t*)data;
-   uint16_t writePos = psp->writePos;
+   psp_audio_t* psp     = (psp_audio_t*)data;
+   uint16_t write_pos   = psp->write_pos;
+   uint16_t sampleCount = size / sizeof(uint32_t);
+
+#ifdef VITA
+   if (psp->nonblocking)
+   {
+      if (AUDIO_BUFFER_SIZE - ((uint16_t)
+            (psp->write_pos - psp->read_pos) & AUDIO_BUFFER_SIZE_MASK) < size)
+         return 0;
+   }
+
+   while (AUDIO_BUFFER_SIZE - ((uint16_t)
+         (psp->write_pos - psp->read_pos) & AUDIO_BUFFER_SIZE_MASK) < size){
+      sceKernelWaitLwCond((struct SceKernelLwCondWork*)&psp->cond, 0);
+   }
+
+   sceKernelLockLwMutex((struct SceKernelLwMutexWork*)&psp->lock, 1, 0);
+
+   if((write_pos + sampleCount) > AUDIO_BUFFER_SIZE)
+   {
+      memcpy(psp->buffer + write_pos, buf,
+            (AUDIO_BUFFER_SIZE - write_pos) * sizeof(uint32_t));
+      memcpy(psp->buffer, (uint32_t*) buf +
+            (AUDIO_BUFFER_SIZE - write_pos),
+            (write_pos + sampleCount - AUDIO_BUFFER_SIZE) * sizeof(uint32_t));
+   }
+   else
+      memcpy(psp->buffer + write_pos, buf, size);
+
+   write_pos      += sampleCount;
+   write_pos      &= AUDIO_BUFFER_SIZE_MASK;
+   psp->write_pos  = write_pos;
+   sceKernelUnlockLwMutex((struct SceKernelLwMutexWork*)&psp->lock, 1);
+
+  return size;
+#else
+
 
-   sampleCount= size / sizeof(uint32_t);
 
 #if 0
    if (psp->nonblocking)
@@ -171,22 +234,23 @@ static ssize_t psp_audio_write(void *data, const void *buf, size_t size)
    }
 #endif
 
-   if((writePos + sampleCount) > AUDIO_BUFFER_SIZE)
+   if((write_pos + sampleCount) > AUDIO_BUFFER_SIZE)
    {
-      memcpy(psp->buffer + writePos, buf,
-            (AUDIO_BUFFER_SIZE - writePos) * sizeof(uint32_t));
+      memcpy(psp->buffer + write_pos, buf,
+            (AUDIO_BUFFER_SIZE - write_pos) * sizeof(uint32_t));
       memcpy(psp->buffer, (uint32_t*) buf +
-            (AUDIO_BUFFER_SIZE - writePos),
-            (writePos + sampleCount - AUDIO_BUFFER_SIZE) * sizeof(uint32_t));
+            (AUDIO_BUFFER_SIZE - write_pos),
+            (write_pos + sampleCount - AUDIO_BUFFER_SIZE) * sizeof(uint32_t));
    }
    else
-      memcpy(psp->buffer + writePos, buf, size);
+      memcpy(psp->buffer + write_pos, buf, size);
 
-   writePos  += sampleCount;
-   writePos  &= AUDIO_BUFFER_SIZE_MASK;
-   psp->writePos = writePos;
+   write_pos  += sampleCount;
+   write_pos  &= AUDIO_BUFFER_SIZE_MASK;
+   psp->write_pos = write_pos;
 
    return sampleCount;
+#endif
 }
 
 static bool psp_audio_alive(void *data)
@@ -219,11 +283,10 @@ static bool psp_audio_stop(void *data)
 #else
    sceKernelWaitThreadEnd(psp->thread, &timeout);
 #endif
-
    return true;
 }
 
-static bool psp_audio_start(void *data)
+static bool psp_audio_start(void *data, bool is_shutdown)
 {
    SceKernelThreadInfo info;
    psp_audio_t* psp = (psp_audio_t*)data;
@@ -259,16 +322,26 @@ static bool psp_audio_use_float(void *data)
 
 static size_t psp_write_avail(void *data)
 {
-   /* TODO */
    psp_audio_t* psp = (psp_audio_t*)data;
+#ifdef VITA
+   size_t val;
+
+   sceKernelLockLwMutex((struct SceKernelLwMutexWork*)&psp->lock, 1, 0);
+   val = AUDIO_BUFFER_SIZE - ((uint16_t)
+         (psp->write_pos - psp->read_pos) & AUDIO_BUFFER_SIZE_MASK);
+   sceKernelUnlockLwMutex((struct SceKernelLwMutexWork*)&psp->lock, 1);
+   return val;
+#else
+   /* TODO */
    return AUDIO_BUFFER_SIZE - ((uint16_t)
-         (psp->writePos - psp->readPos) & AUDIO_BUFFER_SIZE_MASK);
+         (psp->write_pos - psp->read_pos) & AUDIO_BUFFER_SIZE_MASK);
+#endif
 }
 
 static size_t psp_buffer_size(void *data)
 {
    /* TODO */
-   return AUDIO_BUFFER_SIZE;
+   return AUDIO_BUFFER_SIZE /** sizeof(uint32_t)*/;
 }
 
 
@@ -289,5 +362,5 @@ audio_driver_t audio_psp = {
    NULL,
    NULL,
    psp_write_avail,
-   psp_buffer_size,
+   psp_buffer_size
 };

audio/drivers/pulse.c

@@ -1,5 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2017 - 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-
@@ -22,7 +23,6 @@
 #include <retro_endianness.h>
 
 #include "../audio_driver.h"
-#include "../../configuration.h"
 #include "../../verbosity.h"
 
 typedef struct
@@ -125,6 +125,7 @@ static void stream_latency_update_cb(pa_stream *s, void *data)
 
 static void underrun_update_cb(pa_stream *s, void *data)
 {
+#if 0
    pa_t *pa = (pa_t*)data;
 
    (void)s;
@@ -132,6 +133,7 @@ static void underrun_update_cb(pa_stream *s, void *data)
    RARCH_LOG("[PulseAudio]: Underrun (Buffer: %u, Writable size: %u).\n",
          (unsigned)pa->buffer_size,
          (unsigned)pa_stream_writable_size(pa->stream));
+#endif
 }
 
 static void buffer_attr_cb(pa_stream *s, void *data)
@@ -141,19 +143,23 @@ static void buffer_attr_cb(pa_stream *s, void *data)
    if (server_attr)
       pa->buffer_size = server_attr->tlength;
 
+#if 0
    RARCH_LOG("[PulseAudio]: Got new buffer size %u.\n", (unsigned)pa->buffer_size);
+#endif
 }
 
-static void *pulse_init(const char *device, unsigned rate, unsigned latency)
+static void *pulse_init(const char *device, unsigned rate,
+      unsigned latency, 
+      unsigned block_frames,
+      unsigned *new_rate)
 {
-   pa_sample_spec spec;
-   pa_t *pa;
-   pa_buffer_attr buffer_attr = {0};
+   pa_sample_spec               spec;
+   pa_buffer_attr        buffer_attr = {0};
    const pa_buffer_attr *server_attr = NULL;
+   pa_t                          *pa = (pa_t*)calloc(1, sizeof(*pa));
 
    memset(&spec, 0, sizeof(spec));
-   
-   pa = (pa_t*)calloc(1, sizeof(*pa));
+
    if (!pa)
       goto error;
 
@@ -179,11 +185,11 @@ static void *pulse_init(const char *device, unsigned rate, unsigned latency)
    if (pa_context_get_state(pa->context) != PA_CONTEXT_READY)
       goto unlock_error;
 
-   spec.format = is_little_endian() ? PA_SAMPLE_FLOAT32LE : PA_SAMPLE_FLOAT32BE;
+   spec.format   = is_little_endian() ? PA_SAMPLE_FLOAT32LE : PA_SAMPLE_FLOAT32BE;
    spec.channels = 2;
-   spec.rate = rate;
+   spec.rate     = rate;
 
-   pa->stream = pa_stream_new(pa->context, "audio", &spec, NULL);
+   pa->stream    = pa_stream_new(pa->context, "audio", &spec, NULL);
    if (!pa->stream)
       goto unlock_error;
 
@@ -194,12 +200,13 @@ static void *pulse_init(const char *device, unsigned rate, unsigned latency)
    pa_stream_set_buffer_attr_callback(pa->stream, buffer_attr_cb, pa);
 
    buffer_attr.maxlength = -1;
-   buffer_attr.tlength = pa_usec_to_bytes(latency * PA_USEC_PER_MSEC, &spec);
-   buffer_attr.prebuf = -1;
-   buffer_attr.minreq = -1;
-   buffer_attr.fragsize = -1;
+   buffer_attr.tlength   = pa_usec_to_bytes(latency * PA_USEC_PER_MSEC, &spec);
+   buffer_attr.prebuf    = -1;
+   buffer_attr.minreq    = -1;
+   buffer_attr.fragsize  = -1;
 
-   if (pa_stream_connect_playback(pa->stream, NULL, &buffer_attr, PA_STREAM_ADJUST_LATENCY, NULL, NULL) < 0)
+   if (pa_stream_connect_playback(pa->stream, NULL,
+            &buffer_attr, PA_STREAM_ADJUST_LATENCY, NULL, NULL) < 0)
       goto error;
 
    pa_threaded_mainloop_wait(pa->mainloop);
@@ -229,11 +236,12 @@ error:
    return NULL;
 }
 
-static ssize_t pulse_write(void *data, const void *buf_, size_t size)
+static ssize_t pulse_write(void *data, const void *buf_, size_t size,
+      bool is_perfcnt_enable)
 {
-   pa_t *pa = (pa_t*)data;
+   pa_t           *pa = (pa_t*)data;
    const uint8_t *buf = (const uint8_t*)buf_;
-   size_t written = 0;
+   size_t     written = 0;
 
    pa_threaded_mainloop_lock(pa->mainloop);
    while (size)
@@ -284,7 +292,7 @@ static bool pulse_alive(void *data)
    return !pa->is_paused;
 }
 
-static bool pulse_start(void *data)
+static bool pulse_start(void *data, bool is_shutdown)
 {
    bool ret;
    pa_t *pa = (pa_t*)data;

audio/drivers/roar.c

@@ -1,5 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2017 - 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-
@@ -23,7 +24,6 @@
 #include <boolean.h>
 
 #include "../audio_driver.h"
-#include "../../configuration.h"
 #include "../../verbosity.h"
 
 typedef struct
@@ -33,11 +33,12 @@ typedef struct
    bool is_paused;
 } roar_t;
 
-static void *ra_init(const char *device, unsigned rate, unsigned latency)
+static void *ra_init(const char *device, unsigned rate, unsigned latency,
+      unsigned block_frames, unsigned *new_rate)
 {
    int err;
-   roar_vs_t *vss;
-   roar_t *roar = (roar_t*)calloc(1, sizeof(roar_t));
+   roar_vs_t *vss = NULL;
+   roar_t   *roar = (roar_t*)calloc(1, sizeof(roar_t));
 
    if (!roar)
       return NULL;
@@ -57,11 +58,12 @@ static void *ra_init(const char *device, unsigned rate, unsigned latency)
    return roar;
 }
 
-static ssize_t ra_write(void *data, const void *buf, size_t size)
+static ssize_t ra_write(void *data, const void *buf, size_t size,
+      bool is_perfcnt_enable)
 {
    int err;
    size_t written = 0;
-   roar_t *roar = (roar_t*)data;
+   roar_t   *roar = (roar_t*)data;
 
    if (size == 0)
       return 0;
@@ -71,7 +73,8 @@ static ssize_t ra_write(void *data, const void *buf, size_t size)
       ssize_t rc;
       size_t write_amt = size - written;
 
-      if ((rc = roar_vs_write(roar->vss, (const char*)buf + written, write_amt, &err)) < (ssize_t)write_amt)
+      if ((rc = roar_vs_write(roar->vss,
+                  (const char*)buf + written, write_amt, &err)) < (ssize_t)write_amt)
       {
          if (roar->nonblocking)
             return rc;
@@ -108,7 +111,7 @@ static void ra_set_nonblock_state(void *data, bool state)
    roar->nonblocking = state;
 }
 
-static bool ra_start(void *data)
+static bool ra_start(void *data, bool is_shutdown)
 {
    roar_t *roar = (roar_t*)data;
    if (roar)

audio/drivers/rsound.c

@@ -1,5 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2017 - 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-
@@ -55,28 +56,26 @@ static void err_cb(void *userdata)
    scond_signal(rsd->cond);
 }
 
-static void *rs_init(const char *device, unsigned rate, unsigned latency)
+static void *rs_init(const char *device, unsigned rate, unsigned latency,
+      unsigned block_frames,
+      unsigned *new_rate)
 {
    int channels, format;
-   rsd_t *rsd = (rsd_t*)calloc(1, sizeof(rsd_t));
+   rsound_t *rd  = NULL;
+   rsd_t *rsd    = (rsd_t*)calloc(1, sizeof(rsd_t));
    if (!rsd)
       return NULL;
 
-   rsound_t *rd;
-
    if (rsd_init(&rd) < 0)
-   {
-      free(rsd);
-      return NULL;
-   }
+      goto error;
 
    rsd->cond_lock = slock_new();
-   rsd->cond = scond_new();
+   rsd->cond      = scond_new();
 
-   rsd->buffer = fifo_new(1024 * 4);
+   rsd->buffer    = fifo_new(1024 * 4);
 
-   channels = 2;
-   format   = RSD_S16_NE;
+   channels       = 2;
+   format         = RSD_S16_NE;
 
    rsd_set_param(rd, RSD_CHANNELS, &channels);
    rsd_set_param(rd, RSD_SAMPLERATE, &rate);
@@ -92,15 +91,19 @@ static void *rs_init(const char *device, unsigned rate, unsigned latency)
    if (rsd_start(rd) < 0)
    {
       free(rsd);
-      rsd_free(rd);
-      return NULL;
+      goto error;
    }
 
    rsd->rd = rd;
    return rsd;
+
+error:
+   rsd_free(rd);
+   return NULL;
 }
 
-static ssize_t rs_write(void *data, const void *buf, size_t size)
+static ssize_t rs_write(void *data, const void *buf, size_t size,
+      bool is_perfcnt_enable)
 {
    rsd_t *rsd = (rsd_t*)data;
 
@@ -175,7 +178,7 @@ static bool rs_alive(void *data)
    return false;
 }
 
-static bool rs_start(void *data)
+static bool rs_start(void *data, bool is_shutdown)
 {
    rsd_t *rsd = (rsd_t*)data;
    if (rsd_start(rsd->rd) < 0)
@@ -201,12 +204,13 @@ static void rs_free(void *data)
 
 static size_t rs_write_avail(void *data)
 {
+   size_t val;
    rsd_t *rsd = (rsd_t*)data;
 
    if (rsd->has_error)
       return 0;
    rsd_callback_lock(rsd->rd);
-   size_t val = fifo_write_avail(rsd->buffer);
+   val = fifo_write_avail(rsd->buffer);
    rsd_callback_unlock(rsd->rd);
    return val;
 }

audio/drivers/rwebaudio.c

@@ -1,5 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2015 - Michael Lelli
+ *  Copyright (C) 2011-2017 - 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-
@@ -18,7 +19,6 @@
 #include <boolean.h>
 
 #include "../audio_driver.h"
-#include "../../configuration.h"
 
 /* forward declarations */
 unsigned RWebAudioSampleRate(void);
@@ -37,20 +37,22 @@ static void rwebaudio_free(void *data)
    RWebAudioFree();
 }
 
-static void *rwebaudio_init(const char *device, unsigned rate, unsigned latency)
+static void *rwebaudio_init(const char *device, unsigned rate, unsigned latency,
+      unsigned block_frames,
+      unsigned *new_rate)
 {
-   settings_t *settings = config_get_ptr();
    void *data           = RWebAudioInit(latency);
 
    (void)device;
    (void)rate;
 
    if (data)
-      settings->audio.out_rate = RWebAudioSampleRate();
+      *new_rate         = RWebAudioSampleRate();
    return data;
 }
 
-static ssize_t rwebaudio_write(void *data, const void *buf, size_t size)
+static ssize_t rwebaudio_write(void *data, const void *buf, size_t size,
+      bool is_perfcnt_enable)
 {
    (void)data;
    return RWebAudioWrite(buf, size);
@@ -75,19 +77,13 @@ static bool rwebaudio_alive(void *data)
    return !rwebaudio_is_paused;
 }
 
-static bool rwebaudio_start(void *data)
+static bool rwebaudio_start(void *data, bool is_shutdown)
 {
    (void)data;
    rwebaudio_is_paused = false;
    return RWebAudioStart();
 }
 
-static bool rwebaudio_use_float(void *data)
-{
-   (void)data;
-   return true;
-}
-
 static size_t rwebaudio_write_avail(void *data)
 {
    (void)data;
@@ -100,6 +96,12 @@ static size_t rwebaudio_buffer_size(void *data)
    return RWebAudioBufferSize();
 }
 
+   static bool rwebaudio_use_float(void *data)
+{
+   (void)data;
+   return true;
+}
+
 audio_driver_t audio_rwebaudio = {
    rwebaudio_init,
    rwebaudio_write,

audio/drivers/sdl_audio.c

@@ -1,5 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2017 - 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-
@@ -27,7 +28,6 @@
 #include <retro_inline.h>
 
 #include "../audio_driver.h"
-#include "../../configuration.h"
 #include "../../verbosity.h"
 
 typedef struct sdl_audio
@@ -44,8 +44,8 @@ typedef struct sdl_audio
 
 static void sdl_audio_cb(void *data, Uint8 *stream, int len)
 {
-   sdl_audio_t *sdl = (sdl_audio_t*)data;
-   size_t avail = fifo_read_avail(sdl->buffer);
+   sdl_audio_t  *sdl = (sdl_audio_t*)data;
+   size_t      avail = fifo_read_avail(sdl->buffer);
    size_t write_size = len > (int)avail ? avail : len;
 
    fifo_read(sdl->buffer, stream, write_size);
@@ -67,14 +67,15 @@ static INLINE int find_num_frames(int rate, int latency)
 }
 
 static void *sdl_audio_init(const char *device,
-      unsigned rate, unsigned latency)
+      unsigned rate, unsigned latency,
+      unsigned block_frames,
+      unsigned *new_rate)
 {
    int frames;
    size_t bufsize;
-   void *tmp;
    SDL_AudioSpec out;
-   SDL_AudioSpec spec = {0};
-   settings_t *settings = config_get_ptr();
+   SDL_AudioSpec spec   = {0};
+   void            *tmp = NULL;
    sdl_audio_t *sdl     = NULL;
 
    (void)device;
@@ -97,10 +98,10 @@ static void *sdl_audio_init(const char *device,
     * SDL double buffers audio and we do as well. */
    frames = find_num_frames(rate, latency / 4);
 
-   spec.freq = rate;
-   spec.format = AUDIO_S16SYS;
+   spec.freq     = rate;
+   spec.format   = AUDIO_S16SYS;
    spec.channels = 2;
-   spec.samples = frames; /* This is in audio frames, not samples ... :( */
+   spec.samples  = frames; /* This is in audio frames, not samples ... :( */
    spec.callback = sdl_audio_cb;
    spec.userdata = sdl;
 
@@ -111,19 +112,19 @@ static void *sdl_audio_init(const char *device,
       return 0;
    }
 
-   settings->audio.out_rate = out.freq;
+   *new_rate                = out.freq;
 
 #ifdef HAVE_THREADS
-   sdl->lock = slock_new();
-   sdl->cond = scond_new();
+   sdl->lock                = slock_new();
+   sdl->cond                = scond_new();
 #endif
 
    RARCH_LOG("SDL audio: Requested %u ms latency, got %d ms\n", 
-         latency, (int)(out.samples * 4 * 1000 / settings->audio.out_rate));
+         latency, (int)(out.samples * 4 * 1000 / (*new_rate)));
 
    /* Create a buffer twice as big as needed and prefill the buffer. */
-   bufsize = out.samples * 4 * sizeof(int16_t);
-   tmp = calloc(1, bufsize);
+   bufsize     = out.samples * 4 * sizeof(int16_t);
+   tmp         = calloc(1, bufsize);
    sdl->buffer = fifo_new(bufsize);
 
    if (tmp)
@@ -136,7 +137,8 @@ static void *sdl_audio_init(const char *device,
    return sdl;
 }
 
-static ssize_t sdl_audio_write(void *data, const void *buf, size_t size)
+static ssize_t sdl_audio_write(void *data, const void *buf, size_t size,
+      bool is_perfcnt_enable)
 {
    ssize_t ret = 0;
    sdl_audio_t *sdl = (sdl_audio_t*)data;
@@ -202,7 +204,7 @@ static bool sdl_audio_alive(void *data)
    return !sdl->is_paused;
 }
 
-static bool sdl_audio_start(void *data)
+static bool sdl_audio_start(void *data, bool is_shutdown)
 {
    sdl_audio_t *sdl = (sdl_audio_t*)data;
    sdl->is_paused = false;

audio/drivers/wiiu_audio.c

@@ -0,0 +1,347 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2014-2017 - Ali Bouhlel
+ *  Copyright (C) 2016-2017 - FIX94
+ *
+ *  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 <string.h>
+#include <malloc.h>
+#include <stdint.h>
+
+#include <wiiu/os.h>
+#include <wiiu/ax.h>
+
+#include "wiiu/wiiu_dbg.h"
+#include "wiiu/system/memory.h"
+
+#include "audio/audio_driver.h"
+#include "performance_counters.h"
+
+typedef struct
+{
+   AXMVoice* mvoice;
+   uint16_t* buffer_l;
+   uint16_t* buffer_r;
+   bool nonblocking;
+
+   uint32_t pos;
+   uint32_t written;
+   OSSpinLock spinlock;
+} ax_audio_t;
+
+/* 3072 samples main buffer, 64ms total */
+#define AX_AUDIO_COUNT              3072
+#define AX_AUDIO_SIZE               (AX_AUDIO_COUNT << 1u)
+
+#define AX_AUDIO_SAMPLE_COUNT       144                         /* 3ms */
+#define AX_AUDIO_SAMPLE_MIN         (AX_AUDIO_SAMPLE_COUNT * 3) /* 9ms */
+#define AX_AUDIO_SAMPLE_LOAD        (AX_AUDIO_SAMPLE_COUNT * 10)/* 30ms */
+#define AX_AUDIO_MAX_FREE           (AX_AUDIO_COUNT - (AX_AUDIO_SAMPLE_COUNT * 2))
+#define AX_AUDIO_RATE               48000
+
+#if 0
+#define ax_audio_ticks_to_samples(ticks)     (((ticks) * 64) / 82875)
+#define ax_audio_samples_to_ticks(samples)   (((samples) * 82875) / 64)
+#endif
+
+static volatile ax_audio_t *wiiu_cb_ax = NULL;
+void wiiu_ax_callback(void)
+{
+   /*possibly called before unregister */
+   if(wiiu_cb_ax == NULL)
+      return;
+
+   ax_audio_t *ax = (ax_audio_t*)wiiu_cb_ax;
+   if(AXIsMultiVoiceRunning(ax->mvoice))
+   {
+      if(OSUninterruptibleSpinLock_Acquire(&ax->spinlock))
+      {
+         /* Buffer underrun, stop playback to let it fill up */
+         if(ax->written < AX_AUDIO_SAMPLE_MIN)
+            AXSetMultiVoiceState(ax->mvoice, AX_VOICE_STATE_STOPPED);
+         ax->written -= AX_AUDIO_SAMPLE_COUNT;
+         OSUninterruptibleSpinLock_Release(&ax->spinlock);
+      }
+   }
+}
+
+extern void AXRegisterFrameCallback(void *cb);
+
+static void* ax_audio_init(const char* device, unsigned rate, unsigned latency,
+      unsigned block_frames,
+      unsigned *new_rate)
+{
+   AXVoiceOffsets offsets[2];
+   u16 setup_buf[0x30] = {0};
+   setup_buf[0x25]     = 2; /* we request 2 channels */
+   AXInitParams init   = {AX_INIT_RENDERER_48KHZ, 0, 0};
+   AXVoiceVeData ve    = {0xF000, 0};
+   ax_audio_t* ax      = (ax_audio_t*)calloc(1, sizeof(ax_audio_t));
+
+   if (!ax)
+      return NULL;
+
+   AXInitWithParams(&init);
+
+   AXAcquireMultiVoice(31, NULL, 0, setup_buf, &ax->mvoice);
+
+   if (!ax->mvoice || ax->mvoice->channels != 2)
+   {
+      free(ax);
+      return NULL;
+   }
+
+   ax->buffer_l               = MEM1_alloc(AX_AUDIO_SIZE, 0x100);
+   ax->buffer_r              = MEM1_alloc(AX_AUDIO_SIZE, 0x100);
+   memset(ax->buffer_l,0,AX_AUDIO_SIZE);
+   memset(ax->buffer_r,0,AX_AUDIO_SIZE);
+   DCFlushRange(ax->buffer_l,AX_AUDIO_SIZE);
+   DCFlushRange(ax->buffer_r,AX_AUDIO_SIZE);
+
+   /* shared by both voices */
+   offsets[0].currentOffset  = 0;
+   offsets[0].loopOffset     = 0;
+   offsets[0].endOffset      = AX_AUDIO_COUNT - 1;
+   offsets[0].loopingEnabled = AX_VOICE_LOOP_ENABLED;
+   offsets[0].dataType       = AX_VOICE_FORMAT_LPCM16;
+   memcpy(&offsets[1], &offsets[0], sizeof(AXVoiceOffsets));
+
+   /* different buffers per voice */
+   offsets[0].data           = ax->buffer_l;
+   offsets[1].data           = ax->buffer_r;
+   AXSetMultiVoiceOffsets(ax->mvoice, offsets);
+
+   AXSetMultiVoiceSrcType(ax->mvoice, AX_VOICE_SRC_TYPE_NONE);
+   AXSetMultiVoiceSrcRatio(ax->mvoice, 1.0f);
+
+   AXSetMultiVoiceVe(ax->mvoice, &ve);
+
+   AXSetMultiVoiceDeviceMix(ax->mvoice, AX_DEVICE_TYPE_DRC, 0, 0, 0x8000, 0);
+   AXSetMultiVoiceDeviceMix(ax->mvoice, AX_DEVICE_TYPE_TV, 0, 0, 0x8000, 0);
+
+   AXSetMultiVoiceState(ax->mvoice, AX_VOICE_STATE_STOPPED);
+
+   ax->pos                   = 0;
+   ax->written               = 0;
+   *new_rate                 = AX_AUDIO_RATE;
+
+   OSInitSpinLock(&ax->spinlock);
+
+   wiiu_cb_ax                = ax;
+   AXRegisterFrameCallback(wiiu_ax_callback);
+
+   return ax;
+}
+
+static void ax_audio_free(void* data)
+{
+   ax_audio_t* ax = (ax_audio_t*)data;
+   wiiu_cb_ax     = NULL;
+
+   AXRegisterFrameCallback(NULL);
+   AXFreeMultiVoice(ax->mvoice);
+   AXQuit();
+
+   MEM1_free(ax->buffer_l);
+   MEM1_free(ax->buffer_r);
+   free(ax);
+}
+
+static bool ax_audio_stop(void* data)
+{
+   ax_audio_t* ax = (ax_audio_t*)data;
+
+   AXSetMultiVoiceState(ax->mvoice, AX_VOICE_STATE_STOPPED);
+   return true;
+}
+
+static int ax_audio_limit(int in)
+{
+	if(in < 0)
+		in += AX_AUDIO_COUNT;
+	else if(in >= AX_AUDIO_COUNT)
+		in -= AX_AUDIO_COUNT;
+	return in;
+}
+
+static bool ax_audio_start(void* data, bool is_shutdown)
+{
+   ax_audio_t* ax = (ax_audio_t*)data;
+
+   /* Prevents restarting audio when the menu
+    * is toggled off on shutdown */
+   if (is_shutdown)
+      return true;
+
+   /* Set back to playing on enough buffered data */
+   if(ax->written > AX_AUDIO_SAMPLE_LOAD)
+   {
+      AXSetMultiVoiceCurrentOffset(ax->mvoice, ax_audio_limit(ax->pos - ax->written));
+      AXSetMultiVoiceState(ax->mvoice, AX_VOICE_STATE_PLAYING);
+   }
+   return true;
+}
+
+static ssize_t ax_audio_write(void* data, const void* buf, size_t size,
+      bool is_perfcnt_enable)
+{
+   int i;
+   static struct retro_perf_counter ax_audio_write_perf = {0};
+   size_t countAvail   = 0;
+   ax_audio_t* ax      = (ax_audio_t*)data;
+   const uint16_t* src = buf;
+   int count           = size >> 2;
+
+   if(!size || (size & 0x3))
+      return 0;
+
+   /* Measure copy performance from here */
+   performance_counter_init(ax_audio_write_perf, "ax_audio_write");
+   performance_counter_start_plus(is_perfcnt_enable, ax_audio_write_perf);
+
+   if(count > AX_AUDIO_MAX_FREE)
+      count = AX_AUDIO_MAX_FREE;
+
+   countAvail = ((ax->written > AX_AUDIO_MAX_FREE) ? 0 : (AX_AUDIO_MAX_FREE - ax->written));
+
+   if (ax->nonblocking)
+   {
+      /* Not enough available for 3ms of data */
+      if(countAvail < AX_AUDIO_SAMPLE_COUNT)
+         count = 0;
+   }
+   else if(countAvail < count)
+   {
+      /* Sync, wait for free memory */
+      while(AXIsMultiVoiceRunning(ax->mvoice) && (countAvail < count))
+      {
+         OSYieldThread(); /* Gives threads with same priority time to run */
+         countAvail = (ax->written > AX_AUDIO_MAX_FREE ? 0 : (AX_AUDIO_MAX_FREE - ax->written));
+      }
+   }
+
+   /* Over available space, do as much as possible */
+   if(count > countAvail)
+      count = countAvail;
+
+   /* make sure we have input size */
+   if(count > 0)
+   {
+      /* write in new data */
+      size_t startPos   = ax->pos;
+      int flushP2needed = 0;
+      int flushP2       = 0;
+
+      for (i = 0; i < (count << 1); i += 2)
+      {
+         ax->buffer_l[ax->pos] = src[i];
+         ax->buffer_r[ax->pos] = src[i + 1];
+         ax->pos               = ax_audio_limit(ax->pos + 1);
+
+         /* wrapped around, make sure to store cache */
+         if(ax->pos == 0)
+         {
+            flushP2needed = 1;
+            flushP2       = ((count << 1) - i);
+            DCStoreRangeNoSync(ax->buffer_l+startPos, (AX_AUDIO_COUNT-startPos) << 1);
+            DCStoreRangeNoSync(ax->buffer_r+startPos, (AX_AUDIO_COUNT-startPos) << 1);
+         }
+      }
+
+      /* standard cache store case */
+      if(!flushP2needed)
+      {
+         DCStoreRangeNoSync(ax->buffer_l+startPos, count << 1);
+         DCStoreRange(ax->buffer_r+startPos, count << 1);
+      }
+      /* store the rest after wrap */
+      else if(flushP2 > 0)
+      {
+         DCStoreRangeNoSync(ax->buffer_l, flushP2);
+         DCStoreRange(ax->buffer_r, flushP2);
+      }
+
+      /* add in new audio data */
+      if(OSUninterruptibleSpinLock_Acquire(&ax->spinlock))
+      {
+         ax->written += count;
+         OSUninterruptibleSpinLock_Release(&ax->spinlock);
+      }
+   }
+
+   /* Possibly buffer underrun
+    *
+    * checks if it can be started
+    */
+   if(!AXIsMultiVoiceRunning(ax->mvoice))
+      ax_audio_start(ax, false);
+
+   /* Done copying new data */
+   performance_counter_stop_plus(is_perfcnt_enable, ax_audio_write_perf);
+
+   /* return what was actually copied */
+   return (count << 2);
+}
+
+static bool ax_audio_alive(void* data)
+{
+   ax_audio_t* ax = (ax_audio_t*)data;
+   return AXIsMultiVoiceRunning(ax->mvoice);
+}
+
+static void ax_audio_set_nonblock_state(void* data, bool state)
+{
+   ax_audio_t* ax = (ax_audio_t*)data;
+
+   if (ax)
+      ax->nonblocking = state;
+}
+
+static bool ax_audio_use_float(void* data)
+{
+   (void)data;
+   return false;
+}
+
+static size_t ax_audio_write_avail(void* data)
+{
+   ax_audio_t* ax = (ax_audio_t*)data;
+
+   size_t ret = AX_AUDIO_COUNT - ax->written;
+
+   return (ret < AX_AUDIO_SAMPLE_COUNT ? 0 : ret);
+}
+
+static size_t ax_audio_buffer_size(void* data)
+{
+   (void)data;
+   return AX_AUDIO_COUNT;
+}
+
+
+audio_driver_t audio_ax =
+{
+   ax_audio_init,
+   ax_audio_write,
+   ax_audio_stop,
+   ax_audio_start,
+   ax_audio_alive,
+   ax_audio_set_nonblock_state,
+   ax_audio_free,
+   ax_audio_use_float,
+   "AX",
+   NULL,
+   NULL,
+/*   ax_audio_write_avail, */
+/*   ax_audio_buffer_size */
+};

audio/drivers/xaudio.cpp

@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2011-2017 - 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-
@@ -14,6 +14,12 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#if !defined(_XBOX) && (_MSC_VER == 1310)
+#ifndef _WIN32_DCOM
+#define _WIN32_DCOM
+#endif
+#endif
+
 #include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
@@ -23,10 +29,14 @@
 #include <compat/msvc.h>
 #include <retro_miscellaneous.h>
 
+#if defined(_MSC_VER) && (_WIN32_WINNT <= _WIN32_WINNT_WIN2K)
+/* needed for CoInitializeEx */
+#define _WIN32_DCOM
+#endif
+
 #include "xaudio.h"
 
 #include "../audio_driver.h"
-#include "../../configuration.h"
 #include "../../verbosity.h"
 
 typedef struct xaudio2 xaudio2_t;
@@ -137,6 +147,10 @@ static void xaudio2_free(xaudio2_t *handle)
    delete handle;
 }
 
+#ifndef COINIT_MULTITHREADED
+#define COINIT_MULTITHREADED 0x00
+#endif
+
 static xaudio2_t *xaudio2_new(unsigned samplerate, unsigned channels,
       size_t size, unsigned device)
 {
@@ -187,7 +201,8 @@ static size_t xaudio2_write_avail(xaudio2_t *handle)
    return handle->bufsize * (MAX_BUFFERS - handle->buffers - 1);
 }
 
-static size_t xaudio2_write(xaudio2_t *handle, const void *buf, size_t bytes_)
+static size_t xaudio2_write(xaudio2_t *handle, const void *buf, size_t bytes_,
+      bool is_perfcnt_enable)
 {
    unsigned bytes = bytes_;
    const uint8_t *buffer = (const uint8_t*)buf;
@@ -225,11 +240,13 @@ static size_t xaudio2_write(xaudio2_t *handle, const void *buf, size_t bytes_)
    return bytes_;
 }
 
-static void *xa_init(const char *device, unsigned rate, unsigned latency)
+static void *xa_init(const char *device, unsigned rate, unsigned latency,
+      unsigned block_frames,
+      unsigned *new_rate)
 {
    size_t bufsize;
    unsigned device_index = 0;
-   xa_t *xa = (xa_t*)calloc(1, sizeof(*xa));
+   xa_t *xa              = (xa_t*)calloc(1, sizeof(*xa));
    if (!xa)
       return NULL;
 
@@ -257,7 +274,8 @@ static void *xa_init(const char *device, unsigned rate, unsigned latency)
    return xa;
 }
 
-static ssize_t xa_write(void *data, const void *buf, size_t size)
+static ssize_t xa_write(void *data, const void *buf, size_t size,
+      bool is_perfcnt_enable)
 {
    size_t ret;
    xa_t *xa = (xa_t*)data;
@@ -272,7 +290,7 @@ static ssize_t xa_write(void *data, const void *buf, size_t size)
          size = avail;
    }
 
-   ret = xaudio2_write(xa->xa, buf, size);
+   ret = xaudio2_write(xa->xa, buf, size, is_perfcnt_enable);
    if (ret == 0 && size > 0)
       return -1;
    return ret;
@@ -300,7 +318,7 @@ static void xa_set_nonblock_state(void *data, bool state)
       xa->nonblock = state;
 }
 
-static bool xa_start(void *data)
+static bool xa_start(void *data, bool is_shutdown)
 {
    xa_t *xa = (xa_t*)data;
    xa->is_paused = false;

audio/drivers/xaudio.h

@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
  *  Copyright (C) 2010-2014 - OV2
  * 
  *  RetroArch is free software: you can redistribute it and/or modify it under the terms

audio/drivers/xenon360_audio.c

@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2011-2017 - 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-
@@ -22,7 +22,6 @@
 #include <retro_inline.h>
 
 #include "../audio_driver.h"
-#include "../../configuration.h"
 
 #define SOUND_FREQUENCY 48000
 #define MAX_BUFFER 2048
@@ -35,10 +34,11 @@ typedef struct
 } xenon_audio_t;
 
 static void *xenon360_audio_init(const char *device,
-      unsigned rate, unsigned latency)
+      unsigned rate, unsigned latency,
+      unsigned block_frames,
+      unsigned *new_rate)
 {
    static bool inited = false;
-   settings_t *settings = config_get_ptr();
 
    if (!inited)
    {
@@ -46,7 +46,8 @@ static void *xenon360_audio_init(const char *device,
       inited = true;
    }
 
-   settings->audio.out_rate = SOUND_FREQUENCY;
+   *new_rate = SOUND_FREQUENCY;
+
    return calloc(1, sizeof(xenon_audio_t));
 }
 
@@ -56,7 +57,8 @@ static INLINE uint32_t bswap_32(uint32_t val)
       ((val >> 8) & 0xff00) | ((val << 8) & 0xff0000);
 }
 
-static ssize_t xenon360_audio_write(void *data, const void *buf, size_t size)
+static ssize_t xenon360_audio_write(void *data, const void *buf, size_t size,
+      bool is_perfcnt_enable)
 {
    size_t written = 0, i;
    const uint32_t *in_buf = buf;
@@ -111,7 +113,7 @@ static void xenon360_audio_set_nonblock_state(void *data, bool state)
       xa->nonblock = state;
 }
 
-static bool xenon360_audio_start(void *data)
+static bool xenon360_audio_start(void *data, bool is_shutdown)
 {
    xenon_audio_t *xa = data;
    xa->is_paused = false;

audio/drivers_resampler/cc_resampler.c

@@ -1,5 +1,5 @@
 /*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2014-2016 - Ali Bouhlel ( [email protected] )
+ *  Copyright (C) 2014-2017 - 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-
@@ -25,8 +25,9 @@
 #include <retro_inline.h>
 #include <retro_miscellaneous.h>
 #include <memalign.h>
+#include <math/float_minmax.h>
 
-#include "../audio_resampler_driver.h"
+#include <audio/audio_resampler.h>
 
 /* Since SSE and NEON don't provide support for trigonometric functions
  * we approximate those with polynoms
@@ -59,10 +60,10 @@ typedef struct rarch_CC_resampler
 static void resampler_CC_process(void *re_, struct resampler_data *data)
 {
    float ratio, fraction;
-   audio_frame_float_t *inp = (audio_frame_float_t*)data->data_in;
+   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;
+   audio_frame_float_t    *outp = (audio_frame_float_t*)data->data_out;
 
    (void)re_;
 
@@ -196,15 +197,15 @@ static void resampler_CC_downsample(void *re_, struct resampler_data *data)
       __m128 vec_in;
       __m128 vec_ratio =
          _mm_mul_ps(_mm_set_ps1(ratio), _mm_set_ps(3.0, 2.0, 1.0, 0.0));
-      __m128 vec_w = _mm_sub_ps(_mm_set_ps1(re->distance), vec_ratio);
+      __m128 vec_w     = _mm_sub_ps(_mm_set_ps1(re->distance), vec_ratio);
 
-      __m128 vec_w1 = _mm_add_ps(vec_w , _mm_set_ps1(0.5));
-      __m128 vec_w2 = _mm_sub_ps(vec_w , _mm_set_ps1(0.5));
+      __m128 vec_w1    = _mm_add_ps(vec_w , _mm_set_ps1(0.5));
+      __m128 vec_w2    = _mm_sub_ps(vec_w , _mm_set_ps1(0.5));
 
-      __m128 vec_b = _mm_set_ps1(b);
+      __m128 vec_b     = _mm_set_ps1(b);
 
-      vec_w1 = _mm_mul_ps(vec_w1, vec_b);
-      vec_w2 = _mm_mul_ps(vec_w2, vec_b);
+      vec_w1           = _mm_mul_ps(vec_w1, vec_b);
+      vec_w2           = _mm_mul_ps(vec_w2, vec_b);
 
       (void)vec_ww1;
       (void)vec_ww2;
@@ -271,7 +272,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                      = float_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 +447,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 = float_min(data->ratio, 1.00); /* cutoff frequency. */
    float                  ratio = 1.0 / data->ratio;
 
    while (inp != inp_max)
@@ -539,7 +540,7 @@ static void resampler_CC_free(void *re_)
    (void)re_;
 }
 
-rarch_resampler_t CC_resampler = {
+retro_resampler_t CC_resampler = {
    resampler_CC_init,
    resampler_CC_process,
    resampler_CC_free,

audio/drivers_resampler/cc_resampler_neon.S

@@ -1,5 +1,5 @@
 /*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2014-2015 - Ali Bouhlel ( aliaspider@gmail.com )
+ *  Copyright (C) 2014-2017 - Ali Bouhlel ( aliaspider@gmail.com )
  *
  *  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-
@@ -24,7 +24,13 @@
 #endif
 .align 4
 .globl resampler_CC_downsample_neon
+#ifndef __MACH__
+.type resampler_CC_downsample_neon, %function
+#endif
 .globl _resampler_CC_downsample_neon
+#ifndef __MACH__
+.type _resampler_CC_downsample_neon, %function
+#endif
 
 # size_t resampler_CC_downsample_neon(float *outp, const float *inp,
 #       rarch_CC_resampler_t* re_, size_t input_frames, float ratio);
@@ -196,7 +202,13 @@ bx lr
 
 .align 4
 .globl resampler_CC_upsample_neon
+#ifndef __MACH__
+.type resampler_CC_upsample_neon, %function
+#endif
 .globl _resampler_CC_upsample_neon
+#ifndef __MACH__
+.type _resampler_CC_upsample_neon, %function
+#endif
 
 # size_t resampler_CC_upsample_neon(float *outp, const float *inp,
 #       rarch_CC_resampler_t* re_, size_t input_frames, float ratio);

audio/drivers_resampler/null_resampler.c

@@ -1,48 +0,0 @@
-/*  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"
-};

audio/drivers_resampler/sinc_resampler.c

@@ -1,483 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- * 
- *  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/>.
- */
-
-/* Bog-standard windowed SINC implementation. */
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-
-#ifdef __SSE__
-#include <xmmintrin.h>
-#endif
-
-#include <retro_inline.h>
-#include <filters.h>
-#include <memalign.h>
-
-#include "../audio_resampler_driver.h"
-
-/* Rough SNR values for upsampling:
- * LOWEST: 40 dB
- * LOWER: 55 dB
- * NORMAL: 70 dB
- * HIGHER: 110 dB
- * HIGHEST: 140 dB
- */
-
-/* TODO, make all this more configurable. */
-#if defined(SINC_LOWEST_QUALITY)
-#define SINC_WINDOW_LANCZOS
-#define CUTOFF 0.98
-#define PHASE_BITS 12
-#define SINC_COEFF_LERP 0
-#define SUBPHASE_BITS 10
-#define SIDELOBES 2
-#define ENABLE_AVX 0
-#elif defined(SINC_LOWER_QUALITY)
-#define SINC_WINDOW_LANCZOS
-#define CUTOFF 0.98
-#define PHASE_BITS 12
-#define SUBPHASE_BITS 10
-#define SINC_COEFF_LERP 0
-#define SIDELOBES 4
-#define ENABLE_AVX 0
-#elif defined(SINC_HIGHER_QUALITY)
-#define SINC_WINDOW_KAISER
-#define SINC_WINDOW_KAISER_BETA 10.5
-#define CUTOFF 0.90
-#define PHASE_BITS 10
-#define SUBPHASE_BITS 14
-#define SINC_COEFF_LERP 1
-#define SIDELOBES 32
-#define ENABLE_AVX 1
-#elif defined(SINC_HIGHEST_QUALITY)
-#define SINC_WINDOW_KAISER
-#define SINC_WINDOW_KAISER_BETA 14.5
-#define CUTOFF 0.962
-#define PHASE_BITS 10
-#define SUBPHASE_BITS 14
-#define SINC_COEFF_LERP 1
-#define SIDELOBES 128
-#define ENABLE_AVX 1
-#else
-#define SINC_WINDOW_KAISER
-#define SINC_WINDOW_KAISER_BETA 5.5
-#define CUTOFF 0.825
-#define PHASE_BITS 8
-#define SUBPHASE_BITS 16
-#define SINC_COEFF_LERP 1
-#define SIDELOBES 8
-#define ENABLE_AVX 0
-#endif
-
-/* For the little amount of taps we're using,
- * SSE1 is faster than AVX for some reason.
- * AVX code is kept here though as by increasing number
- * of sinc taps, the AVX code is clearly faster than SSE1.
- */
-
-#if defined(__AVX__) && ENABLE_AVX
-#include <immintrin.h>
-#endif
-
-#define PHASES (1 << (PHASE_BITS + SUBPHASE_BITS))
-
-#define TAPS (SIDELOBES * 2)
-#define SUBPHASE_MASK ((1 << SUBPHASE_BITS) - 1)
-#define SUBPHASE_MOD (1.0f / (1 << SUBPHASE_BITS))
-
-typedef struct rarch_sinc_resampler
-{
-   float *phase_table;
-   float *buffer_l;
-   float *buffer_r;
-
-   unsigned taps;
-
-   unsigned ptr;
-   uint32_t time;
-
-   /* A buffer for phase_table, buffer_l and buffer_r 
-    * are created in a single calloc().
-    * Ensure that we get as good cache locality as we can hope for. */
-   float *main_buffer;
-} rarch_sinc_resampler_t;
-
-#if defined(SINC_WINDOW_LANCZOS)
-#define window_function(idx)  (lanzcos_window_function(idx))
-#elif defined(SINC_WINDOW_KAISER)
-#define window_function(idx)  (kaiser_window_function(idx, SINC_WINDOW_KAISER_BETA))
-#else
-#error "No SINC window function defined."
-#endif
-
-static void init_sinc_table(rarch_sinc_resampler_t *resamp, double cutoff,
-      float *phase_table, int phases, int taps, bool calculate_delta)
-{
-   int i, j;
-   double    window_mod = window_function(0.0); /* Need to normalize w(0) to 1.0. */
-   int           stride = calculate_delta ? 2 : 1;
-   double     sidelobes = taps / 2.0;
-
-   for (i = 0; i < phases; i++)
-   {
-      for (j = 0; j < taps; j++)
-      {
-         double sinc_phase;
-         float val;
-         int               n = j * phases + i;
-         double window_phase = (double)n / (phases * taps); /* [0, 1). */
-         window_phase = 2.0 * window_phase - 1.0; /* [-1, 1) */
-         sinc_phase = sidelobes * window_phase;
-
-         val = cutoff * sinc(M_PI * sinc_phase * cutoff) * 
-            window_function(window_phase) / window_mod;
-         phase_table[i * stride * taps + j] = val;
-      }
-   }
-
-   if (calculate_delta)
-   {
-      int phase;
-      int p;
-
-      for (p = 0; p < phases - 1; p++)
-      {
-         for (j = 0; j < taps; j++)
-         {
-            float delta = phase_table[(p + 1) * stride * taps + j] - 
-               phase_table[p * stride * taps + j];
-            phase_table[(p * stride + 1) * taps + j] = delta;
-         }
-      }
-
-      phase = phases - 1;
-      for (j = 0; j < taps; j++)
-      {
-         float val, delta;
-         double sinc_phase;
-         int n = j * phases + (phase + 1);
-         double window_phase = (double)n / (phases * taps); /* (0, 1]. */
-         window_phase = 2.0 * window_phase - 1.0; /* (-1, 1] */
-         sinc_phase = sidelobes * window_phase;
-
-         val = cutoff * sinc(M_PI * sinc_phase * cutoff) * 
-            window_function(window_phase) / window_mod;
-         delta = (val - phase_table[phase * stride * taps + j]);
-         phase_table[(phase * stride + 1) * taps + j] = delta;
-      }
-   }
-}
-
-#if !(defined(__AVX__) && ENABLE_AVX) && !defined(__SSE__)
-static INLINE void process_sinc_C(rarch_sinc_resampler_t *resamp,
-      float *out_buffer)
-{
-   unsigned i;
-   float sum_l              = 0.0f;
-   float sum_r              = 0.0f;
-   const float *buffer_l    = resamp->buffer_l + resamp->ptr;
-   const float *buffer_r    = resamp->buffer_r + resamp->ptr;
-   unsigned taps            = resamp->taps;
-   unsigned phase           = resamp->time >> SUBPHASE_BITS;
-#if SINC_COEFF_LERP
-   const float *phase_table = resamp->phase_table + phase * taps * 2;
-   const float *delta_table = phase_table + taps;
-   float delta              = (float)
-      (resamp->time & SUBPHASE_MASK) * SUBPHASE_MOD;
-#else
-   const float *phase_table = resamp->phase_table + phase * taps;
-#endif
-
-   for (i = 0; i < taps; i++)
-   {
-#if SINC_COEFF_LERP
-      float sinc_val = phase_table[i] + delta_table[i] * delta;
-#else
-      float sinc_val = phase_table[i];
-#endif
-      sum_l         += buffer_l[i] * sinc_val;
-      sum_r         += buffer_r[i] * sinc_val;
-   }
-
-   out_buffer[0] = sum_l;
-   out_buffer[1] = sum_r;
-}
-#endif
-
-#if defined(__AVX__) && ENABLE_AVX
-#define process_sinc_func process_sinc
-static void process_sinc(rarch_sinc_resampler_t *resamp, float *out_buffer)
-{
-   unsigned i;
-   __m256 sum_l             = _mm256_setzero_ps();
-   __m256 sum_r             = _mm256_setzero_ps();
-
-   const float *buffer_l    = resamp->buffer_l + resamp->ptr;
-   const float *buffer_r    = resamp->buffer_r + resamp->ptr;
-
-   unsigned taps            = resamp->taps;
-   unsigned phase           = resamp->time >> SUBPHASE_BITS;
-#if SINC_COEFF_LERP
-   const float *phase_table = resamp->phase_table + phase * taps * 2;
-   const float *delta_table = phase_table + taps;
-   __m256 delta             = _mm256_set1_ps((float)
-         (resamp->time & SUBPHASE_MASK) * SUBPHASE_MOD);
-#else
-   const float *phase_table = resamp->phase_table + phase * taps;
-#endif
-
-   for (i = 0; i < taps; i += 8)
-   {
-      __m256 buf_l  = _mm256_loadu_ps(buffer_l + i);
-      __m256 buf_r  = _mm256_loadu_ps(buffer_r + i);
-
-#if SINC_COEFF_LERP
-      __m256 deltas = _mm256_load_ps(delta_table + i);
-      __m256 sinc   = _mm256_add_ps(_mm256_load_ps(phase_table + i),
-            _mm256_mul_ps(deltas, delta));
-#else
-      __m256 sinc   = _mm256_load_ps(phase_table + i);
-#endif
-      sum_l         = _mm256_add_ps(sum_l, _mm256_mul_ps(buf_l, sinc));
-      sum_r         = _mm256_add_ps(sum_r, _mm256_mul_ps(buf_r, sinc));
-   }
-
-   /* hadd on AVX is weird, and acts on low-lanes 
-    * and high-lanes separately. */
-   __m256 res_l = _mm256_hadd_ps(sum_l, sum_l);
-   __m256 res_r = _mm256_hadd_ps(sum_r, sum_r);
-   res_l        = _mm256_hadd_ps(res_l, res_l);
-   res_r        = _mm256_hadd_ps(res_r, res_r);
-   res_l        = _mm256_add_ps(_mm256_permute2f128_ps(res_l, res_l, 1), res_l);
-   res_r        = _mm256_add_ps(_mm256_permute2f128_ps(res_r, res_r, 1), res_r);
-
-   /* This is optimized to mov %xmmN, [mem].
-    * There doesn't seem to be any _mm256_store_ss intrinsic. */
-   _mm_store_ss(out_buffer + 0, _mm256_extractf128_ps(res_l, 0));
-   _mm_store_ss(out_buffer + 1, _mm256_extractf128_ps(res_r, 0));
-}
-#elif defined(__SSE__)
-#define process_sinc_func process_sinc
-static void process_sinc(rarch_sinc_resampler_t *resamp, float *out_buffer)
-{
-   unsigned i;
-   __m128 sum;
-   __m128 sum_l             = _mm_setzero_ps();
-   __m128 sum_r             = _mm_setzero_ps();
-
-   const float *buffer_l    = resamp->buffer_l + resamp->ptr;
-   const float *buffer_r    = resamp->buffer_r + resamp->ptr;
-
-   unsigned taps            = resamp->taps;
-   unsigned phase           = resamp->time >> SUBPHASE_BITS;
-#if SINC_COEFF_LERP
-   const float *phase_table = resamp->phase_table + phase * taps * 2;
-   const float *delta_table = phase_table + taps;
-   __m128 delta             = _mm_set1_ps((float)
-         (resamp->time & SUBPHASE_MASK) * SUBPHASE_MOD);
-#else
-   const float *phase_table = resamp->phase_table + phase * taps;
-#endif
-
-   for (i = 0; i < taps; i += 4)
-   {
-      __m128 buf_l = _mm_loadu_ps(buffer_l + i);
-      __m128 buf_r = _mm_loadu_ps(buffer_r + i);
-
-#if SINC_COEFF_LERP
-      __m128 deltas = _mm_load_ps(delta_table + i);
-      __m128 _sinc  = _mm_add_ps(_mm_load_ps(phase_table + i),
-            _mm_mul_ps(deltas, delta));
-#else
-      __m128 _sinc = _mm_load_ps(phase_table + i);
-#endif
-      sum_l        = _mm_add_ps(sum_l, _mm_mul_ps(buf_l, _sinc));
-      sum_r        = _mm_add_ps(sum_r, _mm_mul_ps(buf_r, _sinc));
-   }
-
-   /* Them annoying shuffles.
-    * sum_l = { l3, l2, l1, l0 }
-    * sum_r = { r3, r2, r1, r0 }
-    */
-
-   sum = _mm_add_ps(_mm_shuffle_ps(sum_l, sum_r,
-            _MM_SHUFFLE(1, 0, 1, 0)),
-         _mm_shuffle_ps(sum_l, sum_r, _MM_SHUFFLE(3, 2, 3, 2)));
-
-   /* sum   = { r1, r0, l1, l0 } + { r3, r2, l3, l2 }
-    * sum   = { R1, R0, L1, L0 }
-    */
-
-   sum = _mm_add_ps(_mm_shuffle_ps(sum, sum, _MM_SHUFFLE(3, 3, 1, 1)), sum);
-
-   /* sum   = {R1, R1, L1, L1 } + { R1, R0, L1, L0 }
-    * sum   = { X,  R,  X,  L } 
-    */
-
-   /* Store L */
-   _mm_store_ss(out_buffer + 0, sum);
-
-   /* movehl { X, R, X, L } == { X, R, X, R } */
-   _mm_store_ss(out_buffer + 1, _mm_movehl_ps(sum, sum));
-}
-#elif defined(__ARM_NEON__) && !defined(VITA)
-
-#if SINC_COEFF_LERP
-#error "NEON asm does not support SINC lerp."
-#endif
-
-/* Need to make this function pointer as Android doesn't 
- * have built-in targets for NEON and plain ARMv7a.
- */
-static void (*process_sinc_func)(rarch_sinc_resampler_t *resamp,
-      float *out_buffer);
-
-/* Assumes that taps >= 8, and that taps is a multiple of 8. */
-void process_sinc_neon_asm(float *out, const float *left, 
-      const float *right, const float *coeff, unsigned taps);
-
-static void process_sinc_neon(rarch_sinc_resampler_t *resamp,
-      float *out_buffer)
-{
-   const float *buffer_l    = resamp->buffer_l + resamp->ptr;
-   const float *buffer_r    = resamp->buffer_r + resamp->ptr;
-
-   unsigned phase           = resamp->time >> SUBPHASE_BITS;
-   unsigned taps            = resamp->taps;
-   const float *phase_table = resamp->phase_table + phase * taps;
-
-   process_sinc_neon_asm(out_buffer, buffer_l, buffer_r, phase_table, taps);
-}
-#else /* Plain ol' C99 */
-#define process_sinc_func process_sinc_C
-#endif
-
-static void resampler_sinc_process(void *re_, struct resampler_data *data)
-{
-   rarch_sinc_resampler_t *re = (rarch_sinc_resampler_t*)re_;
-
-   uint32_t ratio        = PHASES / data->ratio;
-   const float *input    = data->data_in;
-   float *output         = data->data_out;
-   size_t frames         = data->input_frames;
-   size_t out_frames     = 0;
-
-   while (frames)
-   {
-      while (frames && re->time >= PHASES)
-      {
-         /* Push in reverse to make filter more obvious. */
-         if (!re->ptr)
-            re->ptr = re->taps;
-         re->ptr--;
-
-         re->buffer_l[re->ptr + re->taps] = re->buffer_l[re->ptr] = *input++;
-         re->buffer_r[re->ptr + re->taps] = re->buffer_r[re->ptr] = *input++;
-
-         re->time -= PHASES;
-         frames--;
-      }
-
-      while (re->time < PHASES)
-      {
-         process_sinc_func(re, output);
-         output += 2;
-         out_frames++;
-         re->time += ratio;
-      }
-   }
-
-   data->output_frames = out_frames;
-}
-
-static void resampler_sinc_free(void *re)
-{
-   rarch_sinc_resampler_t *resampler = (rarch_sinc_resampler_t*)re;
-   if (resampler)
-      memalign_free(resampler->main_buffer);
-   free(resampler);
-}
-
-static void *resampler_sinc_new(const struct resampler_config *config,
-      double bandwidth_mod, resampler_simd_mask_t mask)
-{
-   size_t phase_elems, elems;
-   double cutoff;
-   rarch_sinc_resampler_t *re = (rarch_sinc_resampler_t*)
-      calloc(1, sizeof(*re));
-
-   if (!re)
-      return NULL;
-
-   (void)config;
-
-   re->taps = TAPS;
-   cutoff   = CUTOFF;
-
-   /* Downsampling, must lower cutoff, and extend number of 
-    * taps accordingly to keep same stopband attenuation. */
-   if (bandwidth_mod < 1.0)
-   {
-      cutoff *= bandwidth_mod;
-      re->taps = (unsigned)ceil(re->taps / bandwidth_mod);
-   }
-
-   /* Be SIMD-friendly. */
-#if (defined(__AVX__) && ENABLE_AVX) || (defined(__ARM_NEON__)&& !defined(VITA))
-   re->taps = (re->taps + 7) & ~7;
-#else
-   re->taps = (re->taps + 3) & ~3;
-#endif
-
-   phase_elems = (1 << PHASE_BITS) * re->taps;
-#if SINC_COEFF_LERP
-   phase_elems *= 2;
-#endif
-   elems = phase_elems + 4 * re->taps;
-
-   re->main_buffer = (float*)memalign_alloc(128, sizeof(float) * elems);
-   if (!re->main_buffer)
-      goto error;
-
-   re->phase_table = re->main_buffer;
-   re->buffer_l = re->main_buffer + phase_elems;
-   re->buffer_r = re->buffer_l + 2 * re->taps;
-
-   init_sinc_table(re, cutoff, re->phase_table,
-         1 << PHASE_BITS, re->taps, SINC_COEFF_LERP);
-
-#if defined(__ARM_NEON__) && !defined(VITA)
-   process_sinc_func = mask & RESAMPLER_SIMD_NEON 
-      ? process_sinc_neon : process_sinc_C;
-#endif
-
-   return re;
-
-error:
-   resampler_sinc_free(re);
-   return NULL;
-}
-
-rarch_resampler_t sinc_resampler = {
-   resampler_sinc_new,
-   resampler_sinc_process,
-   resampler_sinc_free,
-   RESAMPLER_API_VERSION,
-   "sinc",
-   "sinc"
-};

audio/drivers_resampler/sinc_resampler_neon.S

@@ -1,60 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- * 
- *  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/>.
- */
-#if defined(__ARM_NEON__)
-
-#ifndef __MACH__
-.arm
-#endif
-.align 4
-.globl process_sinc_neon_asm
-.globl _process_sinc_neon_asm
-# void process_sinc_neon(float *out, const float *left, const float *right, const float *coeff, unsigned taps)
-# Assumes taps is >= 8, and a multiple of 8.
-process_sinc_neon_asm:
-_process_sinc_neon_asm:
-
-   push {r4, lr}   
-   vmov.f32 q0, #0.0
-   vmov.f32 q8, #0.0
-
-   # Taps argument (r4) goes on stack in armeabi.
-   ldr r4, [sp, #8]
-
-1:
-   # Left
-   vld1.f32 {q2-q3}, [r1]!
-   # Right
-   vld1.f32 {q10-q11}, [r2]!
-   # Coeff
-   vld1.f32 {q12-q13}, [r3, :128]!
-
-   # Left / Right
-   vmla.f32 q0, q2, q12
-   vmla.f32 q8, q10, q12
-   vmla.f32 q0, q3, q13
-   vmla.f32 q8, q11, q13
-
-   subs r4, r4, #8
-   bne 1b
-
-   # Add everything together
-   vadd.f32 d0, d0, d1
-   vadd.f32 d16, d16, d17
-   vpadd.f32 d0, d0, d16
-   vst1.f32 d0, [r0]
-   
-   pop {r4, pc}
-
-#endif

audio/librsound.c

@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2011-2017 - 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-
@@ -65,13 +65,13 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
 #include <stdarg.h>
 #include <time.h>
 #include <errno.h> 
 
 #include <compat/strl.h>
 #include <retro_inline.h>
+#include <retro_assert.h>
 #include <retro_miscellaneous.h>
 
 /* 
@@ -212,7 +212,7 @@ static INLINE int rsnd_format_to_samplesize ( uint16_t fmt )
 
 int rsd_samplesize( rsound_t *rd )
 {
-   assert(rd != NULL);
+   retro_assert(rd != NULL);
    return rd->samplesize;
 }
 
@@ -1298,7 +1298,7 @@ static int rsnd_reset(rsound_t *rd)
 
 int rsd_stop(rsound_t *rd)
 {
-   assert(rd != NULL);
+   retro_assert(rd != NULL);
    rsnd_stop_thread(rd);
 
    const char buf[] = "RSD    5 STOP";
@@ -1314,7 +1314,7 @@ int rsd_stop(rsound_t *rd)
 size_t rsd_write( rsound_t *rsound, const void* buf, size_t size)
 {
    size_t max_write, written = 0;
-   assert(rsound != NULL);
+   retro_assert(rsound != NULL);
    if ( !rsound->ready_for_data )
       return 0;
 
@@ -1339,11 +1339,11 @@ size_t rsd_write( rsound_t *rsound, const void* buf, size_t size)
 
 int rsd_start(rsound_t *rsound)
 {
-   assert(rsound != NULL);
-   assert(rsound->rate > 0);
-   assert(rsound->channels > 0);
-   assert(rsound->host != NULL);
-   assert(rsound->port != NULL);
+   retro_assert(rsound != NULL);
+   retro_assert(rsound->rate > 0);
+   retro_assert(rsound->channels > 0);
+   retro_assert(rsound->host != NULL);
+   retro_assert(rsound->port != NULL);
 
    if ( rsnd_create_connection(rsound) < 0 )
       return -1;
@@ -1353,7 +1353,7 @@ int rsd_start(rsound_t *rsound)
 
 int rsd_exec(rsound_t *rsound)
 {
-   assert(rsound != NULL);
+   retro_assert(rsound != NULL);
    RSD_DEBUG("[RSound] rsd_exec().\n");
 
    // Makes sure we have a working connection
@@ -1406,8 +1406,8 @@ int rsd_exec(rsound_t *rsound)
 /* ioctl()-ish param setting :D */
 int rsd_set_param(rsound_t *rd, enum rsd_settings option, void* param)
 {
-	assert(rd != NULL);
-	assert(param != NULL);
+	retro_assert(rd != NULL);
+	retro_assert(param != NULL);
 	int retval = 0;
 
 	switch(option)
@@ -1505,7 +1505,7 @@ void rsd_delay_wait(rsound_t *rd)
 
 size_t rsd_pointer(rsound_t *rsound)
 {
-   assert(rsound != NULL);
+   retro_assert(rsound != NULL);
    int ptr;
 
    ptr = rsnd_get_ptr(rsound);   
@@ -1515,7 +1515,7 @@ size_t rsd_pointer(rsound_t *rsound)
 
 size_t rsd_get_avail(rsound_t *rd)
 {
-   assert(rd != NULL);
+   retro_assert(rd != NULL);
    int ptr;
    ptr = rsnd_get_ptr(rd);
    return rd->buffer_size - ptr;
@@ -1523,7 +1523,7 @@ size_t rsd_get_avail(rsound_t *rd)
 
 size_t rsd_delay(rsound_t *rd)
 {
-   assert(rd != NULL);
+   retro_assert(rd != NULL);
    int ptr = rsnd_get_delay(rd);
    if ( ptr < 0 )
       ptr = 0;
@@ -1533,28 +1533,29 @@ size_t rsd_delay(rsound_t *rd)
 
 size_t rsd_delay_ms(rsound_t* rd)
 {
-   assert(rd);
-   assert(rd->rate > 0 && rd->channels > 0);
+   retro_assert(rd);
+   retro_assert(rd->rate > 0 && rd->channels > 0);
 
    return (rsd_delay(rd) * 1000) / ( rd->rate * rd->channels * rd->samplesize );
 }
 
 int rsd_pause(rsound_t* rsound, int enable)
 {
-   assert(rsound != NULL);
+   retro_assert(rsound != NULL);
    if ( enable )
       return rsd_stop(rsound);
-   else
-      return rsd_start(rsound);
+
+   return rsd_start(rsound);
 }
 
 int rsd_init(rsound_t** rsound)
 {
-   assert(rsound != NULL);
    *rsound = calloc(1, sizeof(rsound_t));
    if ( *rsound == NULL )
       return -1;
 
+   retro_assert(rsound != NULL);
+
    (*rsound)->conn.socket = -1;
    (*rsound)->conn.ctl_socket = -1;
 
@@ -1616,7 +1617,7 @@ int rsd_simple_start(rsound_t** rsound, const char* host, const char* port, cons
 
 void rsd_set_callback(rsound_t *rsound, rsd_audio_callback_t audio_cb, rsd_error_callback_t err_cb, size_t max_size, void *userdata)
 {
-   assert(rsound != NULL);
+   retro_assert(rsound != NULL);
 
    rsound->audio_callback = audio_cb;
    rsound->error_callback = err_cb;
@@ -1624,7 +1625,9 @@ void rsd_set_callback(rsound_t *rsound, rsd_audio_callback_t audio_cb, rsd_error
    rsound->cb_data = userdata;
 
    if (rsound->audio_callback)
-      assert(rsound->error_callback);
+   {
+      retro_assert(rsound->error_callback);
+   }
 }
 
 void rsd_callback_lock(rsound_t *rsound)
@@ -1639,7 +1642,7 @@ void rsd_callback_unlock(rsound_t *rsound)
 
 int rsd_free(rsound_t *rsound)
 {
-   assert(rsound != NULL);
+   retro_assert(rsound != NULL);
    if (rsound->fifo_buffer)
       fifo_free(rsound->fifo_buffer);
    if (rsound->host)

audio/test/Makefile

@@ -1,108 +0,0 @@
-TESTS := test-sinc-lowest \
-	test-snr-sinc-lowest \
-	test-sinc-lower \
-	test-snr-sinc-lower \
-	test-sinc \
-	test-snr-sinc \
-	test-sinc-higher \
-	test-snr-sinc-higher \
-	test-sinc-highest \
-	test-snr-sinc-highest \
-	test-cc \
-	test-snr-cc
-
-LIBRETRO_COMM_DIR = ../../libretro-common
-
-CFLAGS += -O3 -ffast-math -g -Wall -pedantic -march=native -std=gnu99
-CFLAGS += -DRESAMPLER_TEST -DRARCH_DUMMY_LOG -DRARCH_INTERNAL
-CFLAGS += -I$(LIBRETRO_COMM_DIR)/include -I../../
-
-LDFLAGS += -lm
-
-SHAREDOBJ += $(LIBRETRO_COMM_DIR)/memmap/memalign.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)/streams/file_stream.o \
-				 $(LIBRETRO_COMM_DIR)/string/stdstring.o \
-				 $(LIBRETRO_COMM_DIR)/file/file_path.o \
-				 $(LIBRETRO_COMM_DIR)/file/retro_stat.o \
-				 $(LIBRETRO_COMM_DIR)/compat/compat_strl.o \
-				 $(LIBRETRO_COMM_DIR)/hash/rhash.o \
-
-all: $(TESTS)
-
-main-cc.o: main.c
-	$(CC) -c -o $@ $< $(CFLAGS) -DRESAMPLER_IDENT='"CC"'
-
-snr-cc.o: snr.c
-	$(CC) -c -o $@ $< $(CFLAGS) -DRESAMPLER_IDENT='"CC"'
-
-cc-resampler.o: ../drivers_resampler/cc_resampler.c
-	$(CC) -c -o $@ $< $(CFLAGS)
-
-sinc-lowest.o: ../drivers_resampler/sinc_resampler.c
-	$(CC) -c -o $@ $< $(CFLAGS) -DSINC_LOWEST_QUALITY
-
-sinc-lower.o: ../drivers_resampler/sinc_resampler.c
-	$(CC) -c -o $@ $< $(CFLAGS) -DSINC_LOWER_QUALITY
-
-sinc.o: ../drivers_resampler/sinc_resampler.c
-	$(CC) -c -o $@ $< $(CFLAGS)
-
-nearest_resampler.o: ../drivers_resampler/nearest_resampler.c
-	$(CC) -c -o $@ $< $(CFLAGS)
-
-sinc-higher.o: ../drivers_resampler/sinc.c
-	$(CC) -c -o $@ $< $(CFLAGS) -DSINC_HIGHER_QUALITY
-
-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 nearest_resampler.o $(SHAREDOBJ)
-	$(CC) -o $@ $^ $(LDFLAGS)
-
-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 nearest_resampler.o $(SHAREDOBJ)
-	$(CC) -o $@ $^ $(LDFLAGS)
-
-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 nearest_resampler.o $(SHAREDOBJ)
-	$(CC) -o $@ $^ $(LDFLAGS)
-
-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 nearest_resampler.o $(SHAREDOBJ)
-	$(CC) -o $@ $^ $(LDFLAGS)
-
-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 nearest_resampler.o $(SHAREDOBJ)
-	$(CC) -o $@ $^ $(LDFLAGS)
-
-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 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_resampler.o $(SHAREDOBJ)
-	$(CC) -o $@ $^ $(LDFLAGS)
-
-%.o: %.c
-	$(CC) -c -o $@ $< $(CFLAGS)
-
-clean:
-	rm -f $(TESTS)
-	rm -f *.o
-	rm -f ../*.o
-
-.PHONY: clean
-

audio/test/kaiser_window.m

@@ -1,6 +0,0 @@
-function win = kaiser_window(N, beta)
-% Create an N-point kaiser window with given beta.
-
-indices = 2 * (0 : N - 1) / (N - 1) - 1;
-mod = modified_bessel(beta);
-win = modified_bessel(beta * sqrt(1 - indices.^2)) / mod;

audio/test/main.c

@@ -1,102 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *
- *  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/>.
- */
-
-// Resampler that reads raw S16NE/stereo from stdin and outputs to stdout in S16NE/stereo.
-// Used for testing and performance benchmarking.
-
-#include "../audio_resampler_driver.h"
-#include "../audio_utils.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-
-#ifndef RESAMPLER_IDENT
-#define RESAMPLER_IDENT "sinc"
-#endif
-
-int main(int argc, char *argv[])
-{
-   int16_t input_i[1024];
-   int16_t output_i[1024 * 8];
-
-   float input_f[1024];
-   float output_f[1024 * 8];
-
-   double in_rate, out_rate, ratio;
-   double ratio_max_deviation = 0.0;
-   const rarch_resampler_t *resampler = NULL;
-   void *re = NULL;
-
-   srand(time(NULL));
-
-   if (argc < 3 || argc > 4)
-   {
-      fprintf(stderr, "Usage: %s <in-rate> <out-rate> [ratio deviation] (max ratio: 8.0)\n", argv[0]);
-      return 1;
-   }
-   else if (argc == 4)
-   {
-      ratio_max_deviation = fabs(strtod(argv[3], NULL));
-      fprintf(stderr, "Ratio deviation: %.4f.\n", ratio_max_deviation);
-   }
-
-   in_rate  = strtod(argv[1], NULL);
-   out_rate = strtod(argv[2], NULL);
-   ratio    = out_rate / in_rate;
-
-   if (ratio >= 7.99)
-   {
-      fprintf(stderr, "Ratio is too high.\n");
-      return 1;
-   }
-
-   if (!rarch_resampler_realloc(&re, &resampler, RESAMPLER_IDENT, out_rate / in_rate))
-   {
-      fprintf(stderr, "Failed to allocate resampler ...\n");
-      return 1;
-   }
-
-   for (;;)
-   {
-      size_t output_samples;
-      struct resampler_data data;
-      double uniform, rate_mod;
-
-      if (fread(input_i, sizeof(int16_t), 1024, stdin) != 1024)
-         break;
-
-      uniform = (2.0 * rand()) / RAND_MAX - 1.0;
-      rate_mod = 1.0 + ratio_max_deviation * uniform;
-
-      convert_s16_to_float(input_f, input_i, 1024, 1.0f);
-
-      data.data_in = input_f;
-      data.data_out = output_f;
-      data.input_frames = sizeof(input_f) / (2 * sizeof(float));
-      data.ratio = ratio * rate_mod;
-
-      rarch_resampler_process(resampler, re, &data);
-
-      output_samples = data.output_frames * 2;
-
-      convert_float_to_s16(output_i, output_f, output_samples);
-
-      if (fwrite(output_i, sizeof(int16_t), output_samples, stdout) != output_samples)
-         break;
-   }
-
-   rarch_resampler_freep(&resampler, &re);
-}
-

audio/test/modified_bessel.m

@@ -1,21 +0,0 @@
-function val = modified_bessel(x)
-
-% Mirrors operation as done in RetroArch. Verify accuracy against Matlab's
-% implementation.
-
-sum = zeros(size(x));
-factorial = ones(size(x));
-factorial_mult = zeros(size(x));
-x_pow = ones(size(x));
-two_div_pow = ones(size(x));
-x_sqr = x .* x;
-
-for i = 0 : 17
-   sum = sum + x_pow .* two_div_pow ./ (factorial .* factorial);
-   factorial_mult = factorial_mult + 1.0;
-   x_pow = x_pow .* x_sqr;
-   two_div_pow = two_div_pow * 0.25;
-   factorial = factorial .* factorial_mult;
-end
-
-val = sum;

audio/test/sinc_test.m

@@ -1,51 +0,0 @@
-% MATLAB test case for RetroArch SINC upsampler.
-close all;
-
-%%
-% Test RetroArch's kaiser function.
-real_kaiser = kaiser(1024, 10.0)';
-rarch_kaiser = kaiser_window(1024, 10.0);
-figure('name', 'Bessel function test');
-subplot(2, 1, 1), plot(rarch_kaiser), title('RetroArch kaiser');
-subplot(2, 1, 2), plot(rarch_kaiser - real_kaiser), title('Error');
-
-%%
-% 4-tap and 8-tap are Lanczos windowed, but include here for completeness.
-phases = 256;
-ratio = 2.0;
-bw = min(1.0, ratio);
-downsample = round(phases / ratio);
-cutoffs = bw * [0.65 0.75 0.825 0.90 0.962];
-betas = [2.0 3.0 5.5 10.5 14.5];
-
-sidelobes = round([2 4 8 32 128] / bw);
-taps = sidelobes * 2;
-
-freqs = 0.05 : 0.02 : 0.99;
-
-%filters = length(taps);
-%for i = 1 : filters
-for i = 5
-    filter_length = taps(i) * phases;
-    
-    % Generate SINC.
-    sinc_indices = 2 * ((0 : (filter_length - 1)) / filter_length) - 1;
-    s = cutoffs(i) * sinc(cutoffs(i) * sinc_indices * sidelobes(i));
-    win = kaiser(filter_length, betas(i))';
-    filter = s .* win;
-
-    impulse_response_half = upfirdn(1, filter, phases, downsample) / bw;
-    figure('name', sprintf('Response SINC: %d taps', taps(i)));
-    freqz(impulse_response_half);
-    ylim([-200 0]);
-
-    signal = zeros(1, 80001);
-    for freq = freqs
-        signal = signal + sin(pi * freq * (0 : 80000));
-    end
-    
-    resampled = upfirdn(signal, filter, phases, downsample);
-    figure('name', sprintf('Kaiser SINC: %d taps, w = %.f', taps(i), freq));
-    freqz(resampled .* kaiser(length(resampled), 40.0)', 1, 16 * 1024);
-    ylim([-180 100]);
-end

audio/test/snr.c

@@ -1,353 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *
- *  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 <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <complex.h>
-#include <string.h>
-#include <assert.h>
-
-#include <stdbool.h>
-
-#include <retro_miscellaneous.h>
-
-#include "../audio_resampler_driver.h"
-#include "../audio_utils.h"
-
-#ifndef RESAMPLER_IDENT
-#define RESAMPLER_IDENT "sinc"
-#endif
-
-static void gen_signal(float *out, double omega, double bias_samples, size_t samples)
-{
-   size_t i;
-
-   for (i = 0; i < samples; i += 2)
-   {
-      out[i + 0] = cos(((i >> 1) + bias_samples) * omega);
-      out[i + 1] = out[i + 0];
-   }
-}
-
-struct snr_result
-{
-   double snr;
-   double gain;
-
-   unsigned alias_freq[3];
-   double alias_power[3];
-};
-
-static unsigned bitrange(unsigned len)
-{
-   unsigned ret = 0;
-   while ((len >>= 1))
-      ret++;
-
-   return ret;
-}
-
-static unsigned bitswap(unsigned i, unsigned range)
-{
-   unsigned shifts;
-   unsigned ret = 0;
-
-   for (shifts = 0; shifts < range; shifts++)
-      ret |= (i & (1 << (range - shifts - 1))) ? (1 << shifts) : 0;
-
-   return ret;
-}
-
-/* When interleaving the butterfly buffer, addressing puts bits in reverse.
- * [0, 1, 2, 3, 4, 5, 6, 7] => [0, 4, 2, 6, 1, 5, 3, 7] */
-static void interleave(complex double *butterfly_buf, size_t samples)
-{
-   unsigned i;
-   unsigned range = bitrange(samples);
-
-   for (i = 0; i < samples; i++)
-   {
-      unsigned target = bitswap(i, range);
-
-      if (target > i)
-      {
-         complex double tmp = butterfly_buf[target];
-         butterfly_buf[target] = butterfly_buf[i];
-         butterfly_buf[i] = tmp;
-      }
-   }
-}
-
-static complex double gen_phase(double index)
-{
-   return cexp(M_PI * I * index);
-}
-
-static void butterfly(complex double *a, complex double *b, complex double mod)
-{
-   complex double a_;
-   complex double b_;
-
-   mod *= *b;
-   a_   = *a + mod;
-   b_   = *a - mod;
-   *a   = a_;
-   *b   = b_;
-}
-
-static void butterflies(complex double *butterfly_buf, double phase_dir, size_t step_size, size_t samples)
-{
-   unsigned i, j;
-
-   for (i = 0; i < samples; i += 2 * step_size)
-      for (j = i; j < i + step_size; j++)
-         butterfly(&butterfly_buf[j], &butterfly_buf[j + step_size], gen_phase((phase_dir * (j - i)) / step_size));
-}
-
-static void calculate_fft(const float *data, complex double *butterfly_buf, size_t samples)
-{
-   unsigned i;
-
-   /* Enforce POT. */
-   assert((samples & (samples - 1)) == 0);
-
-   for (i = 0; i < samples; i++)
-      butterfly_buf[i] = data[2 * i];
-
-   /* Interleave buffer to work with FFT. */
-   interleave(butterfly_buf, samples);
-
-   /* Fly, lovely butterflies! :D */
-   for (unsigned step_size = 1; step_size < samples; step_size *= 2)
-      butterflies(butterfly_buf, -1.0, step_size, samples);
-}
-
-static void calculate_fft_adjust(complex double *butterfly_buf, double gain, bool merge_high, size_t samples)
-{
-   unsigned i;
-   if (merge_high)
-   {
-      for (i = 1; i < samples / 2; i++)
-         butterfly_buf[i] *= 2.0;
-   }
-
-   /* Normalize amplitudes. */
-   for (i = 0; i < samples; i++)
-      butterfly_buf[i] *= gain;
-}
-
-static void calculate_ifft(complex double *butterfly_buf, size_t samples, bool normalize)
-{
-   unsigned step_size;
-
-   /* Enforce POT. */
-   assert((samples & (samples - 1)) == 0);
-
-   interleave(butterfly_buf, samples);
-
-   /* Fly, lovely butterflies! In opposite direction! :D */
-   for (step_size = 1; step_size < samples; step_size *= 2)
-      butterflies(butterfly_buf, 1.0, step_size, samples);
-
-   if (normalize)
-      calculate_fft_adjust(butterfly_buf, 1.0 / samples, false, samples);
-}
-
-static void test_fft(void)
-{
-   unsigned i, j;
-   float signal[32];
-   complex double butterfly_buf[16];
-   complex double buf_tmp[16];
-   const float cos_freqs[] = {
-      1.0, 4.0, 6.0,
-   };
-   const float sin_freqs[] = {
-      -2.0, 5.0, 7.0,
-   };
-
-   fprintf(stderr, "Sanity checking FFT ...\n");
-
-   for (i = 0; i < 16; i++)
-   {
-      signal[2 * i] = 0.0;
-      for (j = 0; j < sizeof(cos_freqs) / sizeof(cos_freqs[0]); j++)
-         signal[2 * i] += cos(2.0 * M_PI * i * cos_freqs[j] / 16.0);
-      for ( j = 0; j < sizeof(sin_freqs) / sizeof(sin_freqs[0]); j++)
-         signal[2 * i] += sin(2.0 * M_PI * i * sin_freqs[j] / 16.0);
-   }
-
-   calculate_fft(signal, butterfly_buf, 16);
-   memcpy(buf_tmp, butterfly_buf, sizeof(buf_tmp));
-   calculate_fft_adjust(buf_tmp, 1.0 / 16, true, 16);
-
-   fprintf(stderr, "FFT: { ");
-   for (i = 0; i < 7; i++)
-      fprintf(stderr, "(%4.2lf, %4.2lf), ", creal(buf_tmp[i]), cimag(buf_tmp[i]));
-   fprintf(stderr, "(%4.2lf, %4.2lf) }\n", creal(buf_tmp[7]), cimag(buf_tmp[7]));
-
-   calculate_ifft(butterfly_buf, 16, true);
-
-   fprintf(stderr, "Original:    { ");
-   for (i = 0; i < 15; i++)
-      fprintf(stderr, "%5.2f, ", signal[2 * i]);
-   fprintf(stderr, "%5.2f }\n", signal[2 * 15]);
-
-   fprintf(stderr, "FFT => IFFT: { ");
-   for ( i = 0; i < 15; i++)
-      fprintf(stderr, "%5.2lf, ", creal(butterfly_buf[i]));
-   fprintf(stderr, "%5.2lf }\n", creal(butterfly_buf[15]));
-}
-
-static void set_alias_power(struct snr_result *res, unsigned freq, double power)
-{
-   unsigned i;
-   for (i = 0; i < 3; i++)
-   {
-      if (power >= res->alias_power[i])
-      {
-         memmove(res->alias_freq + i + 1, res->alias_freq + i, (2 - i) * sizeof(res->alias_freq[0]));
-         memmove(res->alias_power + i + 1, res->alias_power + i, (2 - i) * sizeof(res->alias_power[0]));
-         res->alias_power[i] = power;
-         res->alias_freq[i] = freq;
-         break;
-      }
-   }
-}
-
-static void calculate_snr(struct snr_result *res,
-      unsigned in_rate, unsigned max_rate,
-      const float *resamp, complex double *butterfly_buf,
-      size_t samples)
-{
-   unsigned i;
-   double signal;
-   double noise = 0.0;
-
-   samples >>= 1;
-   calculate_fft(resamp, butterfly_buf, samples);
-   calculate_fft_adjust(butterfly_buf, 1.0 / samples, true, samples);
-
-   memset(res, 0, sizeof(*res));
-
-   signal = cabs(butterfly_buf[in_rate] * butterfly_buf[in_rate]);
-   butterfly_buf[in_rate] = 0.0;
-
-   /* Aliased frequencies above half the original sampling rate are not considered. */
-   for (i = 0; i <= max_rate; i++)
-   {
-      double power = cabs(butterfly_buf[i] * butterfly_buf[i]);
-      set_alias_power(res, i, power);
-      noise += power;
-   }
-
-   res->snr = 10.0 * log10(signal / noise);
-   res->gain = 10.0 * log10(signal);
-
-   for (i = 0; i < 3; i++)
-      res->alias_power[i] = 10.0 * log10(res->alias_power[i]);
-}
-
-int main(int argc, char *argv[])
-{
-   static const float freq_list[] = {
-      0.001, 0.002, 0.003, 0.004, 0.005, 0.006, 0.007, 0.008, 0.009,
-      0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040, 0.045, 0.050,
-      0.060, 0.070, 0.080, 0.090,
-      0.10, 0.15, 0.20, 0.25, 0.30, 0.35,
-      0.40, 0.41, 0.42, 0.43, 0.44, 0.45,
-      0.46, 0.47, 0.48, 0.49,
-      0.495, 0.496, 0.497, 0.498, 0.499,
-   };
-
-   unsigned out_rate, in_rate, samples, i;
-   double ratio;
-   float *input, *output;
-   complex double *butterfly_buf;
-   const rarch_resampler_t *resampler = NULL;
-   const unsigned fft_samples = 1024 * 128;
-   void *re = NULL;
-
-   if (argc != 2)
-   {
-      fprintf(stderr, "Usage: %s <ratio> (out-rate is fixed for FFT).\n", argv[0]);
-      return 1;
-   }
-
-   ratio         = strtod(argv[1], NULL);
-   out_rate      = fft_samples / 2;
-   in_rate       = round(out_rate / ratio);
-   ratio         = (double)out_rate / in_rate;
-
-   samples       = in_rate * 4;
-   input         = calloc(sizeof(float), samples);
-   output        = calloc(sizeof(float), (fft_samples + 16) * 2);
-   butterfly_buf = calloc(sizeof(complex double), fft_samples / 2);
-
-   assert(input);
-   assert(output);
-
-   if (!rarch_resampler_realloc(&re, &resampler, RESAMPLER_IDENT, ratio))
-   {
-      free(input);
-      free(output);
-      free(butterfly_buf);
-      return 1;
-   }
-
-   test_fft();
-
-   for (i = 0; i < sizeof(freq_list) / sizeof(freq_list[0]); i++)
-   {
-      struct resampler_data data;
-      unsigned max_freq;
-      struct snr_result res = {0};
-      unsigned freq = freq_list[i] * in_rate;
-      double omega  = 2.0 * M_PI * freq / in_rate;
-
-      gen_signal(input, omega, 0, samples);
-
-      data.data_in      = input;
-      data.data_out     = output;
-      data.input_frames = in_rate * 2;
-      data.ratio        = ratio;
-
-      rarch_resampler_process(resampler, re, &data);
-
-      /* We generate 2 seconds worth of audio, however, 
-       * only the last second is considered so phase has stabilized. */
-      max_freq = min(in_rate, out_rate) / 2;
-      if (freq > max_freq)
-         continue;
-
-      calculate_snr(&res, freq, max_freq, output + fft_samples - 2048, butterfly_buf, fft_samples);
-
-      printf("SNR @ w = %5.3f : %6.2lf dB, Gain: %6.1lf dB\n",
-            freq_list[i], res.snr, res.gain);
-
-      printf("\tAliases: #1 (w = %5.3f, %6.2lf dB), #2 (w = %5.3f, %6.2lf dB), #3 (w = %5.3f, %6.2lf dB)\n",
-            res.alias_freq[0] / (float)in_rate, res.alias_power[0],
-            res.alias_freq[1] / (float)in_rate, res.alias_power[1],
-            res.alias_freq[2] / (float)in_rate, res.alias_power[2]);
-   }
-
-   rarch_resampler_freep(&resampler, &re);
-
-   free(input);
-   free(output);
-   free(butterfly_buf);
-}
-

audio/test/test-rate-control.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-ffmpeg -i "$1" -f s16le - | ./test-sinc-highest 44100 48000 $3 | ffmpeg -y -ar 48000 -f s16le -ac 2 -i - "$2"

autosave.h

@@ -23,8 +23,6 @@
 
 RETRO_BEGIN_DECLS
 
-typedef struct autosave autosave_t;
-
 /**
  * autosave_lock:
  *

bootstrap/vita/sbrk.c

@@ -0,0 +1,100 @@
+#include <errno.h>
+#include <reent.h>
+#include "../../defines/psp_defines.h"
+#include <psp2/kernel/sysmem.h>
+#include <psp2/kernel/threadmgr.h>
+
+static int _newlib_heap_memblock;
+static unsigned _newlib_heap_size;
+static char *_newlib_heap_base, *_newlib_heap_end, *_newlib_heap_cur;
+static char _newlib_sbrk_mutex[32] __attribute__ ((aligned (8)));
+
+static int _newlib_vm_memblock;
+
+extern int _newlib_heap_size_user __attribute__((weak));
+extern int _newlib_vm_size_user __attribute__((weak));
+
+void * _sbrk_r(struct _reent *reent, ptrdiff_t incr) {
+	if (sceKernelLockLwMutex((struct SceKernelLwMutexWork*)_newlib_sbrk_mutex, 1, 0) < 0)
+		goto fail;
+	if (!_newlib_heap_base || _newlib_heap_cur + incr >= _newlib_heap_end) {
+		sceKernelUnlockLwMutex((struct SceKernelLwMutexWork*)_newlib_sbrk_mutex, 1);
+fail:
+		reent->_errno = ENOMEM;
+		return (void*)-1;
+	}
+
+	char *prev_heap_end = _newlib_heap_cur;
+	_newlib_heap_cur += incr;
+
+	sceKernelUnlockLwMutex((struct SceKernelLwMutexWork*)_newlib_sbrk_mutex, 1);
+	return (void*) prev_heap_end;
+}
+
+void _init_vita_heap(void) {
+
+	int _newlib_vm_size = 0;
+	if (&_newlib_vm_size_user != NULL) {
+		_newlib_vm_size = _newlib_vm_size_user;
+	  _newlib_vm_memblock = sceKernelAllocMemBlockForVM("code", _newlib_vm_size_user);
+
+	  if (_newlib_vm_memblock < 0){
+	    //sceClibPrintf("sceKernelAllocMemBlockForVM failed\n");
+			goto failure;
+		}
+	}else{
+		_newlib_vm_memblock = 0;
+	}
+
+
+	// Create a mutex to use inside _sbrk_r
+	if (sceKernelCreateLwMutex((struct SceKernelLwMutexWork*)_newlib_sbrk_mutex, "sbrk mutex", 0, 0, 0) < 0) {
+		goto failure;
+	}
+
+	if (&_newlib_heap_size_user != NULL) {
+		_newlib_heap_size = _newlib_heap_size_user;
+	}else{
+		_newlib_heap_size = 192 * 1024 * 1024;
+	}
+
+	_newlib_heap_size -= _newlib_vm_size;
+
+	_newlib_heap_memblock = sceKernelAllocMemBlock("Newlib heap", 0x0c20d060, _newlib_heap_size, 0);
+	if (_newlib_heap_memblock < 0) {
+		goto failure;
+	}
+	if (sceKernelGetMemBlockBase(_newlib_heap_memblock, (void**)&_newlib_heap_base) < 0) {
+		goto failure;
+	}
+	_newlib_heap_end = _newlib_heap_base + _newlib_heap_size;
+	_newlib_heap_cur = _newlib_heap_base;
+
+	return;
+failure:
+	_newlib_vm_memblock = 0;
+	_newlib_heap_memblock = 0;
+	_newlib_heap_base = 0;
+	_newlib_heap_cur = 0;
+}
+
+int getVMBlock(){
+  return _newlib_vm_memblock;
+}
+
+void _free_vita_heap(void) {
+
+	// Destroy the sbrk mutex
+	sceKernelDeleteLwMutex((struct SceKernelLwMutexWork*)_newlib_sbrk_mutex);
+
+	// Free the heap memblock to avoid memory leakage.
+	sceKernelFreeMemBlock(_newlib_heap_memblock);
+
+	if(_newlib_vm_memblock)
+  	sceKernelFreeMemBlock(_newlib_vm_memblock);
+
+	_newlib_vm_memblock = 0;
+	_newlib_heap_memblock = 0;
+	_newlib_heap_base = 0;
+	_newlib_heap_cur = 0;
+}

camera/camera_driver.c

@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2011-2017 - 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-
@@ -16,9 +16,14 @@
 
 #include <string.h>
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
 #include "camera_driver.h"
 
 #include "../configuration.h"
+#include "../driver.h"
 #include "../retroarch.h"
 #include "../runloop.h"
 #include "../list_special.h"
@@ -189,7 +194,7 @@ bool camera_driver_ctl(enum rarch_camera_ctl_state state, void *data)
            runloop_msg_queue_push(
                  "Camera is explicitly disabled.\n", 1, 180, false);
         }
-        return false;
+        break;
       case RARCH_CAMERA_CTL_POLL:
         if (!camera_cb.caps)
            return false;
@@ -213,6 +218,9 @@ bool camera_driver_ctl(enum rarch_camera_ctl_state state, void *data)
 
         camera_driver_ctl(RARCH_CAMERA_CTL_FIND_DRIVER, NULL);
 
+        if (!camera_driver)
+           return false;
+
         camera_data = camera_driver->init(
               *settings->camera.device ? settings->camera.device : NULL,
               camera_cb.caps,
@@ -234,5 +242,5 @@ bool camera_driver_ctl(enum rarch_camera_ctl_state state, void *data)
          break;
    }
    
-   return false;
+   return true;
 }

camera/camera_driver.h

@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2011-2017 - 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-

camera/drivers/android.c

@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
  *  Copyright (C) 2012-2015 - Michael Lelli
  * 
  *  RetroArch is free software: you can redistribute it and/or modify it under the terms
@@ -33,8 +33,11 @@ typedef struct android_camera
 static void *android_camera_init(const char *device, uint64_t caps,
       unsigned width, unsigned height)
 {
-   JNIEnv *env;
    jclass class;
+   androidcamera_t *androidcamera  = NULL;
+   JNIEnv                    *env  = NULL;
+   struct android_app *android_app = (struct android_app*)g_android;
+
    (void)device;
    (void)width;
    (void)height;
@@ -45,9 +48,7 @@ static void *android_camera_init(const char *device, uint64_t caps,
       return NULL;
    }
 
-   struct android_app *android_app = (struct android_app*)g_android;
-   androidcamera_t *androidcamera = (androidcamera_t*)
-         calloc(1, sizeof(androidcamera_t));
+   androidcamera = (androidcamera_t*)calloc(1, sizeof(androidcamera_t));
    if (!androidcamera)
       return NULL;
 
@@ -102,8 +103,9 @@ dealloc:
 static void android_camera_free(void *data)
 {
    struct android_app *android_app = (struct android_app*)g_android;
-   androidcamera_t *androidcamera = (androidcamera_t*)data;
-   JNIEnv *env = jni_thread_getenv();
+   androidcamera_t *androidcamera  = (androidcamera_t*)data;
+   JNIEnv                     *env = jni_thread_getenv();
+
    if (!env)
       return;
 
@@ -116,8 +118,9 @@ static void android_camera_free(void *data)
 static bool android_camera_start(void *data)
 {
    struct android_app *android_app = (struct android_app*)g_android;
-   androidcamera_t *androidcamera = (androidcamera_t*)data;
-   JNIEnv *env = jni_thread_getenv();
+   androidcamera_t *androidcamera  = (androidcamera_t*)data;
+   JNIEnv                     *env = jni_thread_getenv();
+
    if (!env)
       return NULL;
 
@@ -141,8 +144,9 @@ static bool android_camera_start(void *data)
 static void android_camera_stop(void *data)
 {
    struct android_app *android_app = (struct android_app*)g_android;
-   androidcamera_t *androidcamera = (androidcamera_t*)data;
-   JNIEnv *env = jni_thread_getenv();
+   androidcamera_t  *androidcamera = (androidcamera_t*)data;
+   JNIEnv                     *env = jni_thread_getenv();
+
    if (!env)
       return;
 
@@ -157,15 +161,16 @@ static bool android_camera_poll(void *data,
       retro_camera_frame_raw_framebuffer_t frame_raw_cb,
       retro_camera_frame_opengl_texture_t frame_gl_cb)
 {
+   jboolean newFrame;
    struct android_app *android_app = (struct android_app*)g_android;
-   androidcamera_t *androidcamera = (androidcamera_t*)data;
-   JNIEnv *env = jni_thread_getenv();
+   androidcamera_t  *androidcamera = (androidcamera_t*)data;
+   JNIEnv                     *env = jni_thread_getenv();
+
    if (!env)
       return NULL;
 
    (void)frame_raw_cb;
 
-   jboolean newFrame;
    CALL_BOOLEAN_METHOD(env, newFrame, android_app->activity->clazz, 
          androidcamera->onCameraPoll);
 

camera/drivers/nullcamera.c

@@ -1,5 +1,6 @@
 /*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2015 - Michael Lelli
+ *  Copyright (C) 2012-2015 - Michael Lelli
+ *  Copyright (C) 2011-2017 - 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-

camera/drivers/rwebcam.c

@@ -1,5 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2012-2015 - Michael Lelli
+ *  Copyright (C) 2011-2017 - 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-

camera/drivers/video4linux2.c

@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
  *  Copyright (C) 2012-2015 - Michael Lelli
  * 
  *  RetroArch is free software: you can redistribute it and/or modify it under the terms
@@ -41,7 +41,6 @@
 #include <compat/strl.h>
 
 #include "../camera_driver.h"
-#include "../../performance_counters.h"
 #include "../../verbosity.h"
 
 struct buffer
@@ -63,19 +62,9 @@ typedef struct video4linux
    uint32_t *buffer_output;
    bool ready;
 
-   char dev_name[PATH_MAX_LENGTH];
+   char dev_name[255];
 } video4linux_t;
 
-static void process_image(video4linux_t *v4l, const uint8_t *buffer_yuv)
-{
-   static struct retro_perf_counter yuv_convert_direct = {0};
-
-   performance_counter_init(&yuv_convert_direct, "yuv_convert_direct");
-   performance_counter_start(&yuv_convert_direct);
-   scaler_ctx_scale(&v4l->scaler, v4l->buffer_output, buffer_yuv);
-   performance_counter_stop(&yuv_convert_direct);
-}
-
 static int xioctl(int fd, int request, void *args)
 {
    int r;
@@ -90,14 +79,12 @@ static int xioctl(int fd, int request, void *args)
 
 static bool init_mmap(void *data)
 {
-   struct v4l2_requestbuffers req;
-   video4linux_t *v4l = (video4linux_t*)data;
+   struct v4l2_requestbuffers req = {0};
+   video4linux_t *v4l             = (video4linux_t*)data;
 
-   memset(&req, 0, sizeof(req));
-
-   req.count  = 4;
-   req.type   = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-   req.memory = V4L2_MEMORY_MMAP;
+   req.count                      = 4;
+   req.type                       = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+   req.memory                     = V4L2_MEMORY_MMAP;
 
    if (xioctl(v4l->fd, (uint8_t)VIDIOC_REQBUFS, &req) == -1)
    {
@@ -124,13 +111,11 @@ static bool init_mmap(void *data)
 
    for (v4l->n_buffers = 0; v4l->n_buffers < req.count; v4l->n_buffers++)
    {
-      struct v4l2_buffer buf;
+      struct v4l2_buffer buf = {0};
 
-      memset(&buf, 0, sizeof(buf));
-
-      buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+      buf.type   = V4L2_BUF_TYPE_VIDEO_CAPTURE;
       buf.memory = V4L2_MEMORY_MMAP;
-      buf.index = v4l->n_buffers;
+      buf.index  = v4l->n_buffers;
 
       if (xioctl(v4l->fd, (uint8_t)VIDIOC_QUERYBUF, &buf) == -1)
       {
@@ -139,7 +124,7 @@ static bool init_mmap(void *data)
       }
 
       v4l->buffers[v4l->n_buffers].length = buf.length;
-      v4l->buffers[v4l->n_buffers].start = mmap(NULL,
+      v4l->buffers[v4l->n_buffers].start  = mmap(NULL,
             buf.length, PROT_READ | PROT_WRITE,
             MAP_SHARED,
             v4l->fd, buf.m.offset);
@@ -156,11 +141,11 @@ static bool init_mmap(void *data)
 
 static bool init_device(void *data)
 {
-   struct v4l2_capability cap;
-   struct v4l2_cropcap cropcap;
    struct v4l2_crop crop;
-   struct v4l2_format fmt;
-   video4linux_t *v4l = (video4linux_t*)data;
+   struct v4l2_capability cap;
+   struct v4l2_format      fmt = {0};
+   struct v4l2_cropcap cropcap = {0};
+   video4linux_t          *v4l = (video4linux_t*)data;
 
    if (xioctl(v4l->fd, (uint8_t)VIDIOC_QUERYCAP, &cap) < 0)
    {
@@ -184,24 +169,21 @@ static bool init_device(void *data)
       return false;
    }
 
-   memset(&cropcap, 0, sizeof(cropcap));
    cropcap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 
    if (xioctl(v4l->fd, (uint8_t)VIDIOC_CROPCAP, &cropcap) == 0)
    {
       crop.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-      crop.c = cropcap.defrect;
+      crop.c    = cropcap.defrect;
       /* Ignore errors here. */
       xioctl(v4l->fd, VIDIOC_S_CROP, &crop);
    }
 
-   memset(&fmt, 0, sizeof(fmt));
-
-   fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-   fmt.fmt.pix.width  = v4l->width;
-   fmt.fmt.pix.height = v4l->height;
+   fmt.type                = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+   fmt.fmt.pix.width       = v4l->width;
+   fmt.fmt.pix.height      = v4l->height;
    fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_YUYV;
-   fmt.fmt.pix.field = V4L2_FIELD_NONE;
+   fmt.fmt.pix.field       = V4L2_FIELD_NONE;
 
    if (xioctl(v4l->fd, (uint8_t)VIDIOC_S_FMT, &fmt) < 0)
    {
@@ -255,9 +237,7 @@ static bool v4l_start(void *data)
 
    for (i = 0; i < v4l->n_buffers; i++)
    {
-      struct v4l2_buffer buf;
-
-      memset(&buf, 0, sizeof(buf));
+      struct v4l2_buffer buf = {0};
 
       buf.type   = V4L2_BUF_TYPE_VIDEO_CAPTURE;
       buf.memory = V4L2_MEMORY_MMAP;
@@ -372,12 +352,10 @@ error:
 
 static bool preprocess_image(void *data)
 {
-   video4linux_t *v4l = (video4linux_t*)data;
-   struct v4l2_buffer buf;
+   video4linux_t     *v4l = (video4linux_t*)data;
+   struct v4l2_buffer buf = {0};
 
-   memset(&buf, 0, sizeof(buf));
-
-   buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+   buf.type   = V4L2_BUF_TYPE_VIDEO_CAPTURE;
    buf.memory = V4L2_MEMORY_MMAP;
 
    if (xioctl(v4l->fd, (uint8_t)VIDIOC_DQBUF, &buf) == -1)
@@ -385,16 +363,18 @@ static bool preprocess_image(void *data)
       switch (errno)
       {
          case EAGAIN:
-            return false;
+            break;
          default:
             RARCH_ERR("VIDIOC_DQBUF.\n");
-            return false;
+            break;
       }
+
+      return false;
    }
 
    retro_assert(buf.index < v4l->n_buffers);
 
-   process_image(v4l, (const uint8_t*)v4l->buffers[buf.index].start);
+   scaler_ctx_scale(&v4l->scaler, v4l->buffer_output, (const uint8_t*)v4l->buffers[buf.index].start);
 
    if (xioctl(v4l->fd, (uint8_t)VIDIOC_QBUF, &buf) == -1)
       RARCH_ERR("VIDIOC_QBUF\n");

cheevos.h

@@ -30,25 +30,6 @@ typedef struct cheevos_ctx_desc
    size_t len;
 } cheevos_ctx_desc_t;
 
-bool cheevos_load(const void *data);
-
-void cheevos_populate_menu(void *data);
-
-bool cheevos_get_description(cheevos_ctx_desc_t *desc);
-
-bool cheevos_apply_cheats(bool *data_bool);
-
-bool cheevos_unload(void);
-
-bool cheevos_toggle_hardcore_mode(void);
-
-bool cheevos_test(void);
-
-bool cheevos_set_cheats(void);
-
-void cheevos_set_support_cheevos(bool state);
-
-
 typedef struct
 {
    unsigned size;
@@ -58,9 +39,36 @@ typedef struct
    unsigned previous;
 } cheevos_var_t;
 
+bool cheevos_load(const void *data);
+
+void cheevos_reset_game(void);
+
+void cheevos_populate_menu(void *data, bool hardcore);
+
+bool cheevos_get_description(cheevos_ctx_desc_t *desc);
+
+bool cheevos_apply_cheats(bool *data_bool);
+
+bool cheevos_unload(void);
+
+bool cheevos_toggle_hardcore_mode(void);
+
+void cheevos_test(void);
+
+bool cheevos_set_cheats(void);
+
+void cheevos_set_support_cheevos(bool state);
+
+bool cheevos_get_support_cheevos(void);
+
 void cheevos_parse_guest_addr(cheevos_var_t *var, unsigned value);
+
 uint8_t *cheevos_get_memory(const cheevos_var_t *var);
 
+extern bool cheevos_loaded;
+extern int cheats_are_enabled;
+extern int cheats_were_enabled;
+
 RETRO_END_DECLS
 
 #endif /* __RARCH_CHEEVOS_H */

command.h

@@ -1,6 +1,7 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
  *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2016 - Brad Parker
  * 
  *  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-
@@ -17,14 +18,15 @@
 #ifndef COMMAND_H__
 #define COMMAND_H__
 
+#include <stdint.h>
+
+#include <boolean.h>
+#include <retro_common_api.h>
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <stdint.h>
-#include <boolean.h>
-#include <retro_common_api.h>
-
 RETRO_BEGIN_DECLS
 
 typedef struct command command_t;
@@ -43,7 +45,6 @@ enum event_command
    CMD_EVENT_SET_PER_GAME_RESOLUTION,
    CMD_EVENT_SET_FRAME_LIMIT,
    /* Loads core. */
-   CMD_EVENT_LOAD_CORE_DEINIT,
    CMD_EVENT_LOAD_CORE,
    CMD_EVENT_LOAD_CORE_PERSIST,
    CMD_EVENT_UNLOAD_CORE,
@@ -141,6 +142,8 @@ enum event_command
    CMD_EVENT_PAUSE,
    CMD_EVENT_PAUSE_CHECKS,
    CMD_EVENT_MENU_SAVE_CURRENT_CONFIG,
+   CMD_EVENT_MENU_SAVE_CURRENT_CONFIG_OVERRIDE_CORE,
+   CMD_EVENT_MENU_SAVE_CURRENT_CONFIG_OVERRIDE_GAME,
    CMD_EVENT_MENU_SAVE_CONFIG,
    CMD_EVENT_MENU_PAUSE_LIBRETRO,
    /* Toggles menu on/off. */
@@ -154,11 +157,6 @@ enum event_command
    CMD_EVENT_SHADER_DIR_DEINIT,
    /* Initializes controllers. */
    CMD_EVENT_CONTROLLERS_INIT,
-   CMD_EVENT_SAVEFILES,
-   /* Initializes savefiles. */
-   CMD_EVENT_SAVEFILES_INIT,
-   /* Deinitializes savefiles. */
-   CMD_EVENT_SAVEFILES_DEINIT,
    /* Initializes cheats. */
    CMD_EVENT_CHEATS_INIT,
    /* Deinitializes cheats. */
@@ -169,12 +167,18 @@ enum event_command
    CMD_EVENT_NETWORK_DEINIT,
    /* Initializes network system. */
    CMD_EVENT_NETWORK_INIT,
-   /* Initializes netplay system. */
+   /* Initializes netplay system with a string or no host specified. */
    CMD_EVENT_NETPLAY_INIT,
+   /* Initializes netplay system with a direct host specified. */
+   CMD_EVENT_NETPLAY_INIT_DIRECT,
+   /* Initializes netplay system with a direct host specified after loading content. */
+   CMD_EVENT_NETPLAY_INIT_DIRECT_DEFERRED,
    /* Deinitializes netplay system. */
    CMD_EVENT_NETPLAY_DEINIT,
    /* Flip netplay players. */
    CMD_EVENT_NETPLAY_FLIP_PLAYERS,
+   /* Switch between netplay gaming and watching. */
+   CMD_EVENT_NETPLAY_GAME_WATCH,
    /* Initializes BSV movie. */
    CMD_EVENT_BSV_MOVIE_INIT,
    /* Deinitializes BSV movie. */
@@ -193,7 +197,6 @@ enum event_command
    CMD_EVENT_RESIZE_WINDOWED_SCALE,
    /* Deinitializes temporary content. */
    CMD_EVENT_TEMPORARY_CONTENT_DEINIT,
-   CMD_EVENT_SUBSYSTEM_FULLPATHS_DEINIT,
    CMD_EVENT_LOG_FILE_DEINIT,
    /* Toggles disk eject. */
    CMD_EVENT_DISK_EJECT_TOGGLE,
@@ -207,16 +210,19 @@ enum event_command
    CMD_EVENT_RUMBLE_STOP,
    /* Toggles mouse grab. */
    CMD_EVENT_GRAB_MOUSE_TOGGLE,
+   /* Toggles game focus. */
+   CMD_EVENT_GAME_FOCUS_TOGGLE,
    /* Toggles fullscreen mode. */
    CMD_EVENT_FULLSCREEN_TOGGLE,
    CMD_EVENT_PERFCNT_REPORT_FRONTEND_LOG,
    CMD_EVENT_VOLUME_UP,
    CMD_EVENT_VOLUME_DOWN,
-   CMD_EVENT_DISABLE_OVERRIDES
+   CMD_EVENT_DISABLE_OVERRIDES,
+   CMD_EVENT_RESTORE_DEFAULT_SHADER_PRESET
 };
 
 #ifdef HAVE_COMMAND
-#if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY)
+#if defined(HAVE_NETWORKING) && defined(HAVE_NETWORK_CMD)
 bool command_network_send(const char *cmd_);
 #endif
 #endif

config.def.h

@@ -1,6 +1,7 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
  *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2016 - Brad Parker
  *
  *  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-
@@ -18,16 +19,19 @@
 #define __CONFIG_DEF_H
 
 #include <boolean.h>
-#include "driver.h"
-#include "gfx/video_driver.h"
+#include "gfx/video_defines.h"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-enum
+#include "input/input_driver.h"
+
+#include "config.def.keybinds.h"
+
+enum video_driver_enum
 {
-   VIDEO_GL = 0,
+   VIDEO_GL                 = 0,
    VIDEO_VULKAN,
    VIDEO_DRM,
    VIDEO_XVIDEO,
@@ -35,6 +39,7 @@ enum
    VIDEO_SDL2,
    VIDEO_EXT,
    VIDEO_WII,
+   VIDEO_WIIU,
    VIDEO_XENON360,
    VIDEO_XDK_D3D,
    VIDEO_PSP1,
@@ -42,13 +47,19 @@ enum
    VIDEO_CTR,
    VIDEO_D3D9,
    VIDEO_VG,
-   VIDEO_NULL,
    VIDEO_OMAP,
    VIDEO_EXYNOS,
    VIDEO_SUNXI,
    VIDEO_DISPMANX,
+   VIDEO_CACA,
+   VIDEO_GDI,
+   VIDEO_VGA,
+   VIDEO_NULL
+};
 
-   AUDIO_RSOUND,
+enum audio_driver_enum
+{
+   AUDIO_RSOUND             = VIDEO_NULL + 1,
    AUDIO_OSS,
    AUDIO_ALSA,
    AUDIO_ALSATHREAD,
@@ -66,16 +77,24 @@ enum
    AUDIO_PS3,
    AUDIO_XENON360,
    AUDIO_WII,
+   AUDIO_WIIU,
    AUDIO_RWEBAUDIO,
    AUDIO_PSP,
    AUDIO_CTR,
-   AUDIO_NULL,
+   AUDIO_NULL
+};
 
-   AUDIO_RESAMPLER_CC,
+enum audio_resampler_driver_enum
+{
+   AUDIO_RESAMPLER_CC       = AUDIO_NULL + 1,
    AUDIO_RESAMPLER_SINC,
    AUDIO_RESAMPLER_NEAREST,
+   AUDIO_RESAMPLER_NULL
+};
 
-   INPUT_ANDROID,
+enum input_driver_enum
+{
+   INPUT_ANDROID            = AUDIO_RESAMPLER_NULL + 1,
    INPUT_SDL,
    INPUT_SDL2,
    INPUT_X,
@@ -86,17 +105,23 @@ enum
    INPUT_CTR,
    INPUT_XENON360,
    INPUT_WII,
+   INPUT_WIIU,
    INPUT_XINPUT,
    INPUT_UDEV,
    INPUT_LINUXRAW,
    INPUT_COCOA,
    INPUT_QNX,
    INPUT_RWEBINPUT,
-   INPUT_NULL,
+   INPUT_DOS,
+   INPUT_NULL
+};
 
-   JOYPAD_PS3,
+enum joypad_driver_enum
+{
+   JOYPAD_PS3               = INPUT_NULL + 1,
    JOYPAD_XINPUT,
    JOYPAD_GX,
+   JOYPAD_WIIU,
    JOYPAD_XDK,
    JOYPAD_PSP,
    JOYPAD_CTR,
@@ -105,30 +130,53 @@ enum
    JOYPAD_LINUXRAW,
    JOYPAD_ANDROID,
    JOYPAD_SDL,
+   JOYPAD_DOS,
    JOYPAD_HID,
    JOYPAD_QNX,
-   JOYPAD_NULL,
+   JOYPAD_NULL
+};
 
-   CAMERA_V4L2,
+enum camera_driver_enum
+{
+   CAMERA_V4L2              = JOYPAD_NULL + 1,
    CAMERA_RWEBCAM,
    CAMERA_ANDROID,
    CAMERA_AVFOUNDATION,
-   CAMERA_NULL,
+   CAMERA_NULL
+};
 
-   LOCATION_ANDROID,
+enum wifi_driver_enum
+{
+   WIFI_CONNMANCTL          = CAMERA_NULL + 1,
+   WIFI_NULL
+};
+
+enum location_driver_enum
+{
+   LOCATION_ANDROID         = WIFI_NULL + 1,
    LOCATION_CORELOCATION,
-   LOCATION_NULL,
+   LOCATION_NULL
+};
 
-   OSK_PS3,
-   OSK_NULL,
+enum osk_driver_enum
+{
+   OSK_PS3                  = LOCATION_NULL + 1,
+   OSK_NULL
+};
 
-   MENU_RGUI,
+enum menu_driver_enum
+{
+   MENU_RGUI                = OSK_NULL + 1,
    MENU_XUI,
    MENU_MATERIALUI,
    MENU_XMB,
    MENU_NUKLEAR,
+   MENU_NULL
+};
 
-   RECORD_FFMPEG,
+enum record_driver_enum
+{
+   RECORD_FFMPEG            = MENU_NULL + 1,
    RECORD_NULL
 };
 
@@ -144,6 +192,8 @@ enum
 #define VIDEO_DEFAULT_DRIVER VIDEO_GL
 #elif defined(GEKKO)
 #define VIDEO_DEFAULT_DRIVER VIDEO_WII
+#elif defined(WIIU)
+#define VIDEO_DEFAULT_DRIVER VIDEO_WIIU
 #elif defined(XENON)
 #define VIDEO_DEFAULT_DRIVER VIDEO_XENON360
 #elif (defined(_XBOX1) || defined(_XBOX360)) && (defined(HAVE_D3D8) || defined(HAVE_D3D9))
@@ -164,6 +214,10 @@ enum
 #define VIDEO_DEFAULT_DRIVER VIDEO_SDL
 #elif defined(HAVE_SDL2)
 #define VIDEO_DEFAULT_DRIVER VIDEO_SDL2
+#elif defined(_WIN32) && !defined(_XBOX)
+#define VIDEO_DEFAULT_DRIVER VIDEO_GDI
+#elif defined(DJGPP)
+#define VIDEO_DEFAULT_DRIVER VIDEO_VGA
 #elif defined(HAVE_DYLIB) && !defined(ANDROID)
 #define VIDEO_DEFAULT_DRIVER VIDEO_EXT
 #else
@@ -176,16 +230,18 @@ enum
 #define AUDIO_DEFAULT_DRIVER AUDIO_XENON360
 #elif defined(GEKKO)
 #define AUDIO_DEFAULT_DRIVER AUDIO_WII
+#elif defined(WIIU)
+#define AUDIO_DEFAULT_DRIVER AUDIO_WIIU
 #elif defined(PSP) || defined(VITA)
 #define AUDIO_DEFAULT_DRIVER AUDIO_PSP
 #elif defined(_3DS)
 #define AUDIO_DEFAULT_DRIVER AUDIO_CTR
+#elif defined(HAVE_PULSE)
+#define AUDIO_DEFAULT_DRIVER AUDIO_PULSE
 #elif defined(HAVE_ALSA) && defined(HAVE_VIDEOCORE)
 #define AUDIO_DEFAULT_DRIVER AUDIO_ALSATHREAD
 #elif defined(HAVE_ALSA)
 #define AUDIO_DEFAULT_DRIVER AUDIO_ALSA
-#elif defined(HAVE_PULSE)
-#define AUDIO_DEFAULT_DRIVER AUDIO_PULSE
 #elif defined(HAVE_OSS)
 #define AUDIO_DEFAULT_DRIVER AUDIO_OSS
 #elif defined(HAVE_JACK)
@@ -216,7 +272,7 @@ enum
 #define AUDIO_DEFAULT_DRIVER AUDIO_NULL
 #endif
 
-#ifdef PSP
+#if defined(PSP) || defined(EMSCRIPTEN)
 #define AUDIO_DEFAULT_RESAMPLER_DRIVER  AUDIO_RESAMPLER_CC
 #else
 #define AUDIO_DEFAULT_RESAMPLER_DRIVER  AUDIO_RESAMPLER_SINC
@@ -234,6 +290,8 @@ enum
 #define INPUT_DEFAULT_DRIVER INPUT_XINPUT
 #elif defined(ANDROID)
 #define INPUT_DEFAULT_DRIVER INPUT_ANDROID
+#elif defined(EMSCRIPTEN) && defined(HAVE_SDL2)
+#define INPUT_DEFAULT_DRIVER INPUT_SDL2
 #elif defined(EMSCRIPTEN)
 #define INPUT_DEFAULT_DRIVER INPUT_RWEBINPUT
 #elif defined(_WIN32)
@@ -246,6 +304,8 @@ enum
 #define INPUT_DEFAULT_DRIVER INPUT_CTR
 #elif defined(GEKKO)
 #define INPUT_DEFAULT_DRIVER INPUT_WII
+#elif defined(WIIU)
+#define INPUT_DEFAULT_DRIVER INPUT_WIIU
 #elif defined(HAVE_UDEV)
 #define INPUT_DEFAULT_DRIVER INPUT_UDEV
 #elif defined(__linux__) && !defined(ANDROID)
@@ -262,6 +322,8 @@ enum
 #define INPUT_DEFAULT_DRIVER INPUT_SDL
 #elif defined(HAVE_SDL2)
 #define INPUT_DEFAULT_DRIVER INPUT_SDL2
+#elif defined(DJGPP)
+#define INPUT_DEFAULT_DRIVER INPUT_DOS
 #else
 #define INPUT_DEFAULT_DRIVER INPUT_NULL
 #endif
@@ -272,6 +334,8 @@ enum
 #define JOYPAD_DEFAULT_DRIVER JOYPAD_XINPUT
 #elif defined(GEKKO)
 #define JOYPAD_DEFAULT_DRIVER JOYPAD_GX
+#elif defined(WIIU)
+#define JOYPAD_DEFAULT_DRIVER JOYPAD_WIIU
 #elif defined(_XBOX)
 #define JOYPAD_DEFAULT_DRIVER JOYPAD_XDK
 #elif defined(PSP) || defined(VITA)
@@ -288,6 +352,8 @@ enum
 #define JOYPAD_DEFAULT_DRIVER JOYPAD_ANDROID
 #elif defined(HAVE_SDL) || defined(HAVE_SDL2)
 #define JOYPAD_DEFAULT_DRIVER JOYPAD_SDL
+#elif defined(DJGPP)
+#define JOYPAD_DEFAULT_DRIVER JOYPAD_DOS
 #elif defined(HAVE_HID)
 #define JOYPAD_DEFAULT_DRIVER JOYPAD_HID
 #elif defined(__QNX__)
@@ -308,6 +374,12 @@ enum
 #define CAMERA_DEFAULT_DRIVER CAMERA_NULL
 #endif
 
+#if defined(HAVE_LAKKA)
+#define WIFI_DEFAULT_DRIVER WIFI_CONNMANCTL
+#else
+#define WIFI_DEFAULT_DRIVER WIFI_NULL
+#endif
+
 #if defined(ANDROID)
 #define LOCATION_DEFAULT_DRIVER LOCATION_ANDROID
 #elif defined(HAVE_CORELOCATION) && (defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH))
@@ -324,17 +396,19 @@ enum
 
 #if defined(HAVE_XUI)
 #define MENU_DEFAULT_DRIVER MENU_XUI
-#elif defined(IOS) || defined(ANDROID) || defined(__QNX__)
+#elif defined(HAVE_MATERIALUI) && defined(RARCH_MOBILE)
 #define MENU_DEFAULT_DRIVER MENU_MATERIALUI
-#elif defined(__MACH__) && defined(HAVE_XMB) || defined(__CELLOS_LV2__)
+#elif defined(HAVE_XMB)
 #define MENU_DEFAULT_DRIVER MENU_XMB
-#else
+#elif defined(HAVE_RGUI)
 #define MENU_DEFAULT_DRIVER MENU_RGUI
+#else
+#define MENU_DEFAULT_DRIVER MENU_NULL
 #endif
 
 #if defined(XENON) || defined(_XBOX360) || defined(__CELLOS_LV2__)
 #define DEFAULT_ASPECT_RATIO 1.7778f
-#elif defined(_XBOX1) || defined(GEKKO) || defined(ANDROID) || defined(__QNX__)
+#elif defined(_XBOX1) || defined(GEKKO) || defined(ANDROID)
 #define DEFAULT_ASPECT_RATIO 1.3333f
 #else
 #define DEFAULT_ASPECT_RATIO -1.0f
@@ -359,15 +433,20 @@ static bool bundle_assets_extract_enable = false;
 #endif
 
 static const bool def_history_list_enable = true;
+static const bool def_playlist_entry_remove = true;
 
 static const unsigned int def_user_language = 0;
 
-#if (defined(_WIN32) && !defined(_XBOX))
+#if (defined(_WIN32) && !defined(_XBOX)) || (defined(__linux) && !defined(ANDROID) && !defined(HAVE_LAKKA)) || (defined(__MACH__) && !defined(IOS))
 static const bool def_mouse_enable = true;
 #else
 static const bool def_mouse_enable = false;
 #endif
 
+#ifdef HAVE_CHEEVOS
+static const bool cheevos_enable = false;
+#endif
+
 /* VIDEO */
 
 #if defined(_XBOX360)
@@ -394,6 +473,12 @@ static const bool windowed_fullscreen = true;
  * specific monitors, 1 being the first monitor. */
 static const unsigned monitor_index = 0;
 
+/* Window */
+/* Window size. A value of 0 uses window scale
+ * multiplied by the core framebuffer size. */
+static const unsigned window_x = 0;
+static const unsigned window_y = 0;
+
 /* Fullscreen resolution. A value of 0 uses the desktop
  * resolution. */
 static const unsigned fullscreen_x = 0;
@@ -404,7 +489,7 @@ static const bool load_dummy_on_core_shutdown = false;
 #else
 static const bool load_dummy_on_core_shutdown = true;
 #endif
-
+static const bool check_firmware_before_loading = false;
 /* Forcibly disable composition.
  * Only valid on Windows Vista/7/8 for now. */
 static const bool disable_composition = false;
@@ -464,8 +549,10 @@ static const bool video_shared_context = false;
 /* Sets GC/Wii screen width. */
 static const unsigned video_viwidth = 640;
 
+#ifdef GEKKO
 /* Removes 480i flicker, smooths picture a little. */
 static const bool video_vfilter = true;
+#endif
 
 /* Smooths picture. */
 static const bool video_smooth = true;
@@ -507,26 +594,40 @@ static unsigned aspect_ratio_idx = ASPECT_RATIO_CORE;
 /* Save configuration file on exit. */
 static bool config_save_on_exit = true;
 
-static const bool default_overlay_enable = false;
+static bool show_hidden_files = true;
 
 static const bool overlay_hide_in_menu = true;
 
+static const bool display_keyboard_overlay = false;
+
 #ifdef HAVE_MENU
 #include "menu/menu_display.h"
 
 static bool default_block_config_read = true;
 
+#ifdef HAVE_XMB
 static unsigned xmb_scale_factor = 100;
 static unsigned xmb_alpha_factor = 75;
-
 static unsigned xmb_icon_theme   = XMB_ICON_THEME_MONOCHROME;
 static unsigned xmb_theme        = XMB_THEME_ELECTRIC_BLUE;
-
 #ifdef HAVE_LAKKA
 static bool xmb_shadows_enable   = false;
 #else
 static bool xmb_shadows_enable   = true;
 #endif
+static bool xmb_show_settings    = true;
+#ifdef HAVE_IMAGEVIEWER
+static bool xmb_show_images      = true;
+#endif
+#ifdef HAVE_FFMPEG
+static bool xmb_show_music       = true;
+static bool xmb_show_video       = true;
+#endif
+static bool xmb_show_history     = true;
+#ifdef HAVE_LIBRETRODB
+static bool xmb_show_add     	 = true;
+#endif
+#endif
 
 static float menu_wallpaper_opacity = 0.300;
 
@@ -534,53 +635,50 @@ static float menu_footer_opacity = 1.000;
 
 static float menu_header_opacity = 1.000;
 
-static unsigned menu_background_gradient = 4;
-
 #if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL) || defined(HAVE_VULKAN)
-#if defined(HAVE_OPENGLES2) || defined(OSX_PPC)
+#if defined(HAVE_OPENGLES2) || (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
 static unsigned menu_shader_pipeline = 1;
 #else
 static unsigned menu_shader_pipeline = 2;
 #endif
 #endif
 
-static bool show_advanced_settings    = true;
+static bool show_advanced_settings            = false;
 static const uint32_t menu_entry_normal_color = 0xffffffff;
 static const uint32_t menu_entry_hover_color  = 0xff64ff64;
 static const uint32_t menu_title_color        = 0xff64ff64;
+
 #else
 static bool default_block_config_read = false;
 #endif
 
-#ifdef RARCH_CONSOLE
-static bool default_core_specific_config = true;
-#else
-static bool default_core_specific_config = false;
-#endif
-
 static bool default_game_specific_options = false;
 static bool default_auto_overrides_enable = true;
 static bool default_auto_remaps_enable = true;
+static bool default_auto_shaders_enable = true;
 
 static bool default_sort_savefiles_enable = false;
 static bool default_sort_savestates_enable = false;
 
-static unsigned default_menu_btn_ok          = RETRO_DEVICE_ID_JOYPAD_A;
-static unsigned default_menu_btn_cancel      = RETRO_DEVICE_ID_JOYPAD_B;
-static unsigned default_menu_btn_search      = RETRO_DEVICE_ID_JOYPAD_X;
-static unsigned default_menu_btn_default     = RETRO_DEVICE_ID_JOYPAD_START;
-static unsigned default_menu_btn_info        = RETRO_DEVICE_ID_JOYPAD_SELECT;
-static unsigned default_menu_btn_scroll_down = RETRO_DEVICE_ID_JOYPAD_R;
-static unsigned default_menu_btn_scroll_up   = RETRO_DEVICE_ID_JOYPAD_L;
-
 #if defined(__CELLOS_LV2__) || defined(_XBOX1) || defined(_XBOX360)
-static unsigned menu_toggle_gamepad_combo    = 2;
+static unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_L3_R3;
+#elif defined(VITA)
+static unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_L1_R1_START_SELECT;
 #else
-static unsigned menu_toggle_gamepad_combo    = 0;
+static unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_NONE;
 #endif
 
-#ifdef ANDROID
-static bool back_as_menu_toggle_enable = true;
+#if defined(VITA)
+static unsigned input_backtouch_enable       = false;
+static unsigned input_backtouch_toggle       = false;
+#endif
+
+static bool all_users_control_menu = false;
+
+#if defined(ANDROID) || defined(_WIN32)
+static bool menu_swap_ok_cancel_buttons = true;
+#else
+static bool menu_swap_ok_cancel_buttons = false;
 #endif
 
 /* Crop overscanned frames. */
@@ -634,10 +732,8 @@ static const bool font_enable = true;
  * disable VSync, and leave this at its default. */
 #ifdef _3DS
 static const float refresh_rate = (32730.0 * 8192.0) / 4481134.0 ;
-#elif defined(RARCH_CONSOLE)
-static const float refresh_rate = 60/1.001;
 #else
-static const float refresh_rate = 59.95;
+static const float refresh_rate = 60/1.001;
 #endif
 
 /* Allow games to set rotation. If false, rotation requests are
@@ -664,7 +760,7 @@ static const char *audio_device = NULL;
 
 /* Desired audio latency in milliseconds. Might not be honored
  * if driver can't provide given latency. */
-#ifdef ANDROID
+#if defined(ANDROID) || defined(EMSCRIPTEN)
 /* For most Android devices, 64ms is way too low. */
 static const int out_latency = 128;
 #else
@@ -709,16 +805,29 @@ static const unsigned rewind_buffer_size = 20 << 20; /* 20MiB */
 static const unsigned rewind_granularity = 1;
 
 /* Pause gameplay when gameplay loses focus. */
+#ifdef EMSCRIPTEN
+static const bool pause_nonactive = false;
+#else
 static const bool pause_nonactive = true;
+#endif
 
 /* Saves non-volatile SRAM at a regular interval.
  * It is measured in seconds. A value of 0 disables autosave. */
 static const unsigned autosave_interval = 0;
 
+/* Netplay without savestates/rewind */
+static const bool netplay_stateless_mode = false;
+
 /* When being client over netplay, use keybinds for
  * user 1 rather than user 2. */
 static const bool netplay_client_swap_input = true;
 
+static const bool netplay_nat_traversal = false;
+
+static const unsigned netplay_delay_frames = 16;
+
+static const int netplay_check_frames = 30;
+
 /* On save state load, block SRAM from being overwritten.
  * This could potentially lead to buggy games. */
 static const bool block_sram_overwrite = false;
@@ -736,6 +845,8 @@ static const bool savestate_auto_index = false;
 static const bool savestate_auto_save = false;
 static const bool savestate_auto_load = false;
 
+static const bool savestate_thumbnail_enable = false;
+
 /* Slowmotion ratio. */
 static const float slowmotion_ratio = 3.0;
 
@@ -762,6 +873,8 @@ static const bool menu_dpi_override_enable = true;
 
 #ifdef RARCH_MOBILE
 static const unsigned menu_dpi_override_value = 72;
+#elif defined(__CELLOS_LV2__)
+static const unsigned menu_dpi_override_value = 360;
 #else
 static const unsigned menu_dpi_override_value = 200;
 #endif
@@ -817,6 +930,8 @@ static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/androi
 #else
 static char buildbot_server_url[] = "";
 #endif
+#elif defined(__QNX__)
+static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/blackberry/latest/";
 #elif defined(IOS)
 static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/apple/ios/latest/";
 #elif defined(OSX)
@@ -830,7 +945,7 @@ static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/apple/
 #elif defined(_WIN32) && !defined(_XBOX)
 #if defined(__x86_64__)
 static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/win-x86_64/latest/";
-#elif defined(__i386__) || defined(__i486__) || defined(__i686__)
+#elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64)
 static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/win-x86/latest/";
 #endif
 #elif defined(__linux__)
@@ -847,104 +962,4 @@ static char buildbot_server_url[] = "";
 
 static char buildbot_assets_server_url[] = "http://buildbot.libretro.com/assets/";
 
-#ifndef IS_SALAMANDER
-#include "intl/intl.h"
-
-/* User 1 */
-static const struct retro_keybind retro_keybinds_1[] = {
-    /*     | RetroPad button            | desc                           | keyboard key  | js btn |     js axis   | */
-   { true, RETRO_DEVICE_ID_JOYPAD_B,      RETRO_LBL_JOYPAD_B,              RETROK_z,       NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_Y,      RETRO_LBL_JOYPAD_Y,              RETROK_a,       NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_SELECT, RETRO_LBL_JOYPAD_SELECT,         RETROK_RSHIFT,  NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_START,  RETRO_LBL_JOYPAD_START,          RETROK_RETURN,  NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_UP,     RETRO_LBL_JOYPAD_UP,             RETROK_UP,      NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_DOWN,   RETRO_LBL_JOYPAD_DOWN,           RETROK_DOWN,    NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_LEFT,   RETRO_LBL_JOYPAD_LEFT,           RETROK_LEFT,    NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_RIGHT,  RETRO_LBL_JOYPAD_RIGHT,          RETROK_RIGHT,   NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_A,      RETRO_LBL_JOYPAD_A,              RETROK_x,       NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_X,      RETRO_LBL_JOYPAD_X,              RETROK_s,       NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_L,      RETRO_LBL_JOYPAD_L,              RETROK_q,       NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_R,      RETRO_LBL_JOYPAD_R,              RETROK_w,       NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_L2,     RETRO_LBL_JOYPAD_L2,             RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_R2,     RETRO_LBL_JOYPAD_R2,             RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_L3,     RETRO_LBL_JOYPAD_L3,             RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_R3,     RETRO_LBL_JOYPAD_R3,             RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-
-   { true, RARCH_ANALOG_LEFT_X_PLUS,      RETRO_LBL_ANALOG_LEFT_X_PLUS,    RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_LEFT_X_MINUS,     RETRO_LBL_ANALOG_LEFT_X_MINUS,   RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_LEFT_Y_PLUS,      RETRO_LBL_ANALOG_LEFT_Y_PLUS,    RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_LEFT_Y_MINUS,     RETRO_LBL_ANALOG_LEFT_Y_MINUS,   RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_RIGHT_X_PLUS,     RETRO_LBL_ANALOG_RIGHT_X_PLUS,   RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_RIGHT_X_MINUS,    RETRO_LBL_ANALOG_RIGHT_X_MINUS,  RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_RIGHT_Y_PLUS,     RETRO_LBL_ANALOG_RIGHT_Y_PLUS,   RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_RIGHT_Y_MINUS,    RETRO_LBL_ANALOG_RIGHT_Y_MINUS,  RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-
-   { true, RARCH_TURBO_ENABLE,             RETRO_LBL_TURBO_ENABLE,         RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_FAST_FORWARD_KEY,         RETRO_LBL_FAST_FORWARD_KEY,     RETROK_SPACE,   NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_FAST_FORWARD_HOLD_KEY,    RETRO_LBL_FAST_FORWARD_HOLD_KEY,RETROK_l,       NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LOAD_STATE_KEY,           RETRO_LBL_LOAD_STATE_KEY,       RETROK_F4,      NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_SAVE_STATE_KEY,           RETRO_LBL_SAVE_STATE_KEY,       RETROK_F2,      NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_FULLSCREEN_TOGGLE_KEY,    RETRO_LBL_FULLSCREEN_TOGGLE_KEY,RETROK_f,       NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_QUIT_KEY,                 RETRO_LBL_QUIT_KEY,             RETROK_ESCAPE,  NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_STATE_SLOT_PLUS,          RETRO_LBL_STATE_SLOT_PLUS,      RETROK_F7,      NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_STATE_SLOT_MINUS,         RETRO_LBL_STATE_SLOT_MINUS,     RETROK_F6,      NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_REWIND,                   RETRO_LBL_REWIND,               RETROK_r,       NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_MOVIE_RECORD_TOGGLE,      RETRO_LBL_MOVIE_RECORD_TOGGLE,  RETROK_o,       NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_PAUSE_TOGGLE,             RETRO_LBL_PAUSE_TOGGLE,         RETROK_p,       NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_FRAMEADVANCE,             RETRO_LBL_FRAMEADVANCE,         RETROK_k,       NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_RESET,                    RETRO_LBL_RESET,                RETROK_h,       NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_SHADER_NEXT,              RETRO_LBL_SHADER_NEXT,          RETROK_m,       NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_SHADER_PREV,              RETRO_LBL_SHADER_PREV,          RETROK_n,       NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_CHEAT_INDEX_PLUS,         RETRO_LBL_CHEAT_INDEX_PLUS,     RETROK_y,       NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_CHEAT_INDEX_MINUS,        RETRO_LBL_CHEAT_INDEX_MINUS,    RETROK_t,       NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_CHEAT_TOGGLE,             RETRO_LBL_CHEAT_TOGGLE,         RETROK_u,       NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_SCREENSHOT,               RETRO_LBL_SCREENSHOT,           RETROK_F8,      NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_MUTE,                     RETRO_LBL_MUTE,                 RETROK_F9,      NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_OSK,                      RETRO_LBL_OSK,                  RETROK_F12,      NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_NETPLAY_FLIP,             RETRO_LBL_NETPLAY_FLIP,         RETROK_i,       NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_SLOWMOTION,               RETRO_LBL_SLOWMOTION,           RETROK_e,       NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ENABLE_HOTKEY,            RETRO_LBL_ENABLE_HOTKEY,        RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_VOLUME_UP,                RETRO_LBL_VOLUME_UP,            RETROK_KP_PLUS, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_VOLUME_DOWN,              RETRO_LBL_VOLUME_DOWN,          RETROK_KP_MINUS,NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_OVERLAY_NEXT,             RETRO_LBL_OVERLAY_NEXT,         RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_DISK_EJECT_TOGGLE,        RETRO_LBL_DISK_EJECT_TOGGLE,    RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_DISK_NEXT,                RETRO_LBL_DISK_NEXT,            RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_DISK_PREV,                RETRO_LBL_DISK_PREV,            RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_GRAB_MOUSE_TOGGLE,        RETRO_LBL_GRAB_MOUSE_TOGGLE,    RETROK_F11,     NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_MENU_TOGGLE,              RETRO_LBL_MENU_TOGGLE,          RETROK_F1,      NO_BTN, 0, AXIS_NONE },
-};
-
-/* Users 2 to MAX_USERS */
-static const struct retro_keybind retro_keybinds_rest[] = {
-    /*     | RetroPad button            | desc                           | keyboard key  | js btn |     js axis   | */
-   { true, RETRO_DEVICE_ID_JOYPAD_B,      RETRO_LBL_JOYPAD_B,              RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_Y,      RETRO_LBL_JOYPAD_Y,              RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_SELECT, RETRO_LBL_JOYPAD_SELECT,         RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_START,  RETRO_LBL_JOYPAD_START,          RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_UP,     RETRO_LBL_JOYPAD_UP,             RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_DOWN,   RETRO_LBL_JOYPAD_DOWN,           RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_LEFT,   RETRO_LBL_JOYPAD_LEFT,           RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_RIGHT,  RETRO_LBL_JOYPAD_RIGHT,          RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_A,      RETRO_LBL_JOYPAD_A,              RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_X,      RETRO_LBL_JOYPAD_X,              RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_L,      RETRO_LBL_JOYPAD_L,              RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_R,      RETRO_LBL_JOYPAD_R,              RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_L2,     RETRO_LBL_JOYPAD_L2,             RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_R2,     RETRO_LBL_JOYPAD_R2,             RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_L3,     RETRO_LBL_JOYPAD_L3,             RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_R3,     RETRO_LBL_JOYPAD_R3,             RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-
-   { true, RARCH_ANALOG_LEFT_X_PLUS,      RETRO_LBL_ANALOG_LEFT_X_PLUS,    RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_LEFT_X_MINUS,     RETRO_LBL_ANALOG_LEFT_X_MINUS,   RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_LEFT_Y_PLUS,      RETRO_LBL_ANALOG_LEFT_Y_PLUS,    RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_LEFT_Y_MINUS,     RETRO_LBL_ANALOG_LEFT_Y_MINUS,   RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_RIGHT_X_PLUS,     RETRO_LBL_ANALOG_RIGHT_X_PLUS,   RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_RIGHT_X_MINUS,    RETRO_LBL_ANALOG_RIGHT_X_MINUS,  RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_RIGHT_Y_PLUS,     RETRO_LBL_ANALOG_RIGHT_Y_PLUS,   RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_RIGHT_Y_MINUS,    RETRO_LBL_ANALOG_RIGHT_Y_MINUS,  RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_TURBO_ENABLE,            RETRO_LBL_TURBO_ENABLE,          RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-};
-
-#endif
-
 #endif

config.def.keybinds.h

@@ -0,0 +1,186 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2016 - Brad Parker
+ *
+ *  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 __CONFIG_DEF_KEYBINDS_H
+#define __CONFIG_DEF_KEYBINDS_H
+
+#ifndef IS_SALAMANDER
+
+/* User 1 */
+static const struct retro_keybind retro_keybinds_1[] = {
+    /*     | RetroPad button              | enum                           | keyboard key  | js btn   | js axis | */
+#ifdef __QNX__
+   { true, RETRO_DEVICE_ID_JOYPAD_B,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B,              RETROK_k,       NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_Y,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_Y,              RETROK_i,       NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_SELECT, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_SELECT,         RETROK_v,       NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_START,  MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_START,          RETROK_b,       NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_UP,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_UP,             RETROK_e,       NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_DOWN,   MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_DOWN,           RETROK_s,       NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_LEFT,   MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_LEFT,           RETROK_w,       NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_RIGHT,  MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_RIGHT,          RETROK_d,       NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_A,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_A,              RETROK_l,       NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_X,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_X,              RETROK_o,       NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_L,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L,              RETROK_f,       NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_R,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R,              RETROK_j,       NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_L2,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L2,             RETROK_r,       NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_R2,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R2,             RETROK_u,       NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_L3,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L3,             RETROK_g,       NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_R3,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R3,             RETROK_h,       NO_BTN, 0, AXIS_NONE },
+
+   { true, RARCH_ANALOG_LEFT_X_PLUS,      MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_PLUS,    RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_LEFT_X_MINUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_MINUS,   RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_LEFT_Y_PLUS,      MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_PLUS,    RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_LEFT_Y_MINUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_MINUS,   RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_RIGHT_X_PLUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_PLUS,   RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_RIGHT_X_MINUS,    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_MINUS,  RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_RIGHT_Y_PLUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_PLUS,   RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_RIGHT_Y_MINUS,    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_MINUS,  RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+
+   { true, RARCH_TURBO_ENABLE,             MENU_ENUM_LABEL_VALUE_INPUT_TURBO_ENABLE,              RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_FAST_FORWARD_KEY,         MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_KEY,     RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_FAST_FORWARD_HOLD_KEY,    MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_HOLD_KEY,RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LOAD_STATE_KEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_LOAD_STATE_KEY,       RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_SAVE_STATE_KEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_SAVE_STATE_KEY,       RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_FULLSCREEN_TOGGLE_KEY,    MENU_ENUM_LABEL_VALUE_INPUT_META_FULLSCREEN_TOGGLE_KEY,RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_QUIT_KEY,                 MENU_ENUM_LABEL_VALUE_INPUT_META_QUIT_KEY,             RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_STATE_SLOT_PLUS,          MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_PLUS,      RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_STATE_SLOT_MINUS,         MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_MINUS,     RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_REWIND,                   MENU_ENUM_LABEL_VALUE_INPUT_META_REWIND,               RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_MOVIE_RECORD_TOGGLE,      MENU_ENUM_LABEL_VALUE_INPUT_META_MOVIE_RECORD_TOGGLE,  RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_PAUSE_TOGGLE,             MENU_ENUM_LABEL_VALUE_INPUT_META_PAUSE_TOGGLE,         RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_FRAMEADVANCE,             MENU_ENUM_LABEL_VALUE_INPUT_META_FRAMEADVANCE,         RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_RESET,                    MENU_ENUM_LABEL_VALUE_INPUT_META_RESET,                RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_SHADER_NEXT,              MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_NEXT,          RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_SHADER_PREV,              MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_PREV,          RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_CHEAT_INDEX_PLUS,         MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_PLUS,     RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_CHEAT_INDEX_MINUS,        MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_MINUS,    RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_CHEAT_TOGGLE,             MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_TOGGLE,         RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_SCREENSHOT,               MENU_ENUM_LABEL_VALUE_INPUT_META_SCREENSHOT,           RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_MUTE,                     MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE,                 RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_OSK,                      MENU_ENUM_LABEL_VALUE_INPUT_META_OSK,                  RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_NETPLAY_FLIP,             MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_FLIP,         RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_NETPLAY_GAME_WATCH,       MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH,   RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_SLOWMOTION,               MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION,           RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ENABLE_HOTKEY,            MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY,        RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_VOLUME_UP,                MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP,            RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_VOLUME_DOWN,              MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_DOWN,          RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_OVERLAY_NEXT,             MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT,         RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_DISK_EJECT_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_EJECT_TOGGLE,    RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_DISK_NEXT,                MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_NEXT,            RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_DISK_PREV,                MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_PREV,            RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_GRAB_MOUSE_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_GRAB_MOUSE_TOGGLE,    RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_GAME_FOCUS_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_GAME_FOCUS_TOGGLE,    RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_MENU_TOGGLE,              MENU_ENUM_LABEL_VALUE_INPUT_META_MENU_TOGGLE,          RETROK_SPACE,   NO_BTN, 0, AXIS_NONE },
+#else
+   { true, RETRO_DEVICE_ID_JOYPAD_B,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B,              RETROK_z,       NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_Y,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_Y,              RETROK_a,       NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_SELECT, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_SELECT,         RETROK_RSHIFT,  NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_START,  MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_START,          RETROK_RETURN,  NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_UP,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_UP,             RETROK_UP,      NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_DOWN,   MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_DOWN,           RETROK_DOWN,    NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_LEFT,   MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_LEFT,           RETROK_LEFT,    NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_RIGHT,  MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_RIGHT,          RETROK_RIGHT,   NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_A,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_A,              RETROK_x,       NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_X,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_X,              RETROK_s,       NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_L,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L,              RETROK_q,       NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_R,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R,              RETROK_w,       NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_L2,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L2,             RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_R2,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R2,             RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_L3,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L3,             RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_R3,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R3,             RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+
+   { true, RARCH_ANALOG_LEFT_X_PLUS,      MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_PLUS,    RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_LEFT_X_MINUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_MINUS,   RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_LEFT_Y_PLUS,      MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_PLUS,    RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_LEFT_Y_MINUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_MINUS,   RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_RIGHT_X_PLUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_PLUS,   RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_RIGHT_X_MINUS,    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_MINUS,  RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_RIGHT_Y_PLUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_PLUS,   RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_RIGHT_Y_MINUS,    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_MINUS,  RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+
+   { true, RARCH_TURBO_ENABLE,             MENU_ENUM_LABEL_VALUE_INPUT_TURBO_ENABLE,         RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_FAST_FORWARD_KEY,         MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_KEY,     RETROK_SPACE,   NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_FAST_FORWARD_HOLD_KEY,    MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_HOLD_KEY,RETROK_l,       NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LOAD_STATE_KEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_LOAD_STATE_KEY,       RETROK_F4,      NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_SAVE_STATE_KEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_SAVE_STATE_KEY,       RETROK_F2,      NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_FULLSCREEN_TOGGLE_KEY,    MENU_ENUM_LABEL_VALUE_INPUT_META_FULLSCREEN_TOGGLE_KEY,RETROK_f,       NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_QUIT_KEY,                 MENU_ENUM_LABEL_VALUE_INPUT_META_QUIT_KEY,             RETROK_ESCAPE,  NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_STATE_SLOT_PLUS,          MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_PLUS,      RETROK_F7,      NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_STATE_SLOT_MINUS,         MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_MINUS,     RETROK_F6,      NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_REWIND,                   MENU_ENUM_LABEL_VALUE_INPUT_META_REWIND,               RETROK_r,       NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_MOVIE_RECORD_TOGGLE,      MENU_ENUM_LABEL_VALUE_INPUT_META_MOVIE_RECORD_TOGGLE,  RETROK_o,       NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_PAUSE_TOGGLE,             MENU_ENUM_LABEL_VALUE_INPUT_META_PAUSE_TOGGLE,         RETROK_p,       NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_FRAMEADVANCE,             MENU_ENUM_LABEL_VALUE_INPUT_META_FRAMEADVANCE,         RETROK_k,       NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_RESET,                    MENU_ENUM_LABEL_VALUE_INPUT_META_RESET,                RETROK_h,       NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_SHADER_NEXT,              MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_NEXT,          RETROK_m,       NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_SHADER_PREV,              MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_PREV,          RETROK_n,       NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_CHEAT_INDEX_PLUS,         MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_PLUS,     RETROK_y,       NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_CHEAT_INDEX_MINUS,        MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_MINUS,    RETROK_t,       NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_CHEAT_TOGGLE,             MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_TOGGLE,         RETROK_u,       NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_SCREENSHOT,               MENU_ENUM_LABEL_VALUE_INPUT_META_SCREENSHOT,           RETROK_F8,      NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_MUTE,                     MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE,                 RETROK_F9,      NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_OSK,                      MENU_ENUM_LABEL_VALUE_INPUT_META_OSK,                  RETROK_F12,      NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_NETPLAY_FLIP,             MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_FLIP,         RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_NETPLAY_GAME_WATCH,       MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH,   RETROK_i,       NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_SLOWMOTION,               MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION,           RETROK_e,       NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ENABLE_HOTKEY,            MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY,        RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_VOLUME_UP,                MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP,            RETROK_KP_PLUS, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_VOLUME_DOWN,              MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_DOWN,          RETROK_KP_MINUS,NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_OVERLAY_NEXT,             MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT,         RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_DISK_EJECT_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_EJECT_TOGGLE,    RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_DISK_NEXT,                MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_NEXT,            RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_DISK_PREV,                MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_PREV,            RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_GRAB_MOUSE_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_GRAB_MOUSE_TOGGLE,    RETROK_F11,     NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_GAME_FOCUS_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_GAME_FOCUS_TOGGLE,    RETROK_SCROLLOCK,  NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_MENU_TOGGLE,              MENU_ENUM_LABEL_VALUE_INPUT_META_MENU_TOGGLE,          RETROK_F1,      NO_BTN, 0, AXIS_NONE },
+#endif
+};
+
+/* Users 2 to MAX_USERS */
+static const struct retro_keybind retro_keybinds_rest[] = {
+    /*     | RetroPad button              | desc                           | keyboard key  | js btn   | js axis | */
+   { true, RETRO_DEVICE_ID_JOYPAD_B,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B,              RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_Y,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_Y,              RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_SELECT, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_SELECT,         RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_START,  MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_START,          RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_UP,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_UP,             RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_DOWN,   MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_DOWN,           RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_LEFT,   MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_LEFT,           RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_RIGHT,  MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_RIGHT,          RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_A,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_A,              RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_X,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_X,              RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_L,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L,              RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_R,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R,              RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_L2,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L2,             RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_R2,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R2,             RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_L3,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L3,             RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_R3,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R3,             RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+
+   { true, RARCH_ANALOG_LEFT_X_PLUS,      MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_PLUS,    RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_LEFT_X_MINUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_MINUS,   RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_LEFT_Y_PLUS,      MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_PLUS,    RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_LEFT_Y_MINUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_MINUS,   RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_RIGHT_X_PLUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_PLUS,   RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_RIGHT_X_MINUS,    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_MINUS,  RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_RIGHT_Y_PLUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_PLUS,   RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_RIGHT_Y_MINUS,    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_MINUS,  RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_TURBO_ENABLE,            MENU_ENUM_LABEL_VALUE_INPUT_TURBO_ENABLE,          RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+};
+
+#endif
+
+#endif

config.features.h

@@ -272,7 +272,7 @@ static const bool _freetype_supp = true;
 static const bool _freetype_supp = false;
 #endif
 
-#ifdef HAVE_NETPLAY
+#ifdef HAVE_NETWORKING
 static const bool _netplay_supp = true;
 #else
 static const bool _netplay_supp = false;

configuration.h

@@ -1,6 +1,8 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
  *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *  Copyright (C) 2014-2016 - Jean-André Santoni
+ *  Copyright (C) 2016 - Brad Parker
  *
  *  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-
@@ -22,16 +24,21 @@
 #include <boolean.h>
 #include <retro_common_api.h>
 
-#include "gfx/video_driver.h"
-#include "driver.h"
-
-#ifndef MAX_USERS
-#define MAX_USERS 16
+#ifdef HAVE_CONFIG_H
+#include "config.h"
 #endif
 
-RETRO_BEGIN_DECLS
+#include "gfx/video_driver.h"
+#include "input/input_defines.h"
 
-/* All config related settings go here. */
+enum override_type
+{
+   OVERRIDE_NONE = 0,
+   OVERRIDE_CORE,
+   OVERRIDE_GAME
+};
+
+RETRO_BEGIN_DECLS
 
 typedef struct settings
 {
@@ -47,6 +54,8 @@ typedef struct settings
       char driver[32];
       char context_driver[32];
       float scale;
+      unsigned window_x;
+      unsigned window_y;
       bool fullscreen;
       bool windowed_fullscreen;
       unsigned monitor_index;
@@ -116,6 +125,7 @@ typedef struct settings
       char driver[32];
       bool pause_libretro;
       bool timedate_enable;
+      bool battery_level_enable;
       bool core_enable;
       bool dynamic_wallpaper_enable;
       unsigned thumbnails;
@@ -151,7 +161,6 @@ typedef struct settings
          struct
          {
             bool enable;
-            bool setting_enable;
          } wraparound;
          struct
          {
@@ -185,12 +194,20 @@ typedef struct settings
          unsigned theme;
          unsigned menu_color_theme;
          bool     shadows_enable;
+         bool     show_settings;
+         bool     show_images;
+         bool     show_music;
+         bool     show_video;
+         bool     show_history;
+         bool     show_add;
       } xmb;
 
       struct
       {
          unsigned menu_color_theme;
       } materialui;
+
+      bool unified_controls;
    } menu;
 #endif
 
@@ -201,12 +218,18 @@ typedef struct settings
    struct
    {
       char driver[32];
-      char device[PATH_MAX_LENGTH];
+      char device[255];
       bool allow;
       unsigned width;
       unsigned height;
    } camera;
 
+   struct
+   {
+      char driver[32];
+      bool allow;
+   } wifi;
+
    struct
    {
       char driver[32];
@@ -219,7 +242,7 @@ typedef struct settings
    {
       char driver[32];
       char resampler[32];
-      char device[PATH_MAX_LENGTH];
+      char device[255];
       bool enable;
       bool mute_enable;
       unsigned out_rate;
@@ -262,7 +285,6 @@ typedef struct settings
       unsigned device[MAX_USERS];
       unsigned device_name_index[MAX_USERS];
       bool autodetect_enable;
-      bool netplay_client_swap_input;
 
       unsigned turbo_period;
       unsigned turbo_duty_cycle;
@@ -278,8 +300,13 @@ typedef struct settings
       bool input_descriptor_hide_unbound;
 
       unsigned menu_toggle_gamepad_combo;
-      bool back_as_menu_toggle_enable;
+      bool all_users_control_menu;
 
+      bool menu_swap_ok_cancel_buttons;
+#if defined(VITA)
+      bool backtouch_enable;
+      bool backtouch_toggle;
+#endif
 #if TARGET_OS_IPHONE
       bool small_keyboard_enable;
 #endif
@@ -288,13 +315,6 @@ typedef struct settings
       unsigned poll_type_behavior;
    } input;
 
-   struct
-   {
-      bool enable;
-      float opacity;
-      float scale;
-   } osk;
-
    struct
    {
       unsigned mode;
@@ -302,8 +322,8 @@ typedef struct settings
 
    struct
    {
-      char buildbot_url[PATH_MAX_LENGTH];
-      char buildbot_assets_url[PATH_MAX_LENGTH];
+      char buildbot_url[255];
+      char buildbot_assets_url[255];
       bool buildbot_auto_extract_archive;
    } network;
 
@@ -326,6 +346,8 @@ typedef struct settings
    } cheevos;
 #endif
 
+   char browse_url[4096];
+
    int state_slot;
 
    bool bundle_assets_extract_enable;
@@ -336,14 +358,15 @@ typedef struct settings
    {
       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 content_music_history[PATH_MAX_LENGTH];
+      char content_image_history[PATH_MAX_LENGTH];
+      char content_video_history[PATH_MAX_LENGTH];
       char libretro_info[PATH_MAX_LENGTH];
       char cheat_settings[PATH_MAX_LENGTH];
       char bundle_assets_src[PATH_MAX_LENGTH];
@@ -377,6 +400,22 @@ typedef struct settings
       char menu_content[PATH_MAX_LENGTH];
    } directory;
 
+#ifdef HAVE_NETWORKING
+   struct
+   {
+      char server[255];
+      unsigned port;
+      bool stateless_mode;
+      int check_frames;
+      unsigned input_latency_frames_min;
+      unsigned input_latency_frames_range;
+      bool swap_input;
+      bool nat_traversal;
+      char password[128];
+      char spectate_password[128];
+   } netplay;
+#endif
+
    unsigned content_history_size;
 
    unsigned libretro_log_level;
@@ -384,6 +423,7 @@ typedef struct settings
    bool auto_screenshot_filename;
 
    bool history_list_enable;
+   bool playlist_entry_remove;
    bool rewind_enable;
    size_t rewind_buffer_size;
    unsigned rewind_granularity;
@@ -398,6 +438,7 @@ typedef struct settings
    bool savestate_auto_index;
    bool savestate_auto_save;
    bool savestate_auto_load;
+   bool savestate_thumbnail_enable;
 
    bool network_cmd_enable;
    unsigned network_cmd_port;
@@ -405,38 +446,31 @@ typedef struct settings
    bool network_remote_enable;
    bool network_remote_enable_user[MAX_USERS];
    unsigned network_remote_base_port;
-   bool debug_panel_enable;
 
 #if defined(HAVE_MENU)
    bool menu_show_start_screen;
 #endif
    bool fps_show;
    bool load_dummy_on_core_shutdown;
+   bool check_firmware_before_loading;
 
-   bool core_specific_config;
    bool game_specific_options;
    bool auto_overrides_enable;
    bool auto_remaps_enable;
+   bool auto_shaders_enable;
 
    bool sort_savefiles_enable;
    bool sort_savestates_enable;
 
-   unsigned menu_ok_btn;
-   unsigned menu_cancel_btn;
-   unsigned menu_search_btn;
-   unsigned menu_default_btn;
-   unsigned menu_info_btn;
-   unsigned menu_scroll_down_btn;
-   unsigned menu_scroll_up_btn;
-
    char username[32];
 #ifdef HAVE_LANGEXTRA
    unsigned int user_language;
 #endif
 
    bool config_save_on_exit;
+   bool show_hidden_files;
 
-#ifdef HAVE_SYSTEMD
+#ifdef HAVE_LAKKA
    bool ssh_enable;
    bool samba_enable;
    bool bluetooth_enable;
@@ -453,6 +487,15 @@ typedef struct settings
  **/
 const char *config_get_default_camera(void);
 
+/**
+ * config_get_default_wifi:
+ *
+ * Gets default wifi driver.
+ *
+ * Returns: Default wifi driver.
+ **/
+const char *config_get_default_wifi(void);
+
 /**
  * config_get_default_location:
  *
@@ -462,15 +505,6 @@ const char *config_get_default_camera(void);
  **/
 const char *config_get_default_location(void);
 
-/**
- * config_get_default_osk:
- *
- * Gets default OSK driver.
- *
- * Returns: Default OSK driver.
- **/
-const char *config_get_default_osk(void);
-
 /**
  * config_get_default_video:
  *
@@ -569,6 +603,16 @@ bool config_unload_override(void);
  */
 bool config_load_remap(void);
 
+/**
+ * config_load_shader_preset:
+ *
+ * Tries to append game-specific and core-specific shader presets.
+ *
+ * Returns: false if there was an error or no action was performed.
+ *
+ */
+bool config_load_shader_preset(void);
+
 /**
  * config_save_autoconf_profile:
  * @path            : Path that shall be written to.
@@ -587,13 +631,25 @@ bool config_save_autoconf_profile(const char *path, unsigned user);
  **/
 bool config_save_file(const char *path);
 
+/**
+ * config_save_overrides:
+ * @path            : Path that shall be written to.
+ *
+ * Writes a config file override to disk.
+ *
+ * Returns: true (1) on success, otherwise returns false (0).
+ **/
+bool config_save_overrides(int override_type);
+
 /* Replaces currently loaded configuration file with
  * another one. Will load a dummy core to flush state
  * properly. */
-bool config_replace(char *path);
+bool config_replace(bool config_save_on_exit, char *path);
 
 bool config_init(void);
 
+bool config_overlay_enable_default(void);
+
 void config_free(void);
 
 settings_t *config_get_ptr(void);

content.h

@@ -1,7 +1,8 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
  *  Copyright (C) 2011-2016 - Daniel De Matteis
- * 
+ *  Copyright (C) 2016 - Brad Parker
+ *
  *  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.
@@ -29,8 +30,6 @@
 
 RETRO_BEGIN_DECLS
 
-typedef struct ram_type ram_type_t;
-
 typedef struct content_ctx_info
 {
    int argc;                       /* Argument count. */
@@ -46,10 +45,10 @@ bool content_load_ram_file(unsigned slot);
 bool content_save_ram_file(unsigned slot);
 
 /* Load a state from disk to memory. */
-bool content_load_state(const char* path, bool load_to_backup_buffer);
+bool content_load_state(const char* path, bool load_to_backup_buffer, bool autoload);
 
 /* Save a state from memory to disk. */
-bool content_save_state(const char *path, bool save_to_disk);
+bool content_save_state(const char *path, bool save_to_disk, bool autosave);
 
 /* Copy a save state. */
 bool content_rename_state(const char *origin, const char *dest);
@@ -60,7 +59,8 @@ bool content_undo_load_state(void);
 /* Restores the last savestate file which was overwritten */
 bool content_undo_save_state(void);
 
-bool content_does_not_need_content(void);
+void content_get_status(bool *contentless,
+      bool *is_inited);
 
 void content_set_does_not_need_content(void);
 
@@ -68,8 +68,6 @@ void content_unset_does_not_need_content(void);
 
 bool content_get_crc(uint32_t **content_crc_ptr);
 
-bool content_is_inited(void);
-
 void content_deinit(void);
 
 /* Initializes and loads a content file for the currently

core.h

@@ -20,9 +20,11 @@
 
 #include <boolean.h>
 #include <libretro.h>
+
 #include <retro_common_api.h>
 
 #include "core_type.h"
+#include "input/input_defines.h"
 
 RETRO_BEGIN_DECLS
 
@@ -40,6 +42,46 @@ enum
    POLL_TYPE_LATE
 };
 
+typedef struct rarch_memory_descriptor
+{
+   struct retro_memory_descriptor core;
+   size_t disconnect_mask;
+} rarch_memory_descriptor_t;
+
+typedef struct rarch_memory_map
+{
+   rarch_memory_descriptor_t *descriptors;
+   unsigned num_descriptors;
+} rarch_memory_map_t;
+
+typedef struct rarch_system_info
+{
+   struct retro_system_info info;
+
+   unsigned rotation;
+   unsigned performance_level;
+
+   const char *input_desc_btn[MAX_USERS][RARCH_FIRST_META_KEY];
+   char valid_extensions[255];
+
+   struct retro_disk_control_callback  disk_control_cb; 
+   struct retro_location_callback      location_cb;
+
+   struct
+   {
+      struct retro_subsystem_info *data;
+      unsigned size;
+   } subsystem;
+
+   struct
+   {
+      struct retro_controller_info *data;
+      unsigned size;
+   } ports;
+   
+   rarch_memory_map_t mmaps;
+} rarch_system_info_t;
+
 typedef struct retro_ctx_input_state_info
 {
    retro_input_state_t cb;
@@ -57,6 +99,11 @@ typedef struct retro_ctx_api_info
    unsigned version;
 } retro_ctx_api_info_t;
 
+typedef struct retro_ctx_region_info
+{
+  unsigned region;
+} retro_ctx_region_info_t;
+
 typedef struct retro_ctx_controller_info
 {
    unsigned port;
@@ -111,7 +158,7 @@ typedef struct retro_callbacks
    retro_input_poll_t poll_cb;
 } retro_callbacks_t;
 
-bool core_load(void);
+bool core_load(unsigned poll_type_behavior);
 
 bool core_unload(void);
 
@@ -119,6 +166,12 @@ bool core_set_default_callbacks(void *data);
 
 bool core_set_rewind_callbacks(void);
 
+#ifdef HAVE_NETWORKING
+bool core_set_netplay_callbacks(void);
+
+bool core_unset_netplay_callbacks(void);
+#endif
+
 bool core_set_poll_type(unsigned *type);
 
 /* Runs the core for one frame. */
@@ -132,7 +185,7 @@ bool core_unload_game(void);
 
 bool core_reset(void);
 
-bool core_frame(retro_ctx_frame_info_t *info);
+void core_frame(retro_ctx_frame_info_t *info);
 
 bool core_poll(void);
 
@@ -140,6 +193,10 @@ bool core_set_environment(retro_ctx_environ_info_t *info);
 
 bool core_serialize_size(retro_ctx_size_info_t *info);
 
+uint64_t core_serialization_quirks(void);
+
+void core_set_serialization_quirks(uint64_t quirks);
+
 bool core_serialize(retro_ctx_serialize_info_t *info);
 
 bool core_unserialize(retro_ctx_serialize_info_t *info);
@@ -160,6 +217,8 @@ bool core_api_version(retro_ctx_api_info_t *api);
  */
 bool core_verify_api_version(void);
 
+bool core_get_region(retro_ctx_region_info_t *info);
+
 bool core_get_memory(retro_ctx_memory_info_t *info);
 
 /* Initialize system A/V information. */
@@ -180,8 +239,16 @@ void core_unset_input_descriptors(void);
 
 bool core_uninit_libretro_callbacks(void);
 
+void core_uninit_symbols(void);
+
 void core_set_input_state(retro_ctx_input_state_info_t *info);
 
+bool core_is_symbols_inited(void);
+
+bool core_is_inited(void);
+
+bool core_is_game_loaded(void);
+
 RETRO_END_DECLS
 
 #endif

core_impl.c

@@ -2,6 +2,7 @@
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
  *  Copyright (C) 2011-2016 - Daniel De Matteis
  *  Copyright (C) 2012-2015 - Michael Lelli
+ *  Copyright (C) 2016 - Brad Parker
  *
  *  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-
@@ -21,29 +22,38 @@
 #include <ctype.h>
 #include <errno.h>
 
-#include <retro_inline.h>
 #include <boolean.h>
 #include <lists/string_list.h>
+#include <string/stdstring.h>
 #include <libretro.h>
 
-#include "dynamic.h"
-#include "core.h"
-#include "general.h"
-#include "msg_hash.h"
-#include "managers/state_manager.h"
-#include "system.h"
-#include "gfx/video_driver.h"
-#include "audio/audio_driver.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
-#ifdef HAVE_NETPLAY
+#ifdef HAVE_NETWORKING
 #include "network/netplay/netplay.h"
 #endif
 
-static struct retro_core_t core;
-static unsigned            core_poll_type;
-static bool                core_input_polled;
-static bool   core_has_set_input_descriptors = false;
-static struct retro_callbacks retro_ctx;
+#include "core.h"
+#include "content.h"
+#include "dynamic.h"
+#include "msg_hash.h"
+#include "managers/state_manager.h"
+#include "verbosity.h"
+#include "gfx/video_driver.h"
+#include "audio/audio_driver.h"
+
+static unsigned            core_poll_type                 = POLL_TYPE_EARLY;
+static bool                core_inited                    = false;
+static bool                core_symbols_inited            = false;
+static bool                core_game_loaded               = false;
+static bool                core_input_polled              = false;
+static bool                core_has_set_input_descriptors = false;
+static uint64_t            core_serialization_quirks_v    = 0;
+
+static struct              retro_callbacks retro_ctx;
+static struct              retro_core_t core;
 
 static void core_input_state_poll_maybe(void)
 {
@@ -73,15 +83,12 @@ void core_set_input_state(retro_ctx_input_state_info_t *info)
  * core_init_libretro_cbs:
  * @data           : pointer to retro_callbacks object
  *
- * Initializes libretro callbacks, and binds the libretro callbacks 
+ * Initializes libretro callbacks, and binds the libretro callbacks
  * to default callback functions.
  **/
 static bool core_init_libretro_cbs(void *data)
 {
    struct retro_callbacks *cbs = (struct retro_callbacks*)data;
-#ifdef HAVE_NETPLAY
-   global_t            *global = global_get_ptr();
-#endif
 
    if (!cbs)
       return false;
@@ -94,27 +101,11 @@ static bool core_init_libretro_cbs(void *data)
 
    core_set_default_callbacks(cbs);
 
-#ifdef HAVE_NETPLAY
+#ifdef HAVE_NETWORKING
    if (!netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_DATA_INITED, NULL))
       return true;
 
-   /* Force normal poll type for netplay. */
-   core_poll_type = POLL_TYPE_NORMAL;
-
-   if (global->netplay.is_spectate)
-   {
-      core.retro_set_input_state(
-            (global->netplay.is_client ?
-             input_state_spectate_client : input_state_spectate)
-            );
-   }
-   else
-   {
-      core.retro_set_video_refresh(video_frame_net);
-      core.retro_set_audio_sample(audio_sample_net);
-      core.retro_set_audio_sample_batch(audio_sample_batch_net);
-      core.retro_set_input_state(input_state_net);
-   }
+   core_set_netplay_callbacks();
 #endif
 
    return true;
@@ -156,6 +147,8 @@ bool core_deinit(void *data)
    cbs->state_cb        = NULL;
    cbs->poll_cb         = NULL;
 
+   core_inited          = false;
+
    return true;
 }
 
@@ -185,6 +178,48 @@ bool core_set_rewind_callbacks(void)
    return true;
 }
 
+#ifdef HAVE_NETWORKING
+/**
+ * core_set_netplay_callbacks:
+ *
+ * Set the I/O callbacks to use netplay's interceding callback system. Should
+ * only be called while initializing netplay.
+ **/
+bool core_set_netplay_callbacks(void)
+{
+   /* Force normal poll type for netplay. */
+   core_poll_type = POLL_TYPE_NORMAL;
+
+   /* And use netplay's interceding callbacks */
+   core.retro_set_video_refresh(video_frame_net);
+   core.retro_set_audio_sample(audio_sample_net);
+   core.retro_set_audio_sample_batch(audio_sample_batch_net);
+   core.retro_set_input_state(input_state_net);
+
+   return true;
+}
+
+/**
+ * core_unset_netplay_callbacks
+ *
+ * Unset the I/O callbacks from having used netplay's interceding callback
+ * system. Should only be called while uninitializing netplay.
+ */
+bool core_unset_netplay_callbacks(void)
+{
+   struct retro_callbacks cbs;
+   if (!core_set_default_callbacks(&cbs))
+      return false;
+
+   core.retro_set_video_refresh(cbs.frame_cb);
+   core.retro_set_audio_sample(cbs.sample_cb);
+   core.retro_set_audio_sample_batch(cbs.sample_batch_cb);
+   core.retro_set_input_state(cbs.state_cb);
+
+   return true;
+}
+#endif
+
 bool core_set_cheat(retro_ctx_cheat_info_t *info)
 {
    core.retro_cheat_set(info->index, info->enabled, info->code);
@@ -211,11 +246,19 @@ bool core_set_poll_type(unsigned *type)
    return true;
 }
 
+void core_uninit_symbols(void)
+{
+   uninit_libretro_sym(&core);
+   core_symbols_inited = false;
+}
+
 bool core_init_symbols(enum rarch_core_type *type)
 {
    if (!type)
       return false;
-   init_libretro_sym(*type, &core);
+   if (!init_libretro_sym(*type, &core))
+      return false;
+   core_symbols_inited = true;
    return true;
 }
 
@@ -238,12 +281,22 @@ bool core_get_memory(retro_ctx_memory_info_t *info)
 
 bool core_load_game(retro_ctx_load_content_info_t *load_info)
 {
-   if (!load_info)
-      return false;
+   bool contentless = false;
+   bool is_inited   = false;
 
-   if (load_info->special)
-      return core.retro_load_game_special(load_info->special->id, load_info->info, load_info->content->size);
-   return core.retro_load_game(*load_info->content->elems[0].data ? load_info->info : NULL);
+   content_get_status(&contentless, &is_inited);
+
+   if (load_info && load_info->special)
+      core_game_loaded = core.retro_load_game_special(
+            load_info->special->id, load_info->info, load_info->content->size);
+   else if (load_info && !string_is_empty(load_info->content->elems[0].data))
+      core_game_loaded = core.retro_load_game(load_info->info);
+   else if (contentless)
+      core_game_loaded = core.retro_load_game(NULL);
+   else
+      core_game_loaded = false;
+
+   return core_game_loaded;
 }
 
 bool core_get_system_info(struct retro_system_info *system)
@@ -260,6 +313,11 @@ bool core_unserialize(retro_ctx_serialize_info_t *info)
       return false;
    if (!core.retro_unserialize(info->data_const, info->size))
       return false;
+
+#if HAVE_NETWORKING
+   netplay_driver_ctl(RARCH_NETPLAY_CTL_LOAD_SAVESTATE, info);
+#endif
+
    return true;
 }
 
@@ -280,14 +338,21 @@ bool core_serialize_size(retro_ctx_size_info_t *info)
    return true;
 }
 
-bool core_frame(retro_ctx_frame_info_t *info)
+uint64_t core_serialization_quirks(void)
 {
-   if (!info || !retro_ctx.frame_cb)
-      return false;
+   return core_serialization_quirks_v;
+}
 
-   retro_ctx.frame_cb(
-         info->data, info->width, info->height, info->pitch);
-   return true;
+void core_set_serialization_quirks(uint64_t quirks)
+{
+   core_serialization_quirks_v = quirks;
+}
+
+void core_frame(retro_ctx_frame_info_t *info)
+{
+   if (retro_ctx.frame_cb)
+      retro_ctx.frame_cb(
+            info->data, info->width, info->height, info->pitch);
 }
 
 bool core_poll(void)
@@ -323,26 +388,39 @@ bool core_reset(void)
 bool core_init(void)
 {
    core.retro_init();
+   core_inited          = true;
    return true;
 }
 
 bool core_unload(void)
 {
    core.retro_deinit();
-   uninit_libretro_sym(&core);
    return true;
 }
 
+
 bool core_unload_game(void)
 {
-   video_driver_deinit_hw_context();
+   video_driver_free_hw_context();
    audio_driver_stop();
    core.retro_unload_game();
+   core_game_loaded = false;
    return true;
 }
 
 bool core_run(void)
 {
+#ifdef HAVE_NETWORKING
+   if (!netplay_driver_ctl(RARCH_NETPLAY_CTL_PRE_FRAME, NULL))
+   {
+      /* Paused due to netplay. We must poll and display something so that a
+       * netplay peer pausing doesn't just hang. */
+      input_poll();
+      video_driver_cached_frame();
+      return true;
+   }
+#endif
+
    switch (core_poll_type)
    {
       case POLL_TYPE_EARLY:
@@ -351,18 +429,25 @@ bool core_run(void)
       case POLL_TYPE_LATE:
          core_input_polled = false;
          break;
+      default:
+         break;
    }
+
    if (core.retro_run)
       core.retro_run();
    if (core_poll_type == POLL_TYPE_LATE && !core_input_polled)
       input_poll();
+
+#ifdef HAVE_NETWORKING
+   netplay_driver_ctl(RARCH_NETPLAY_CTL_POST_FRAME, NULL);
+#endif
+
    return true;
 }
 
-bool core_load(void)
+bool core_load(unsigned poll_type_behavior)
 {
-   settings_t *settings = config_get_ptr();
-   core_poll_type = settings->input.poll_type_behavior;
+   core_poll_type = poll_type_behavior;
 
    if (!core_verify_api_version())
       return false;
@@ -370,7 +455,6 @@ bool core_load(void)
       return false;
 
    core_get_system_av_info(video_viewport_get_system_av_info());
-   runloop_ctl(RUNLOOP_CTL_SET_FRAME_LIMIT, NULL);
 
    return true;
 }
@@ -378,10 +462,10 @@ bool core_load(void)
 bool core_verify_api_version(void)
 {
    unsigned api_version = core.retro_api_version();
-   RARCH_LOG("%s: %u\n", 
+   RARCH_LOG("%s: %u\n",
          msg_hash_to_str(MSG_VERSION_OF_LIBRETRO_API),
          api_version);
-   RARCH_LOG("%s: %u\n",    
+   RARCH_LOG("%s: %u\n",
          msg_hash_to_str(MSG_COMPILED_AGAINST_API),
          RETRO_API_VERSION);
 
@@ -393,6 +477,14 @@ bool core_verify_api_version(void)
    return true;
 }
 
+bool core_get_region(retro_ctx_region_info_t *info)
+{
+  if (!info)
+    return false;
+  info->region = core.retro_get_region();
+  return true;
+}
+
 bool core_has_set_input_descriptor(void)
 {
    return core_has_set_input_descriptors;
@@ -407,3 +499,18 @@ void core_unset_input_descriptors(void)
 {
    core_has_set_input_descriptors = false;
 }
+
+bool core_is_inited(void)
+{
+  return core_inited;
+}
+
+bool core_is_symbols_inited(void)
+{
+  return core_symbols_inited;
+}
+
+bool core_is_game_loaded(void)
+{
+  return core_game_loaded;
+}

core_info.c

@@ -2,7 +2,8 @@
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
  *  Copyright (C) 2011-2016 - Daniel De Matteis
  *  Copyright (C) 2013-2015 - Jason Fetters
- * 
+ *  Copyright (C) 2016 - Brad Parker
+ *
  *  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.
@@ -15,23 +16,27 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <compat/strl.h>
+#include <string/stdstring.h>
 #include <file/file_path.h>
 #include <lists/dir_list.h>
 #include <file/archive_file.h>
-#include <compat/strl.h>
 
-#include <string/stdstring.h>
-
-#include "core_info.h"
-#include "configuration.h"
-#include "file_path_special.h"
-#include "list_special.h"
-#include "config.def.h"
+#include <retro_stat.h>
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#include "runloop.h"
+#include "verbosity.h"
+
+#include "config.def.h"
+#include "core_info.h"
+#include "configuration.h"
+#include "file_path_special.h"
+#include "list_special.h"
+
 static const char *core_info_tmp_path               = NULL;
 static const struct string_list *core_info_tmp_list = NULL;
 static core_info_t *core_info_current               = NULL;
@@ -40,7 +45,9 @@ static core_info_list_t *core_info_curr_list        = NULL;
 static void core_info_list_resolve_all_extensions(
       core_info_list_t *core_info_list)
 {
-   size_t i, all_ext_len = 0;
+   size_t i              = 0;
+   size_t all_ext_len    = 0;
+   char *all_ext         = NULL;
 
    if (!core_info_list)
       return;
@@ -48,16 +55,18 @@ static void core_info_list_resolve_all_extensions(
    for (i = 0; i < core_info_list->count; i++)
    {
       if (core_info_list->list[i].supported_extensions)
-         all_ext_len += 
+         all_ext_len +=
             (strlen(core_info_list->list[i].supported_extensions) + 2);
    }
 
    if (all_ext_len)
-      core_info_list->all_ext = (char*)calloc(1, all_ext_len);
+      all_ext = (char*)calloc(1, all_ext_len);
 
-   if (!core_info_list->all_ext)
+   if (!all_ext)
       return;
 
+   core_info_list->all_ext = all_ext;
+
    for (i = 0; i < core_info_list->count; i++)
    {
       if (!core_info_list->list[i].supported_extensions)
@@ -75,40 +84,53 @@ static void core_info_list_resolve_all_firmware(
    size_t i;
    unsigned c;
 
-   if (!core_info_list)
-      return;
-
    for (i = 0; i < core_info_list->count; i++)
    {
-      unsigned count        = 0;
-      core_info_t *info     = (core_info_t*)&core_info_list->list[i];
-      config_file_t *config = (config_file_t*)info->config_data;
+      unsigned count                  = 0;
+      core_info_firmware_t *firmware  = NULL;
+      core_info_t *info               = (core_info_t*)&core_info_list->list[i];
+      config_file_t *config           = (config_file_t*)info->config_data;
 
-      if (!config)
+      if (!config || !config_get_uint(config, "firmware_count", &count))
          continue;
 
-      if (!config_get_uint(config, "firmware_count", &count))
+      firmware = (core_info_firmware_t*)calloc(count, sizeof(*firmware));
+
+      if (!firmware)
          continue;
 
-      info->firmware = (core_info_firmware_t*)
-         calloc(count, sizeof(*info->firmware));
-
-      if (!info->firmware)
-         continue;
+      info->firmware = firmware;
 
       for (c = 0; c < count; c++)
       {
-         char path_key[64] = {0};
-         char desc_key[64] = {0};
-         char opt_key[64]  = {0};
+         char path_key[64];
+         char desc_key[64];
+         char opt_key[64];
+         bool tmp_bool     = false;
+         char *tmp         = NULL;
+         path_key[0]       = desc_key[0] = opt_key[0] = '\0';
 
          snprintf(path_key, sizeof(path_key), "firmware%u_path", c);
          snprintf(desc_key, sizeof(desc_key), "firmware%u_desc", c);
          snprintf(opt_key,  sizeof(opt_key),  "firmware%u_opt",  c);
 
-         config_get_string(config, path_key, &info->firmware[c].path);
-         config_get_string(config, desc_key, &info->firmware[c].desc);
-         config_get_bool(config, opt_key , &info->firmware[c].optional);
+         if (config_get_string(config, path_key, &tmp) && !string_is_empty(tmp))
+         {
+            info->firmware[c].path = strdup(tmp);
+            free(tmp);
+            tmp = NULL;
+         }
+         if (config_get_string(config, desc_key, &tmp) && !string_is_empty(tmp))
+         {
+            info->firmware[c].desc = strdup(tmp);
+            free(tmp);
+            tmp = NULL;
+         }
+         if (tmp)
+            free(tmp);
+         tmp = NULL;
+         if (config_get_bool(config, opt_key , &tmp_bool))
+            info->firmware[c].optional = tmp_bool;
       }
    }
 }
@@ -136,8 +158,7 @@ static void core_info_list_free(core_info_list_t *core_info_list)
       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->supported_extensions_list);
       string_list_free(info->authors_list);
       string_list_free(info->note_list);
       string_list_free(info->permissions_list);
@@ -159,21 +180,26 @@ static void core_info_list_free(core_info_list_t *core_info_list)
    free(core_info_list);
 }
 
-static config_file_t *core_info_list_iterate(
+static bool core_info_list_iterate(
+      char *s, size_t len,
       struct string_list *contents, size_t i)
 {
-   char info_path_base[PATH_MAX_LENGTH] = {0};
-   char info_path[PATH_MAX_LENGTH]      = {0};
+   char info_path_base[PATH_MAX_LENGTH];
+#if defined(RARCH_MOBILE) || (defined(RARCH_CONSOLE) && !defined(PSP) && !defined(_3DS) && !defined(VITA))
+   char                       *substr   = NULL;
+#endif
    settings_t                 *settings = config_get_ptr();
 
-   if (!contents->elems[i].data)
-      return NULL;
+   if (!contents || !contents->elems[i].data)
+      return false;
+
+   info_path_base[0] = '\0';
 
    fill_pathname_base_noext(info_path_base, contents->elems[i].data,
          sizeof(info_path_base));
 
-#if defined(RARCH_MOBILE) || (defined(RARCH_CONSOLE) && !defined(PSP))
-   char *substr = strrchr(info_path_base, '_');
+#if defined(RARCH_MOBILE) || (defined(RARCH_CONSOLE) && !defined(PSP) && !defined(_3DS) && !defined(VITA) && !defined(HW_WUP))
+   substr = strrchr(info_path_base, '_');
    if (substr)
       *substr = '\0';
 #endif
@@ -182,21 +208,21 @@ static config_file_t *core_info_list_iterate(
          file_path_str(FILE_PATH_CORE_INFO_EXTENSION),
          sizeof(info_path_base));
 
-   fill_pathname_join(info_path,
+   fill_pathname_join(s,
          (!string_is_empty(settings->path.libretro_info)) ?
          settings->path.libretro_info : settings->directory.libretro,
-         info_path_base, sizeof(info_path));
+         info_path_base, len);
 
-   return config_file_new(info_path);
+   return true;
 }
 
-static core_info_list_t *core_info_list_new(void)
+static core_info_list_t *core_info_list_new(const char *path)
 {
    size_t i;
    core_info_t *core_info           = NULL;
    core_info_list_t *core_info_list = NULL;
-   struct string_list *contents     = 
-      dir_list_new_special(NULL, DIR_LIST_CORES, NULL);
+   struct string_list *contents     = dir_list_new_special(
+                                      path, DIR_LIST_CORES, NULL);
 
    if (!contents)
       return NULL;
@@ -209,69 +235,132 @@ static core_info_list_t *core_info_list_new(void)
    if (!core_info)
       goto error;
 
-   core_info_list->list = core_info;
+   core_info_list->list  = core_info;
    core_info_list->count = contents->size;
 
    for (i = 0; i < contents->size; i++)
    {
-      config_file_t *conf = core_info_list_iterate(contents, i);
+      char info_path[PATH_MAX_LENGTH];
 
-      if (conf)
+      info_path[0]        = '\0';
+
+      if ( 
+            core_info_list_iterate(info_path, sizeof(info_path),
+            contents, i) 
+            && path_is_valid(info_path))
       {
-         bool tmp_bool  = false;
-         unsigned count = 0;
+         char *tmp           = NULL;
+         bool tmp_bool       = false;
+         unsigned count      = 0;
+         config_file_t *conf = config_file_new(info_path);
+
+         if (!conf)
+            continue;
+
+         if (config_get_string(conf, "display_name", &tmp) && !string_is_empty(tmp))
+         {
+            core_info[i].display_name = strdup(tmp);
+            free(tmp);
+            tmp = NULL;
+         }
+         if (config_get_string(conf, "corename", &tmp) && !string_is_empty(tmp))
+         {
+            core_info[i].core_name = strdup(tmp);
+            free(tmp);
+            tmp = NULL;
+         }
+
+         if (config_get_string(conf, "systemname", &tmp) && !string_is_empty(tmp))
+         {
+            core_info[i].systemname = strdup(tmp);
+            free(tmp);
+            tmp = NULL;
+         }
+
+         if (config_get_string(conf, "manufacturer", &tmp) && !string_is_empty(tmp))
+         {
+            core_info[i].system_manufacturer = strdup(tmp);
+            free(tmp);
+            tmp = NULL;
+         }
 
-         config_get_string(conf, "display_name",
-               &core_info[i].display_name);
-         config_get_string(conf, "corename",
-               &core_info[i].core_name);
-         config_get_string(conf, "systemname",
-               &core_info[i].systemname);
-         config_get_string(conf, "manufacturer",
-               &core_info[i].system_manufacturer);
          config_get_uint(conf, "firmware_count", &count);
+
          core_info[i].firmware_count = count;
-         if (config_get_string(conf, "supported_extensions",
-                  &core_info[i].supported_extensions) &&
-               core_info[i].supported_extensions)
+
+         if (config_get_string(conf, "supported_extensions", &tmp) && !string_is_empty(tmp))
+         {
+            core_info[i].supported_extensions      = strdup(tmp);
             core_info[i].supported_extensions_list =
                string_split(core_info[i].supported_extensions, "|");
 
-         if (config_get_string(conf, "authors",
-                  &core_info[i].authors) &&
-               core_info[i].authors)
+            free(tmp);
+            tmp = NULL;
+         }
+
+         if (config_get_string(conf, "authors", &tmp) && !string_is_empty(tmp))
+         {
+            core_info[i].authors      = strdup(tmp);
             core_info[i].authors_list =
                string_split(core_info[i].authors, "|");
 
-         if (config_get_string(conf, "permissions",
-                  &core_info[i].permissions) &&
-               core_info[i].permissions)
+            free(tmp);
+            tmp = NULL;
+         }
+
+         if (config_get_string(conf, "permissions", &tmp) && !string_is_empty(tmp))
+         {
+            core_info[i].permissions      = strdup(tmp);
             core_info[i].permissions_list =
                string_split(core_info[i].permissions, "|");
 
-         if (config_get_string(conf, "license",
-                  &core_info[i].licenses) &&
-               core_info[i].licenses)
+            free(tmp);
+            tmp = NULL;
+         }
+
+         if (config_get_string(conf, "license", &tmp) && !string_is_empty(tmp))
+         {
+            core_info[i].licenses      = strdup(tmp);
             core_info[i].licenses_list =
                string_split(core_info[i].licenses, "|");
 
-         if (config_get_string(conf, "categories",
-                  &core_info[i].categories) &&
-               core_info[i].categories)
+            free(tmp);
+            tmp = NULL;
+         }
+
+         if (config_get_string(conf, "categories", &tmp) && !string_is_empty(tmp))
+         {
+            core_info[i].categories      = strdup(tmp);
             core_info[i].categories_list =
                string_split(core_info[i].categories, "|");
 
-         if (config_get_string(conf, "database",
-                  &core_info[i].databases) &&
-               core_info[i].databases)
+            free(tmp);
+            tmp = NULL;
+         }
+
+         if (config_get_string(conf, "database", &tmp) && !string_is_empty(tmp))
+         {
+            core_info[i].databases      = strdup(tmp);
             core_info[i].databases_list =
                string_split(core_info[i].databases, "|");
 
-         if (config_get_string(conf, "notes",
-                  &core_info[i].notes) &&
-               core_info[i].notes)
+            free(tmp);
+            tmp = NULL;
+         }
+
+         if (config_get_string(conf, "notes", &tmp) && !string_is_empty(tmp))
+         {
+            core_info[i].notes     = strdup(tmp);
             core_info[i].note_list = string_split(core_info[i].notes, "|");
 
+            free(tmp);
+            tmp = NULL;
+         }
+
+         if (tmp)
+            free(tmp);
+         tmp    = NULL;
+
          if (config_get_bool(conf, "supports_no_game",
                &tmp_bool))
             core_info[i].supports_no_game = tmp_bool;
@@ -279,15 +368,18 @@ static 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 (!string_is_empty(contents->elems[i].data))
+         core_info[i].path = strdup(contents->elems[i].data);
 
       if (!core_info[i].display_name)
-         core_info[i].display_name = 
+         core_info[i].display_name =
             strdup(path_basename(core_info[i].path));
    }
 
    core_info_list_resolve_all_extensions(core_info_list);
-   core_info_list_resolve_all_firmware(core_info_list);
+
+   if (core_info_list)
+      core_info_list_resolve_all_firmware(core_info_list);
 
    dir_list_free(contents);
    return core_info_list;
@@ -299,7 +391,7 @@ error:
    return NULL;
 }
 
-/* Shallow-copies internal state. 
+/* Shallow-copies internal state.
  *
  * Data in *info is invalidated when the
  * core_info_list is freed. */
@@ -316,7 +408,7 @@ static bool core_info_list_get_info(core_info_list_t *core_info_list,
    {
       const core_info_t *info = &core_info_list->list[i];
 
-      if (string_is_equal(path_basename(info->path), 
+      if (string_is_equal(path_basename(info->path),
                path_basename(path)))
       {
          *out_info = *info;
@@ -344,8 +436,11 @@ static bool core_info_does_support_any_file(const core_info_t *core,
 static bool core_info_does_support_file(
       const core_info_t *core, const char *path)
 {
-   if (!path || !core || !core->supported_extensions_list)
+   if (!core || !core->supported_extensions_list)
       return false;
+   if (string_is_empty(path))
+      return false;
+
    return string_list_find_elem_prefix(
          core->supported_extensions_list, ".", path_get_extension(path));
 }
@@ -356,10 +451,10 @@ 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        = 
+   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        = 
+   int support_b        =
          core_info_does_support_any_file(b, core_info_tmp_list)
       || core_info_does_support_file(b, core_info_tmp_path);
 
@@ -378,7 +473,7 @@ static core_info_t *core_info_find_internal(
    {
       core_info_t *info = core_info_get(list, i);
 
-      if (!info)
+      if (!info || !info->path)
          continue;
       if (string_is_equal(info->path, core))
          return info;
@@ -393,25 +488,32 @@ static bool core_info_list_update_missing_firmware_internal(
       const char *systemdir)
 {
    size_t i;
-   char path[PATH_MAX_LENGTH] = {0};
+   char path[PATH_MAX_LENGTH];
    core_info_t          *info = NULL;
 
    if (!core_info_list || !core)
       return false;
 
-   info = core_info_find_internal(core_info_list, core);
+   path[0] = '\0';
+   info    = core_info_find_internal(core_info_list, core);
 
    if (!info)
       return false;
 
+   runloop_ctl(RUNLOOP_CTL_UNSET_MISSING_BIOS, NULL);
    for (i = 0; i < info->firmware_count; i++)
    {
-      if (!info->firmware[i].path)
+      if (string_is_empty(info->firmware[i].path))
          continue;
 
       fill_pathname_join(path, systemdir,
             info->firmware[i].path, sizeof(path));
       info->firmware[i].missing = !path_file_exists(path);
+      if (info->firmware[i].missing && !info->firmware[i].optional)
+      {
+         runloop_ctl(RUNLOOP_CTL_SET_MISSING_BIOS, NULL);
+         RARCH_WARN("Firmware missing: %s\n", info->firmware[i].path);
+      }
    }
 
    return true;
@@ -437,16 +539,18 @@ static void core_info_list_get_missing_firmware(
       const core_info_firmware_t **firmware, size_t *num_firmware)
 {
    size_t i;
-   char path[PATH_MAX_LENGTH] = {0};
+   char path[PATH_MAX_LENGTH];
    core_info_t          *info = NULL;
 
    if (!core_info_list || !core)
       return;
 
+   path[0]       = '\0';
    *firmware     = NULL;
    *num_firmware = 0;
+   info          = core_info_find_internal(core_info_list, core);
 
-   if (!(info = core_info_find_internal(core_info_list, core)))
+   if (!info)
       return;
 
    *firmware = info->firmware;
@@ -496,7 +600,10 @@ void core_info_deinit_list(void)
 
 bool core_info_init_list(void)
 {
-   core_info_curr_list = core_info_list_new();
+   settings_t *settings = config_get_ptr();
+
+   if (settings)
+      core_info_curr_list = core_info_list_new(settings->directory.libretro);
 
    if (!core_info_curr_list)
       return false;
@@ -515,7 +622,6 @@ bool core_info_list_update_missing_firmware(core_info_ctx_firmware_t *info)
 {
    if (!info)
       return false;
-
    return core_info_list_update_missing_firmware_internal(
          core_info_curr_list,
          info->path, info->directory.system);
@@ -566,23 +672,22 @@ core_info_t *core_info_get(core_info_list_t *list, size_t i)
 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
+   size_t i;
    struct string_list *list = NULL;
-#endif
-   size_t supported = 0, i;
+   size_t supported         = 0;
 
    if (!core_info_list)
       return;
 
    core_info_tmp_path = path;
 
-#ifdef HAVE_ZLIB
-   if (string_is_equal_noncase(path_get_extension(path), "zip"))
+#ifdef HAVE_COMPRESSION
+   if (path_is_compressed_file(path))
       list = file_archive_get_file_list(path, NULL);
    core_info_tmp_list = list;
 #endif
 
-   /* Let supported core come first in list so we can return 
+   /* Let supported core come first in list so we can return
     * a pointer to them. */
    qsort(core_info_list->list, core_info_list->count,
          sizeof(core_info_t), core_info_qsort_cmp);
@@ -594,7 +699,7 @@ void core_info_list_get_supported_cores(core_info_list_t *core_info_list,
       if (core_info_does_support_file(core, path))
          continue;
 
-#ifdef HAVE_ZLIB
+#ifdef HAVE_COMPRESSION
       if (core_info_does_support_any_file(core, list))
          continue;
 #endif
@@ -602,10 +707,8 @@ void core_info_list_get_supported_cores(core_info_list_t *core_info_list,
       break;
    }
 
-#ifdef HAVE_ZLIB
    if (list)
       string_list_free(list);
-#endif
 
    *infos     = core_info_list->list;
    *num_infos = supported;
@@ -614,51 +717,49 @@ void core_info_list_get_supported_cores(core_info_list_t *core_info_list,
 void core_info_get_name(const char *path, char *s, size_t len)
 {
    size_t i;
-   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);
+         settings->directory.libretro,
+         DIR_LIST_CORES, NULL);
 
    if (!contents)
       return;
 
-   core_info_list = (core_info_list_t*)calloc(1, sizeof(*core_info_list));
-   if (!core_info_list)
-      goto error;
-
-   core_info = (core_info_t*)calloc(contents->size, sizeof(*core_info));
-   if (!core_info)
-      goto error;
-
-   core_info_list->list = core_info;
-   core_info_list->count = contents->size;
-
    for (i = 0; i < contents->size; i++)
    {
-      config_file_t *conf = NULL;
+      char info_path[PATH_MAX_LENGTH];
+      config_file_t *conf             = NULL;
+      char *new_core_name             = NULL;
+
+      info_path[0]                    = '\0';
 
       if (!string_is_equal(contents->elems[i].data, path))
          continue;
-      
-      conf = core_info_list_iterate(contents, i);
 
-      if (conf)
+      if (!core_info_list_iterate(info_path,
+               sizeof(info_path), contents, i)
+            && path_is_valid(info_path))
+         continue;
+
+      conf = config_file_new(info_path);
+
+      if (!conf)
+         continue;
+
+      if (config_get_string(conf, "corename",
+            &new_core_name))
       {
-         config_get_string(conf, "corename",
-               &core_info[i].core_name);
-         core_info[i].config_data = (void*)conf;
+         strlcpy(s, new_core_name, len);
+         free(new_core_name);
       }
 
-      core_info[i].path = strdup(contents->elems[i].data);
-
-      strlcpy(s, core_info[i].core_name, len);
+      config_file_free(conf);
+      break;
    }
 
-error:
    if (contents)
       dir_list_free(contents);
    contents = NULL;
-   core_info_list_free(core_info_list);
 }
 
 size_t core_info_list_num_info_files(core_info_list_t *core_info_list)
@@ -678,6 +779,106 @@ size_t core_info_list_num_info_files(core_info_list_t *core_info_list)
    return num;
 }
 
+bool core_info_unsupported_content_path(const char *path)
+{
+   size_t i;
+   const char *archive_path = NULL;
+   const char *delim        = path_get_archive_delim(path);
+
+   if (delim)
+      archive_path = delim - 1;
+
+   if (!core_info_curr_list)
+      return false;
+
+   /* if the path contains a compressed file and the core supports archives,
+    * we don't want to look at this file */
+   if (archive_path)
+   {
+      for (i = 0; i < core_info_curr_list->count; i++)
+      {
+         const core_info_t *info = &core_info_curr_list->list[i];
+
+         if (     !string_list_find_elem(info->supported_extensions_list, "zip")
+               && !string_list_find_elem(info->supported_extensions_list, "7z"))
+            continue;
+
+         return false;
+      }
+   }
+
+   for (i = 0; i < core_info_curr_list->count; i++)
+   {
+      const core_info_t *info = &core_info_curr_list->list[i];
+
+      if (string_list_find_elem(info->supported_extensions_list, path_get_extension(path)))
+         return false;
+   }
+
+   return true;
+}
+
+bool core_info_database_supports_content_path(const char *database_path, const char *path)
+{
+   size_t i;
+   char *database           = NULL;
+   const char *delim        = NULL;
+   const char *archive_path = NULL;
+   const char *new_path     = NULL;
+
+   if (!core_info_curr_list)
+      return false;
+
+   new_path                 = path_basename(database_path);
+
+   if (!string_is_empty(new_path))
+      database = strdup(new_path);
+
+   path_remove_extension(database);
+
+   delim = path_get_archive_delim(path);
+
+   if (delim)
+      archive_path = delim - 1;
+
+   /* if the path contains a compressed file and the core supports archives,
+    * we don't want to look at this file */
+   if (archive_path)
+   {
+      for (i = 0; i < core_info_curr_list->count; i++)
+      {
+         const core_info_t *info = &core_info_curr_list->list[i];
+
+         if (!string_list_find_elem(info->databases_list, database))
+            continue;
+
+         if (     !string_list_find_elem(info->supported_extensions_list, "zip")
+               && !string_list_find_elem(info->supported_extensions_list, "7z"))
+            continue;
+
+         free(database);
+         return false;
+      }
+   }
+
+   for (i = 0; i < core_info_curr_list->count; i++)
+   {
+      const core_info_t *info = &core_info_curr_list->list[i];
+
+      if (!string_list_find_elem(info->supported_extensions_list, path_get_extension(path)))
+         continue;
+
+      if (!string_list_find_elem(info->databases_list, database))
+         continue;
+
+      free(database);
+      return true;
+   }
+
+   free(database);
+   return false;
+}
+
 bool core_info_list_get_display_name(core_info_list_t *core_info_list,
       const char *path, char *s, size_t len)
 {
@@ -689,12 +890,15 @@ 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 (string_is_equal(path_basename(info->path), path_basename(path))
-            && info->display_name)
-      {
-         strlcpy(s, info->display_name, len);
-         return true;
-      }
+
+      if (!string_is_equal(path_basename(info->path), path_basename(path)))
+         continue;
+
+      if (!info->display_name)
+         continue;
+
+      strlcpy(s, info->display_name, len);
+      return true;
    }
 
    return false;
@@ -702,40 +906,24 @@ bool core_info_list_get_display_name(core_info_list_t *core_info_list,
 
 bool core_info_get_display_name(const char *path, char *s, size_t len)
 {
-   char       *core_name    = NULL;
-   char       *display_name = NULL;
-   config_file_t *conf      = NULL;
-
-   if (!path_file_exists(path))
-      return false;
-
-   conf = config_file_new(path);
+   bool               ret   = true;
+   char       *tmp          = NULL;
+   config_file_t *conf      = config_file_new(path);
 
    if (!conf)
-      return false;
-
-   config_get_string(conf, "corename",
-         &core_name);
-   config_get_string(conf, "display_name",
-         &display_name);
-
-   if (!core_name || !display_name)
+   {
+      ret = false;
       goto error;
+   }
 
-   config_file_free(conf);
-
-   snprintf(s, len,"%s",display_name);
-
-   free(core_name);
-   free(display_name);
-
-   return true;
+   if (config_get_string(conf, "display_name", &tmp))
+   {
+      strlcpy(s, tmp, len);
+      free(tmp);
+   }
 
 error:
    config_file_free(conf);
-   if (core_name)
-      free(core_name);
-   if (display_name)
-      free(display_name);
-   return false;
+
+   return ret;
 }

core_info.h

@@ -2,6 +2,7 @@
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
  *  Copyright (C) 2011-2016 - Daniel De Matteis
  *  Copyright (C) 2013-2015 - Jason Fetters
+ *  Copyright (C) 2016 - Brad Parker
  * 
  *  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-
@@ -52,7 +53,7 @@ typedef struct
    char *notes;
    struct string_list *categories_list;
    struct string_list *databases_list;
-   struct string_list *note_list;   
+   struct string_list *note_list;
    struct string_list *supported_extensions_list;
    struct string_list *authors_list;
    struct string_list *permissions_list;
@@ -119,6 +120,10 @@ bool core_info_find(core_info_ctx_find_t *info, const char *name);
 
 bool core_info_load(core_info_ctx_find_t *info);
 
+bool core_info_database_supports_content_path(const char *database_path, const char *path);
+
+bool core_info_unsupported_content_path(const char *path);
+
 RETRO_END_DECLS
 
 #endif /* CORE_INFO_H_ */

core_type.h

@@ -22,7 +22,8 @@ enum rarch_core_type
    CORE_TYPE_DUMMY,
    CORE_TYPE_FFMPEG,
    CORE_TYPE_IMAGEVIEWER,
-   CORE_TYPE_NETRETROPAD
+   CORE_TYPE_NETRETROPAD,
+   CORE_TYPE_VIDEO_PROCESSOR
 };
 
 #endif

cores/dynamic_dummy.c

@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2015 - Daniel De Matteis
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
  *  Copyright (C) 2012-2015 - Michael Lelli
  * 
  *  RetroArch is free software: you can redistribute it and/or modify it under the terms

cores/internal_cores.h

@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2015 - Daniel De Matteis
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
  *  Copyright (C) 2012-2015 - Michael Lelli
  * 
  *  RetroArch is free software: you can redistribute it and/or modify it under the terms
@@ -21,6 +21,10 @@
 #include <boolean.h>
 #include <libretro.h>
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
 void libretro_dummy_retro_init(void);
 
 void libretro_dummy_retro_deinit(void);
@@ -184,7 +188,7 @@ size_t libretro_imageviewer_retro_get_memory_size(unsigned id);
 
 #endif
 
-#if defined(HAVE_NETWORKGAMEPAD) && defined(HAVE_NETPLAY)
+#if defined(HAVE_NETWORKGAMEPAD) && defined(HAVE_NETWORKING)
 /* Internal networked retropad core. */
 
 void libretro_netretropad_retro_init(void);
@@ -240,4 +244,60 @@ size_t libretro_netretropad_retro_get_memory_size(unsigned id);
 
 #endif
 
+#if defined(HAVE_V4L2)
+/* Internal video processor core. */
+
+void libretro_videoprocessor_retro_init(void);
+
+void libretro_videoprocessor_retro_deinit(void);
+
+unsigned libretro_videoprocessor_retro_api_version(void);
+
+void libretro_videoprocessor_retro_get_system_info(struct retro_system_info *info);
+
+void libretro_videoprocessor_retro_get_system_av_info(struct retro_system_av_info *info);
+
+void libretro_videoprocessor_retro_set_environment(retro_environment_t cb);
+
+void libretro_videoprocessor_retro_set_video_refresh(retro_video_refresh_t cb);
+
+void libretro_videoprocessor_retro_set_audio_sample(retro_audio_sample_t cb);
+
+void libretro_videoprocessor_retro_set_audio_sample_batch(retro_audio_sample_batch_t cb);
+
+void libretro_videoprocessor_retro_set_input_poll(retro_input_poll_t cb);
+
+void libretro_videoprocessor_retro_set_input_state(retro_input_state_t cb);
+
+void libretro_videoprocessor_retro_set_controller_port_device(unsigned port, unsigned device);
+
+void libretro_videoprocessor_retro_reset(void);
+
+void libretro_videoprocessor_retro_run(void);
+
+size_t libretro_videoprocessor_retro_serialize_size(void);
+
+bool libretro_videoprocessor_retro_serialize(void *data, size_t size);
+
+bool libretro_videoprocessor_retro_unserialize(const void *data, size_t size);
+
+void libretro_videoprocessor_retro_cheat_reset(void);
+
+void libretro_videoprocessor_retro_cheat_set(unsigned index, bool enabled, const char *code);
+
+bool libretro_videoprocessor_retro_load_game(const struct retro_game_info *game);
+
+bool libretro_videoprocessor_retro_load_game_special(unsigned game_type,
+      const struct retro_game_info *info, size_t num_info);
+
+void libretro_videoprocessor_retro_unload_game(void);
+
+unsigned libretro_videoprocessor_retro_get_region(void);
+
+void *libretro_videoprocessor_retro_get_memory_data(unsigned id);
+
+size_t libretro_videoprocessor_retro_get_memory_size(unsigned id);
+
+#endif
+
 #endif

cores/libretro-ffmpeg/Makefile.common

@@ -0,0 +1,182 @@
+LIBAVCODEC_SOURCE  :=
+LIBAVFORMAT_SOURCE :=
+LIBAVUTIL_SOURCE   :=
+DEPS_SOURCE        :=
+DEFINES            := -DHAVE_SWRESAMPLE
+LIBRETRO_SOURCE    := 
+GL_SOURCE          :=
+
+CPUOPTS            :=
+DEPS_DIR           := $(CORE_DIR)/deps
+LIBRETRO_COMM_DIR  := $(CORE_DIR)/libretro-common
+BASE_DIR       	 := $(CORE_DIR)/..
+AVFORMAT_DIR   	 := $(BASE_DIR)/libavformat
+AVCODEC_DIR    	 := $(BASE_DIR)/libavcodec
+AVUTIL_DIR     	 := $(BASE_DIR)/libavutil
+SWSCALE_DIR    	 := $(BASE_DIR)/libswscale
+SWRESAMPLE_DIR 	 := $(BASE_DIR)/libswresample
+
+
+INCFLAGS           += -I$(BASE_DIR) -I$(CORE_DIR) -I$(LIBRETRO_COMM_DIR)/include -I$(LIBRETRO_COMM_DIR)/include/compat
+
+LIBRETRO_SOURCE    += $(CORE_DIR)/ffmpeg_core.c \
+							 $(LIBRETRO_COMM_DIR)/queues/fifo_queue.c \
+							 $(LIBRETRO_COMM_DIR)/rthreads/rthreads.c
+
+ifeq ($(LIBRETRO_SWITCH),1)
+DEFINES += -DLIBRETRO_SWITCH=1
+INTERNAL_LIBAVCODEC    = 1
+INTERNAL_LIBAVFORMAT   = 1
+INTERNAL_LIBAVUTIL     = 1
+INTERNAL_LIBSWRESAMPLE = 1
+INTERNAL_LIBSWSCALE    = 1
+
+INTERNAL_LIBASS        = 0
+INTERNAL_LIBFLAC       = 1
+INTERNAL_LIBOGG        = 1
+INTERNAL_LIBLAME       = 1
+INTERNAL_LIBFAAC       = 1
+INTERNAL_LIBVORBIS     = 1
+INTERNAL_ZLIB          = 1
+endif
+
+ifeq ($(INTERNAL_LIBAVCODEC),1)
+	BAKE_IN_FFMPEG=1
+else
+ifneq (,$(findstring unix,$(platform)))
+   LIBS += $(shell pkg-config libavcodec --libs)
+   CFLAGS += $(shell pkg-config libavcodec --cflags)
+else ifneq (,$(findstring osx,$(platform)))
+   LIBS += $(shell pkg-config libavcodec --libs)
+   CFLAGS += $(shell pkg-config libavcodec --cflags)
+else ifneq (,$(findstring win,$(platform)))
+   LIBS += -lavcodec
+endif
+endif
+
+ifeq ($(INTERNAL_LIBASS),1)
+else
+ifeq ($(WANT_LIBASS),1)
+
+ifneq (,$(findstring unix,$(platform)))
+ifneq (,$(findstring osx,$(platform)))
+   LIBS += $(shell pkg-config libass --libs)
+   CFLAGS += $(shell pkg-config libass --cflags)
+endif
+endif
+
+endif
+endif
+
+ifeq ($(INTERNAL_LIBAVFORMAT),1)
+	BAKE_IN_FFMPEG=1
+else
+ifneq (,$(findstring unix,$(platform)))
+   LIBS += $(shell pkg-config libavformat --libs)
+   CFLAGS += $(shell pkg-config libavformat --cflags)
+else ifneq (,$(findstring osx,$(platform)))
+   LIBS += $(shell pkg-config libavformat --libs)
+   CFLAGS += $(shell pkg-config libavformat --cflags)
+else ifneq (,$(findstring win,$(platform)))
+   LIBS += -lavformat
+endif
+endif
+
+ifeq ($(INTERNAL_LIBSWRESAMPLE),1)
+	BAKE_IN_FFMPEG=1
+else
+ifneq (,$(findstring unix,$(platform)))
+   LIBS += $(shell pkg-config libswresample --libs)
+   CFLAGS += $(shell pkg-config libswresample --cflags)
+else ifneq (,$(findstring osx,$(platform)))
+   LIBS += $(shell pkg-config libswresample --libs)
+   CFLAGS += $(shell pkg-config libswresample --cflags)
+else ifneq (,$(findstring win,$(platform)))
+   LIBS += -lswresample
+endif
+endif
+
+ifeq ($(INTERNAL_LIBSWSCALE),1)
+	BAKE_IN_FFMPEG=1
+else
+ifneq (,$(findstring unix,$(platform)))
+   LIBS += $(shell pkg-config libswscale --libs)
+   CFLAGS += $(shell pkg-config libswscale --cflags)
+else ifneq (,$(findstring osx,$(platform)))
+   LIBS += $(shell pkg-config libswscale --libs)
+   CFLAGS += $(shell pkg-config libswscale --cflags)
+else ifneq (,$(findstring win,$(platform)))
+	LIBS += -lswscale
+endif
+endif
+
+ifeq ($(INTERNAL_LIBAVUTIL),1)
+	BAKE_IN_FFMPEG=1
+else
+ifneq (,$(findstring unix,$(platform)))
+   LIBS += $(shell pkg-config libavutil --libs)
+   CFLAGS += $(shell pkg-config libavutil --cflags)
+else ifneq (,$(findstring osx,$(platform)))
+   gIBS += $(shell pkg-config libavutil --libs)
+   CFLAGS += $(shell pkg-config libavutil --cflags)
+else ifneq (,$(findstring win,$(platform)))
+   LIBS += -lavutil
+endif
+endif
+
+ifeq ($(HAVE_BIGENDIAN),1)
+CPUOPTS += -DHAVE_BIGENDIAN=1 -DMSB_FIRST
+else
+CPUOPTS += -DHAVE_BIGENDIAN=0
+endif
+
+ifeq ($(HAVE_SSA), 1)
+   LIBS += $(shell pkg-config libass --libs)
+   DEFINES += -DHAVE_SSA
+endif
+
+ifeq ($(BAKE_IN_FFMPEG),1)
+DEFINES += -DHAVE_GMTIME_R -DHAVE_LOCALTIME_R
+
+ifneq (,$(findstring unix,$(platform)))
+	DEFINES += -DHAVE_STRUCT_SOCKADDR_STORAGE -DHAVE_STRUCT_ADDRINFO -DHAVE_FMINF
+else ifneq (,$(findstring osx,$(platform)))
+	DEFINES += -DHAVE_STRUCT_SOCKADDR_STORAGE -DHAVE_STRUCT_ADDRINFO
+endif
+
+include $(CORE_DIR)/Makefile.ffmpeg
+endif
+
+ifeq ($(HAVE_OPENGL),1)
+ifeq ($(GLES),1)
+	LIBS      += $(GL_LIB)
+	GLFLAGS   += -DHAVE_OPENGLES -DHAVE_OPENGLES3
+	GL_SOURCE += $(LIBRETRO_COMM_DIR)/glsym/glsym_es3.c
+else
+	LIBS += $(GL_LIB)
+	GLFLAGS += -DHAVE_OPENGL
+	GL_SOURCE += $(LIBRETRO_COMM_DIR)/glsym/glsym_gl.c
+endif
+GL_SOURCE += $(LIBRETRO_COMM_DIR)/glsym/rglgen.c
+
+ifeq ($(HAVE_GL_FFT), 1)
+   DEFINES    += -DHAVE_GL_FFT
+   INCFLAGS   += -I$(CORE_DIR)/fft
+   FFT_SOURCE += $(CORE_DIR)/fft/fft.cpp
+endif
+endif
+
+ifeq ($(HAVE_PTHREADS),1)
+LIBS += -lpthread
+endif
+
+SOURCES_C := 	$(GL_SOURCE) \
+                $(DEPS_SOURCE) \
+                $(LIBRETRO_SOURCE) \
+                $(LIBAVUTIL_SOURCE) \
+                $(LIBAVFORMAT_SOURCE) \
+                $(LIBSWSCALE_SOURCE) \
+                $(LIBAVCODEC_SOURCE) \
+                $(LIBSWRESAMPLE_SOURCE)
+
+SOURCES_CXX := $(FFT_SOURCE)

cores/libretro-ffmpeg/ffmpeg_core.c

@@ -1,3 +1,4 @@
+/*  Copyright (C) 2016 - Brad Parker */
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdbool.h>
@@ -22,7 +23,10 @@ extern "C" {
 #include <libavutil/time.h>
 #include <libavutil/opt.h>
 #include <libavdevice/avdevice.h>
+#ifdef HAVE_SWRESAMPLE
 #include <libswresample/swresample.h>
+#endif
+
 #ifdef HAVE_SSA
 #include <ass/ass.h>
 #endif
@@ -35,7 +39,7 @@ extern "C" {
 #include "fft/fft.h"
 #endif
 
-#ifdef HAVE_OPENGL
+#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES)
 #include <glsym/glsym.h>
 #endif
 
@@ -145,7 +149,7 @@ static double seek_time;
 /* GL stuff */
 struct frame
 {
-#if defined(HAVE_OPENGL)
+#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES)
    GLuint tex;
 #if !defined(HAVE_OPENGLES)
    GLuint pbo;
@@ -156,7 +160,7 @@ struct frame
 
 static struct frame frames[2];
 
-#ifdef HAVE_OPENGL
+#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES)
 static bool temporal_interpolation;
 static bool use_gl;
 static struct retro_hw_render_callback hw_render;
@@ -236,7 +240,7 @@ void CORE_PREFIX(retro_get_system_info)(struct retro_system_info *info)
    info->library_name     = "FFmpeg";
    info->library_version  = "v1";
    info->need_fullpath    = true;
-   info->valid_extensions = "mkv|avi|f4v|f4f|3gp|ogm|flv|mp4|mov|mp3|wav|webm|wmv|flac|ogg|m4a";
+   info->valid_extensions = "mkv|avi|f4v|f4f|3gp|ogm|flv|mp4|mp3|flac|ogg|m4a|webm|3g2|mov|wmv|mpg|mpeg|vob|asf|divx|m2p|m2ts|ps|ts|mxf|wma|wav";
 }
 
 void CORE_PREFIX(retro_get_system_av_info)(struct retro_system_av_info *info)
@@ -267,12 +271,12 @@ void CORE_PREFIX(retro_get_system_av_info)(struct retro_system_av_info *info)
 void CORE_PREFIX(retro_set_environment)(retro_environment_t cb)
 {
    static const struct retro_variable vars[] = {
-#ifdef HAVE_OPENGL
+#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES)
       { "ffmpeg_temporal_interp", "Temporal Interpolation; enabled|disabled" },
-#endif
 #ifdef HAVE_GL_FFT
       { "ffmpeg_fft_resolution", "GLFFT Resolution; 1280x720|1920x1080|640x360|320x180" },
       { "ffmpeg_fft_multisample", "GLFFT Multisample; 1x|2x|4x" },
+#endif
 #endif
       { "ffmpeg_color_space", "Colorspace; auto|BT.709|BT.601|FCC|SMPTE240M" },
       { NULL, NULL },
@@ -322,7 +326,7 @@ void CORE_PREFIX(retro_reset)(void)
 static void check_variables(void)
 {
    struct retro_variable color_var  = {0};
-#ifdef HAVE_OPENGL
+#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES)
    struct retro_variable var        = {0};
 #endif
 #ifdef HAVE_GL_FFT
@@ -330,7 +334,7 @@ static void check_variables(void)
    struct retro_variable fft_ms_var = {0};
 #endif
 
-#ifdef HAVE_OPENGL
+#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES)
    var.key = "ffmpeg_temporal_interp";
 
    if (CORE_PREFIX(environ_cb)(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
@@ -340,7 +344,6 @@ static void check_variables(void)
       else if (!strcmp(var.value, "disabled"))
          temporal_interpolation = false;
    }
-#endif
 
 #ifdef HAVE_GL_FFT
    fft_var.key = "ffmpeg_fft_resolution";
@@ -362,6 +365,7 @@ static void check_variables(void)
 
    if (CORE_PREFIX(environ_cb)(RETRO_ENVIRONMENT_GET_VARIABLE, &fft_ms_var) && fft_ms_var.value)
       fft_multisample = strtoul(fft_ms_var.value, NULL, 0);
+#endif
 #endif
 
    color_var.key = "ffmpeg_color_space";
@@ -433,9 +437,9 @@ void CORE_PREFIX(retro_run)(void)
    double min_pts;
    int16_t audio_buffer[2048];
    bool left, right, up, down, l, r;
-   size_t to_read_frames = 0;
-   int seek_frames = 0;
-   bool updated = false;
+   size_t to_read_frames        = 0;
+   int seek_frames              = 0;
+   bool updated                 = false;
 #ifdef HAVE_GL_FFT
    unsigned old_fft_width       = fft_width;
    unsigned old_fft_height      = fft_height;
@@ -621,37 +625,43 @@ void CORE_PREFIX(retro_run)(void)
 
          if (!decode_thread_dead)
          {
+            uint32_t *data = video_frame_temp_buffer;
             fifo_read(video_decode_fifo, &pts, sizeof(int64_t));
-#if defined(HAVE_OPENGL)
+#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES)
             if (use_gl)
             {
-#if defined(HAVE_OPENGLES)
-               fifo_read(video_decode_fifo, video_frame_temp_buffer, media.width * media.height * sizeof(uint32_t));
-               glBindTexture(GL_TEXTURE_2D, frames[1].tex);
-               glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
-                     media.width, media.height, 0, GL_RGBA, GL_UNSIGNED_BYTE, video_frame_temp_buffer);
-               glBindTexture(GL_TEXTURE_2D, 0);
-#else
-               uint32_t *data = NULL;
+#ifndef HAVE_OPENGLES
                glBindBuffer(GL_PIXEL_UNPACK_BUFFER, frames[1].pbo);
-
+#ifdef __MACH__
+               data = (uint32_t*)glMapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY);
+#else
                data = (uint32_t*)glMapBufferRange(GL_PIXEL_UNPACK_BUFFER,
-                     0, media.width * media.height, GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_BUFFER_BIT);
-               
+                     0, media.width * media.height * sizeof(uint32_t), GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_BUFFER_BIT);
+#endif
+#endif
+
                fifo_read(video_decode_fifo, data, media.width * media.height * sizeof(uint32_t));
-               
+
+#ifndef HAVE_OPENGLES
                glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER);
+#endif
                glBindTexture(GL_TEXTURE_2D, frames[1].tex);
+#if defined(HAVE_OPENGLES)
+               glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
+                     media.width, media.height, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
+#else
                glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
                      media.width, media.height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL);
+#endif
                glBindTexture(GL_TEXTURE_2D, 0);
+#ifndef HAVE_OPENGLES
                glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
 #endif
             }
             else
 #endif
             {
-               fifo_read(video_decode_fifo, video_frame_temp_buffer, media.width * media.height * sizeof(uint32_t));
+               fifo_read(video_decode_fifo, data, media.width * media.height * sizeof(uint32_t));
                dupe = false;
             }
          }
@@ -662,7 +672,7 @@ void CORE_PREFIX(retro_run)(void)
          frames[1].pts = av_q2d(fctx->streams[video_stream]->time_base) * pts;
       }
 
-#ifdef HAVE_OPENGL
+#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES)
       if (use_gl)
       {
          float mix_factor = (min_pts - frames[0].pts) / (frames[1].pts - frames[0].pts);
@@ -702,15 +712,17 @@ void CORE_PREFIX(retro_run)(void)
          glActiveTexture(GL_TEXTURE0);
          glBindTexture(GL_TEXTURE_2D, 0);
          
-         CORE_PREFIX(video_cb)(RETRO_HW_FRAME_BUFFER_VALID, media.width, media.height, media.width * sizeof(uint32_t));
+         CORE_PREFIX(video_cb)(RETRO_HW_FRAME_BUFFER_VALID,
+               media.width, media.height, media.width * sizeof(uint32_t));
       }
       else
 #endif
       {
-         CORE_PREFIX(video_cb)(dupe ? NULL : video_frame_temp_buffer, media.width, media.height, media.width * sizeof(uint32_t));
+         CORE_PREFIX(video_cb)(dupe ? NULL : video_frame_temp_buffer,
+               media.width, media.height, media.width * sizeof(uint32_t));
       }
    }
-#ifdef HAVE_GL_FFT
+#if defined(HAVE_GL_FFT) && (defined(HAVE_OPENGL) || defined(HAVE_OPENGLES))
    else if (fft)
    {
       unsigned       frames = to_read_frames;
@@ -730,7 +742,8 @@ void CORE_PREFIX(retro_run)(void)
          frames -= to_read;
       }
       glfft_render(fft, hw_render.get_current_framebuffer(), fft_width, fft_height);
-      CORE_PREFIX(video_cb)(RETRO_HW_FRAME_BUFFER_VALID, fft_width, fft_height, fft_width * sizeof(uint32_t));
+      CORE_PREFIX(video_cb)(RETRO_HW_FRAME_BUFFER_VALID,
+            fft_width, fft_height, fft_width * sizeof(uint32_t));
    }
 #endif
    else
@@ -771,8 +784,10 @@ static bool codec_is_image(enum AVCodecID id)
          return true;
 
       default:
-         return false;
+         break;
    }
+
+   return false;
 }
 
 static bool codec_id_is_ttf(enum AVCodecID id)
@@ -787,8 +802,10 @@ static bool codec_id_is_ttf(enum AVCodecID id)
          return true;
 
       default:
-       return false;
+         break;
    }
+
+   return false;
 }
 
 #ifdef HAVE_SSA
@@ -815,11 +832,16 @@ static bool open_codecs(void)
 {
    unsigned i;
 
+   decode_thread_lock   = slock_new();
+
    video_stream         = -1;
    audio_streams_num    = 0;
-   audio_streams_ptr    = 0;
    subtitle_streams_num = 0;
+
+   slock_lock(decode_thread_lock);
+   audio_streams_ptr    = 0;
    subtitle_streams_ptr = 0;
+   slock_unlock(decode_thread_lock);
 
    memset(audio_streams,    0, sizeof(audio_streams));
    memset(subtitle_streams, 0, sizeof(subtitle_streams));
@@ -839,7 +861,8 @@ static bool open_codecs(void)
             break;
 
          case AVMEDIA_TYPE_VIDEO:
-            if (!vctx && !codec_is_image(fctx->streams[i]->codec->codec_id))
+            if (     !vctx 
+                  && !codec_is_image(fctx->streams[i]->codec->codec_id))
             {
                if (!open_codec(&vctx, i))
                   return false;
@@ -849,7 +872,8 @@ static bool open_codecs(void)
 
          case AVMEDIA_TYPE_SUBTITLE:
 #ifdef HAVE_SSA
-            if (subtitle_streams_num < MAX_STREAMS && codec_id_is_ass(fctx->streams[i]->codec->codec_id))
+            if (     subtitle_streams_num < MAX_STREAMS 
+                  && codec_id_is_ass(fctx->streams[i]->codec->codec_id))
             {
                int size;
                AVCodecContext **s = &sctx[subtitle_streams_num];
@@ -894,6 +918,7 @@ static bool init_media_info(void)
       media.sample_rate = actx[0]->sample_rate;
 
    media.interpolate_fps = 60.0;
+
    if (vctx)
    {
       media.width  = vctx->width;
@@ -982,7 +1007,8 @@ static bool decode_video(AVPacket *pkt, AVFrame *frame,
    {
       set_colorspace(sws, media.width, media.height,
             av_frame_get_colorspace(frame), av_frame_get_color_range(frame));
-      sws_scale(sws, (const uint8_t * const*)frame->data, frame->linesize, 0, media.height,
+      sws_scale(sws, (const uint8_t * const*)frame->data,
+            frame->linesize, 0, media.height,
             conv->data, conv->linesize);
       return true;
    }
@@ -1001,8 +1027,8 @@ static int16_t *decode_audio(AVCodecContext *ctx, AVPacket *pkt,
    {
       int64_t pts;
       size_t required_buffer;
-
       int ret = avcodec_decode_audio4(ctx, frame, &got_ptr, &pkt_tmp);
+
       if (ret < 0)
          return buffer;
 
@@ -1091,20 +1117,20 @@ static void render_ass_img(AVFrame *conv_frame, ASS_Image *img)
    for (; img; img = img->next)
    {
       int x, y;
-      uint32_t *dst;
       unsigned r, g, b, a;
+      uint32_t *dst         = NULL;
       const uint8_t *bitmap = NULL;
 
       if (img->w == 0 && img->h == 0)
          continue;
 
       bitmap = img->bitmap;
-      dst = frame + img->dst_x + img->dst_y * stride;
+      dst    = frame + img->dst_x + img->dst_y * stride;
 
-      r = (img->color >> 24) & 0xff;
-      g = (img->color >> 16) & 0xff;
-      b = (img->color >>  8) & 0xff;
-      a = 255 - (img->color & 0xff);
+      r      = (img->color >> 24) & 0xff;
+      g      = (img->color >> 16) & 0xff;
+      b      = (img->color >>  8) & 0xff;
+      a      = 255 - (img->color & 0xff);
 
       for (y = 0; y < img->h; y++,
             bitmap += img->stride, dst += stride)
@@ -1115,9 +1141,9 @@ static void render_ass_img(AVFrame *conv_frame, ASS_Image *img)
             unsigned dst_alpha = 256 - src_alpha;
 
             uint32_t dst_color = dst[x];
-            unsigned dst_r = (dst_color >> 16) & 0xff;
-            unsigned dst_g = (dst_color >>  8) & 0xff;
-            unsigned dst_b = (dst_color >>  0) & 0xff;
+            unsigned dst_r     = (dst_color >> 16) & 0xff;
+            unsigned dst_g     = (dst_color >>  8) & 0xff;
+            unsigned dst_b     = (dst_color >>  0) & 0xff;
 
             dst_r = (r * src_alpha + dst_r * dst_alpha) >> 8;
             dst_g = (g * src_alpha + dst_g * dst_alpha) >> 8;
@@ -1134,8 +1160,9 @@ static void render_ass_img(AVFrame *conv_frame, ASS_Image *img)
 static void decode_thread(void *data)
 {
    unsigned i;
-   AVFrame *aud_frame, *vid_frame;
    SwrContext *swr[audio_streams_num];
+   AVFrame *aud_frame      = NULL;
+   AVFrame *vid_frame      = NULL;
    void *conv_frame_buf    = NULL;
    size_t frame_size       = 0;
    int16_t *audio_buffer   = NULL;
@@ -1146,12 +1173,10 @@ static void decode_thread(void *data)
    (void)data;
    
    if (video_stream >= 0)
-   {
       sws = sws_getCachedContext(NULL,
             media.width, media.height, vctx->pix_fmt,
             media.width, media.height, PIX_FMT_RGB32,
             SWS_POINT, NULL, NULL, NULL);
-   }
 
    for (i = 0; (int)i < audio_streams_num; i++)
    {
@@ -1181,18 +1206,18 @@ static void decode_thread(void *data)
    while (!decode_thread_dead)
    {
       bool seek;
+      AVPacket pkt;
+      int subtitle_stream;
       double seek_time_thread;
       int audio_stream, audio_stream_ptr;
-      int subtitle_stream;
-      AVPacket pkt;
-      AVCodecContext *actx_active;
-      AVCodecContext *sctx_active;
+      AVCodecContext *actx_active = NULL;
+      AVCodecContext *sctx_active = NULL;
 #ifdef HAVE_SSA
-      ASS_Track *ass_track_active;
+      ASS_Track *ass_track_active = NULL;
 #endif
 
       slock_lock(fifo_lock);
-      seek = do_seek;
+      seek             = do_seek;
       seek_time_thread = seek_time;
       slock_unlock(fifo_lock);
 
@@ -1237,9 +1262,9 @@ static void decode_thread(void *data)
             double video_time = pts * av_q2d(fctx->streams[video_stream]->time_base);
 
 #ifdef HAVE_SSA
-            if (ass_render)
+            if (ass_render && ass_track_active)
             {
-               int change = 0;
+               int change     = 0;
                ASS_Image *img = ass_render_frame(ass_render, ass_track_active,
                      1000 * video_time, &change);
 
@@ -1282,13 +1307,13 @@ static void decode_thread(void *data)
             slock_unlock(fifo_lock);
          }
       }
-      else if (pkt.stream_index == audio_stream)
+      else if (pkt.stream_index == audio_stream && actx_active)
       {
          audio_buffer = decode_audio(actx_active, &pkt, aud_frame,
                audio_buffer, &audio_buffer_cap,
                swr[audio_stream_ptr]);
       }
-      else if (pkt.stream_index == subtitle_stream)
+      else if (pkt.stream_index == subtitle_stream && sctx_active)
       {
          AVSubtitle sub;
          int finished = 0;
@@ -1307,7 +1332,7 @@ static void decode_thread(void *data)
 #ifdef HAVE_SSA
          for (i = 0; i < sub.num_rects; i++)
          {
-            if (sub.rects[i]->ass)
+            if (sub.rects[i]->ass && ass_track_active)
                ass_process_data(ass_track_active,
                      sub.rects[i]->ass, strlen(sub.rects[i]->ass));
          }
@@ -1338,7 +1363,7 @@ static void decode_thread(void *data)
    slock_unlock(fifo_lock);
 }
 
-#ifdef HAVE_OPENGL
+#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES)
 static void context_destroy(void)
 {
 #ifdef HAVE_GL_FFT
@@ -1350,29 +1375,19 @@ static void context_destroy(void)
 #endif
 }
 
-static void context_reset(void)
-{
-   static const char *vertex_source =
-      "attribute vec2 aVertex;\n"
-      "attribute vec2 aTexCoord;\n"
-      "varying vec2 vTex;\n"
-      "void main() { gl_Position = vec4(aVertex, 0.0, 1.0); vTex = aTexCoord; }\n";
+#include "gl_shaders/ffmpeg.glsl.vert.h"
 
-   static const char *fragment_source =
-      "#ifdef GL_ES\n"
-      "precision mediump float;\n"
-      "#endif\n"
-      "varying vec2 vTex;\n"
-      "uniform sampler2D sTex0;\n"
-      "uniform sampler2D sTex1;\n"
-      "uniform float uMix;\n"
-#if defined(HAVE_OPENGLES)
-      "void main() { gl_FragColor = vec4(pow(mix(pow(texture2D(sTex0, vTex).bgr, vec3(2.2)), pow(texture2D(sTex1, vTex).bgr, vec3(2.2)), uMix), vec3(1.0 / 2.2)), 1.0); }\n";
-      // Get format as GL_RGBA/GL_UNSIGNED_BYTE. Assume little endian, so we get ARGB -> BGRA byte order, and we have to swizzle to .BGR.
+/* OpenGL ES note about main() -  Get format as GL_RGBA/GL_UNSIGNED_BYTE. 
+ * Assume little endian, so we get ARGB -> BGRA byte order, and 
+ * we have to swizzle to .BGR. */
+#ifdef HAVE_OPENGLES
+#include "gl_shaders/ffmpeg_es.glsl.frag.h"
 #else
-      "void main() { gl_FragColor = vec4(pow(mix(pow(texture2D(sTex0, vTex).rgb, vec3(2.2)), pow(texture2D(sTex1, vTex).rgb, vec3(2.2)), uMix), vec3(1.0 / 2.2)), 1.0); }\n";
+#include "gl_shaders/ffmpeg.glsl.frag.h"
 #endif
 
+static void context_reset(void)
+{
    static const GLfloat vertex_data[] = {
       -1, -1, 0, 0,
        1, -1, 1, 0,
@@ -1553,6 +1568,9 @@ bool CORE_PREFIX(retro_load_game)(const struct retro_game_info *info)
       { 0 },
    };
 
+   if (!info)
+      return false;
+
    CORE_PREFIX(environ_cb)(RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS, desc);
 
    if (!CORE_PREFIX(environ_cb)(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt))
@@ -1587,8 +1605,6 @@ bool CORE_PREFIX(retro_load_game)(const struct retro_game_info *info)
       goto error;
    }
 
-   decode_thread_dead = false;
-
 #ifdef HAVE_GL_FFT
    is_glfft = video_stream < 0 && audio_streams_num > 0;
 #endif
@@ -1598,7 +1614,7 @@ bool CORE_PREFIX(retro_load_game)(const struct retro_game_info *info)
       video_decode_fifo = fifo_new(media.width 
             * media.height * sizeof(uint32_t) * 32);
 
-#ifdef HAVE_OPENGL
+#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES)
       use_gl = true;
       hw_render.context_reset = context_reset;
       hw_render.context_destroy = context_destroy;
@@ -1612,7 +1628,7 @@ bool CORE_PREFIX(retro_load_game)(const struct retro_game_info *info)
 #endif
       if (!CORE_PREFIX(environ_cb)(RETRO_ENVIRONMENT_SET_HW_RENDER, &hw_render))
       {
-         use_gl=false;
+         use_gl = false;
          LOG_ERR("Cannot initialize HW render.");
       }
 #endif
@@ -1623,10 +1639,13 @@ bool CORE_PREFIX(retro_load_game)(const struct retro_game_info *info)
       audio_decode_fifo = fifo_new(buffer_seconds * media.sample_rate * sizeof(int16_t) * 2);
    }
 
-   fifo_cond = scond_new();
+   fifo_cond        = scond_new();
    fifo_decode_cond = scond_new();
-   fifo_lock = slock_new();
-   decode_thread_lock = slock_new();
+   fifo_lock        = slock_new();
+
+   slock_lock(fifo_lock);
+   decode_thread_dead = false;
+   slock_unlock(fifo_lock);
 
    check_variables();
 

cores/libretro-ffmpeg/fft/fft.cpp

@@ -9,15 +9,13 @@
 #include <retro_miscellaneous.h>
 #include <filters.h>
 #include <math/complex.h>
+#include <gfx/math/matrix_4x4.h>
 
 #define GLM_SWIZZLE
 #define GLM_FORCE_RADIANS
-#include <glm/glm.hpp>
+#include <glm/packing.hpp>
 #include <glm/gtc/matrix_transform.hpp>
-#include <glm/gtc/type_ptr.hpp>
-using namespace glm;
 
-#define GL_DEBUG 0
 #if GL_DEBUG
 #define GL_CHECK_ERROR() do { \
    if (glGetError() != GL_NO_ERROR) \
@@ -90,13 +88,13 @@ typedef struct GLFFT
    unsigned depth;
 } glfft_t;
 
-#include "gl_shaders/fft_heightmap.glsl.vert.h"
-#include "gl_shaders/fft_heightmap.glsl.frag.h"
-#include "gl_shaders/fft_vertex_program.glsl.vert.h"
-#include "gl_shaders/fft_fragment_program_resolve.glsl.frag.h"
-#include "gl_shaders/fft_fragment_program_real.glsl.frag.h"
-#include "gl_shaders/fft_fragment_program_complex.glsl.frag.h"
-#include "gl_shaders/fft_fragment_program_blur.glsl.frag.h"
+#include "../gl_shaders/fft_heightmap.glsl.vert.h"
+#include "../gl_shaders/fft_heightmap.glsl.frag.h"
+#include "../gl_shaders/fft_vertex_program.glsl.vert.h"
+#include "../gl_shaders/fft_fragment_program_resolve.glsl.frag.h"
+#include "../gl_shaders/fft_fragment_program_real.glsl.frag.h"
+#include "../gl_shaders/fft_fragment_program_complex.glsl.frag.h"
+#include "../gl_shaders/fft_fragment_program_blur.glsl.frag.h"
 
 static GLuint fft_compile_shader(glfft_t *fft, GLenum type, const char *source)
 {
@@ -151,9 +149,176 @@ static GLuint fft_compile_program(glfft_t *fft,
    return prog;
 }
 
+#define USE_GLM
+//#define GLM_USE_DEBUG
+
 static void fft_render(glfft_t *fft, GLuint backbuffer, unsigned width, unsigned height)
 {
-   mat4 mvp;
+#ifdef USE_GLM
+   glm::vec3 eye        = glm::vec3(0, 80, -60);
+   glm::vec3 center     = eye + glm::vec3(0.0f, 0.0f, 1.0f);
+
+#ifdef GLM_USE_DEBUG
+   printf("center : %.2f, %.2f, %.2f\n", center.x, center.y, center.z);
+#endif
+   glm::vec3 up         = glm::vec3(0.0f, 1.0f, 0.0f);
+   glm::mat4 mvp_persp  = glm::perspective((float)M_HALF_PI, (float)width / height, 
+1.0f, 500.0f);
+#ifdef GLM_USE_DEBUG
+   printf("mvp_persp: \n %.2f, %.2f, %.2f, %.2f \n %.2f, %.2f, %.2f, %.2f \n %.2f, %.2f, %.2f, %.2f \n %.2f, %.2f, %.2f, %.2f \n\n",
+         mvp_persp[0][0],
+         mvp_persp[0][1],
+         mvp_persp[0][2],
+         mvp_persp[0][3],
+         mvp_persp[1][0],
+         mvp_persp[1][1],
+         mvp_persp[1][2],
+         mvp_persp[1][3],
+         mvp_persp[2][0],
+         mvp_persp[2][1],
+         mvp_persp[2][2],
+         mvp_persp[2][3],
+         mvp_persp[3][0],
+         mvp_persp[3][1],
+         mvp_persp[3][2],
+         mvp_persp[3][3]
+         );
+#endif
+   glm::mat4 mvp_lookat = glm::lookAt(eye, center, up);
+#ifdef GLM_USE_DEBUG
+   printf("eye %.2f %.2f %.2f\n", eye.x, eye.y, eye.z);
+   printf("center %.2f %.2f %.2f\n", center.x, center.y, center.z);
+   printf("up %.2f %.2f %.2f\n", up.x, up.y, up.z);
+   printf("mvp_lookat: \n %.2f, %.2f, %.2f, %.2f \n %.2f, %.2f, %.2f, %.2f \n %.2f, %.2f, %.2f, %.2f \n %.2f, %.2f, %.2f, %.2f \n\n",
+         mvp_lookat[0][0],
+         mvp_lookat[0][1],
+         mvp_lookat[0][2],
+         mvp_lookat[0][3],
+         mvp_lookat[1][0],
+         mvp_lookat[1][1],
+         mvp_lookat[1][2],
+         mvp_lookat[1][3],
+         mvp_lookat[2][0],
+         mvp_lookat[2][1],
+         mvp_lookat[2][2],
+         mvp_lookat[2][3],
+         mvp_lookat[3][0],
+         mvp_lookat[3][1],
+         mvp_lookat[3][2],
+         mvp_lookat[3][3]
+         );
+#endif
+   glm::mat4 mvp        = mvp_persp * mvp_lookat;
+
+#ifdef GLM_USE_DEBUG
+   printf("mvp: \n %.2f, %.2f, %.2f, %.2f \n %.2f, %.2f, %.2f, %.2f \n %.2f, %.2f, %.2f, %.2f \n %.2f, %.2f, %.2f, %.2f \n\n",
+         mvp[0][0],
+         mvp[0][1],
+         mvp[0][2],
+         mvp[0][3],
+         mvp[1][0],
+         mvp[1][1],
+         mvp[1][2],
+         mvp[1][3],
+         mvp[2][0],
+         mvp[2][1],
+         mvp[2][2],
+         mvp[2][3],
+         mvp[3][0],
+         mvp[3][1],
+         mvp[3][2],
+         mvp[3][3]
+         );
+#endif
+#else
+   vec3_t eye, center, up;
+   math_matrix_4x4 mvp_lookat, mvp, mvp_persp;
+
+   eye[0]               = 0.0f;
+   eye[1]               = 80.0f;
+   eye[2]               = -60.0f;
+
+   up[0]                = 0.0f;
+   up[1]                = 1.0f;
+   up[2]                = 0.0f;
+
+   center[0]            = 0.0f;
+   center[1]            = 0.0f;
+   center[2]            = 1.0f;
+
+   vec3_add(&center[0], &eye[0]);
+
+#ifdef GLM_USE_DEBUG
+   printf("center : %.2f, %.2f, %.2f\n", center[0], center[1], center[2]);
+#endif
+
+   matrix_4x4_projection(&mvp_persp, (float)M_HALF_PI, (float)width / height, 1.0f, 500.0f);
+#ifdef GLM_USE_DEBUG
+   printf("mvp_persp: \n %.2f, %.2f, %.2f, %.2f \n %.2f, %.2f, %.2f, %.2f \n %.2f, %.2f, %.2f, %.2f \n %.2f, %.2f, %.2f, %.2f \n\n",
+         MAT_ELEM_4X4(mvp_persp, 0, 0),
+         MAT_ELEM_4X4(mvp_persp, 0, 1),
+         MAT_ELEM_4X4(mvp_persp, 0, 2),
+         MAT_ELEM_4X4(mvp_persp, 0, 3),
+         MAT_ELEM_4X4(mvp_persp, 1, 0),
+         MAT_ELEM_4X4(mvp_persp, 1, 1),
+         MAT_ELEM_4X4(mvp_persp, 1, 2),
+         MAT_ELEM_4X4(mvp_persp, 1, 3),
+         MAT_ELEM_4X4(mvp_persp, 2, 0),
+         MAT_ELEM_4X4(mvp_persp, 2, 1),
+         MAT_ELEM_4X4(mvp_persp, 2, 2),
+         MAT_ELEM_4X4(mvp_persp, 2, 3),
+         MAT_ELEM_4X4(mvp_persp, 3, 0),
+         MAT_ELEM_4X4(mvp_persp, 3, 1),
+         MAT_ELEM_4X4(mvp_persp, 3, 2),
+         MAT_ELEM_4X4(mvp_persp, 3, 3)
+         );
+   printf("eye %.2f %.2f %.2f\n", eye[0], eye[1], eye[2]);
+   printf("center %.2f %.2f %.2f\n", center[0], center[1], center[2]);
+   printf("up %.2f %.2f %.2f\n", up[0], up[1], up[2]);
+#endif
+   matrix_4x4_lookat(&mvp_lookat, eye, center, up);
+#ifdef GLM_USE_DEBUG
+   printf("mvp_lookat: \n %.2f, %.2f, %.2f, %.2f \n %.2f, %.2f, %.2f, %.2f \n %.2f, %.2f, %.2f, %.2f \n %.2f, %.2f, %.2f, %.2f \n\n",
+         MAT_ELEM_4X4(mvp_lookat, 0, 0),
+         MAT_ELEM_4X4(mvp_lookat, 0, 1),
+         MAT_ELEM_4X4(mvp_lookat, 0, 2),
+         MAT_ELEM_4X4(mvp_lookat, 0, 3),
+         MAT_ELEM_4X4(mvp_lookat, 1, 0),
+         MAT_ELEM_4X4(mvp_lookat, 1, 1),
+         MAT_ELEM_4X4(mvp_lookat, 1, 2),
+         MAT_ELEM_4X4(mvp_lookat, 1, 3),
+         MAT_ELEM_4X4(mvp_lookat, 2, 0),
+         MAT_ELEM_4X4(mvp_lookat, 2, 1),
+         MAT_ELEM_4X4(mvp_lookat, 2, 2),
+         MAT_ELEM_4X4(mvp_lookat, 2, 3),
+         MAT_ELEM_4X4(mvp_lookat, 3, 0),
+         MAT_ELEM_4X4(mvp_lookat, 3, 1),
+         MAT_ELEM_4X4(mvp_lookat, 3, 2),
+         MAT_ELEM_4X4(mvp_lookat, 3, 3)
+         );
+#endif
+   matrix_4x4_multiply(&mvp, &mvp_persp, &mvp_lookat);
+#ifdef GLM_USE_DEBUG
+   printf("mvp: \n %.2f, %.2f, %.2f, %.2f \n %.2f, %.2f, %.2f, %.2f \n %.2f, %.2f, %.2f, %.2f \n %.2f, %.2f, %.2f, %.2f \n\n",
+         MAT_ELEM_4X4(mvp, 0, 0),
+         MAT_ELEM_4X4(mvp, 0, 1),
+         MAT_ELEM_4X4(mvp, 0, 2),
+         MAT_ELEM_4X4(mvp, 0, 3),
+         MAT_ELEM_4X4(mvp, 1, 0),
+         MAT_ELEM_4X4(mvp, 1, 1),
+         MAT_ELEM_4X4(mvp, 1, 2),
+         MAT_ELEM_4X4(mvp, 1, 3),
+         MAT_ELEM_4X4(mvp, 2, 0),
+         MAT_ELEM_4X4(mvp, 2, 1),
+         MAT_ELEM_4X4(mvp, 2, 2),
+         MAT_ELEM_4X4(mvp, 2, 3),
+         MAT_ELEM_4X4(mvp, 3, 0),
+         MAT_ELEM_4X4(mvp, 3, 1),
+         MAT_ELEM_4X4(mvp, 3, 2),
+         MAT_ELEM_4X4(mvp, 3, 3)
+         );
+#endif
+#endif
 
    /* Render scene. */
    glBindFramebuffer(GL_FRAMEBUFFER, fft->ms_fbo ? fft->ms_fbo : backbuffer);
@@ -161,13 +326,14 @@ static void fft_render(glfft_t *fft, GLuint backbuffer, unsigned width, unsigned
    glClearColor(0.1f, 0.15f, 0.1f, 1.0f);
    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
 
-   vec3 eye(0, 80, -60);
-   mvp = perspective((float)M_HALF_PI, (float)width / height, 1.0f, 500.0f) *
-      lookAt(eye, eye + vec3(0.0f, 0.0f, 1.0f), vec3(0.0f, 1.0f, 0.0f));
-
    glUseProgram(fft->block.prog);
+#ifdef USE_GLM
    glUniformMatrix4fv(glGetUniformLocation(fft->block.prog, "uMVP"),
-         1, GL_FALSE, value_ptr(mvp));
+         1, GL_FALSE, (&mvp[0].x));
+#else
+   glUniformMatrix4fv(glGetUniformLocation(fft->block.prog, "uMVP"),
+         1, GL_FALSE, (&(MAT_ELEM_4X4(mvp, 0, 0))));
+#endif
    glUniform2i(glGetUniformLocation(fft->block.prog, "uOffset"),
          (-int(fft->block_size) + 1) / 2, fft->output_ptr);
    glUniform4f(glGetUniformLocation(fft->block.prog, "uHeightmapParams"),
@@ -348,12 +514,12 @@ void fft_build_params(glfft_t *fft, GLuint *buffer,
 
          unsigned read_a       = (step == 0) ? bitinverse(a, size) : a;
          unsigned read_b       = (step == 0) ? bitinverse(b, size) : b;
-         vec2 tmp              = vec2(twiddle.real, twiddle.imag);
+         glm::vec2 tmp         = glm::vec2(twiddle.real, twiddle.imag);
 
          buffer[2 * a + 0]     = (read_a << 16) | read_b;
-         buffer[2 * a + 1]     = packHalf2x16(tmp);
+         buffer[2 * a + 1]     = glm::packHalf2x16(tmp);
          buffer[2 * b + 0]     = (read_a << 16) | read_b;
-         buffer[2 * b + 1]     = packHalf2x16(-tmp);
+         buffer[2 * b + 1]     = glm::packHalf2x16(-tmp);
       }
    }
 }
@@ -523,12 +689,12 @@ static void fft_init(glfft_t *fft)
 static void fft_init_block(glfft_t *fft)
 {
    unsigned x, y;
-   GLuint *bp;
-   GLushort *block_vertices;
-   GLuint   *block_indices;
    unsigned block_vertices_size;
    unsigned block_indices_size;
-   int pos    = 0;
+   int pos                      = 0;
+   GLuint *bp                   = NULL;
+   GLushort *block_vertices     = NULL;
+   GLuint   *block_indices      = NULL;
 
    fft->block.prog = fft_compile_program(fft,
          fft_vertex_program_heightmap, fft_fragment_program_heightmap);
@@ -604,13 +770,13 @@ static bool fft_context_reset(glfft_t *fft, unsigned fft_steps,
    fft->block_size  = fft->size / 4 + 1;
 
    fft->passes_size = fft_steps;
-   fft->passes = (Pass*)calloc(fft->passes_size, sizeof(Pass));
+   fft->passes      = (Pass*)calloc(fft->passes_size, sizeof(Pass));
 
    if (!fft->passes)
       return false;
 
    fft->sliding_size = 2 * fft->size;
-   fft->sliding = (GLshort*)calloc(fft->sliding_size, sizeof(GLshort));
+   fft->sliding      = (GLshort*)calloc(fft->sliding_size, sizeof(GLshort));
 
    if (!fft->sliding)
       return false;

cores/libretro-ffmpeg/gl_shaders/ffmpeg.glsl.frag.h

@@ -0,0 +1,13 @@
+#include "shaders_common.h"
+
+static const char *fragment_source = GLSL(
+      varying vec2 vTex;
+      uniform sampler2D sTex0;
+      uniform sampler2D sTex1;
+      uniform float uMix;
+
+      void main() {
+         gl_FragColor = vec4(pow(mix(pow(texture2D(sTex0, vTex).rgb, vec3(2.2)), pow(texture2D(sTex1, vTex).rgb, vec3(2.2)), uMix), vec3(1.0 / 2.2)), 1.0);
+     }
+);
+

cores/libretro-ffmpeg/gl_shaders/ffmpeg.glsl.vert.h

@@ -0,0 +1,12 @@
+#include "shaders_common.h"
+
+static const char *vertex_source = GLSL(
+      attribute vec2 aVertex;
+      attribute vec2 aTexCoord;
+      varying vec2 vTex;
+
+      void main() {
+         gl_Position = vec4(aVertex, 0.0, 1.0); vTex = aTexCoord;
+      }
+);
+

cores/libretro-ffmpeg/gl_shaders/ffmpeg_es.glsl.frag.h

@@ -0,0 +1,13 @@
+#include "shaders_common.h"
+
+static const char *fragment_source = GLSL(
+      varying vec2 vTex;
+      uniform sampler2D sTex0;
+      uniform sampler2D sTex1;
+      uniform float uMix;
+
+      void main() {
+         gl_FragColor = vec4(pow(mix(pow(texture2D(sTex0, vTex).bgr, vec3(2.2)), pow(texture2D(sTex1, vTex).bgr, vec3(2.2)), uMix), vec3(1.0 / 2.2)), 1.0); 
+      }
+);
+