Fixed touch effect not compensate letterboxing

Android: Fixed FFmpegExt causes it to read from private storage instead of external storage

Fixed error if no beatmap is present

- Although it still error if you swipe left or right

Author: MikuAuahDark

AquaShine.lua

@@ -685,26 +685,27 @@ end
 -- Inputs
 function love.mousepressed(x, y, button, istouch)
 	if istouch == true then return end
+	x, y = AquaShine.CalculateTouchPosition(x, y)
 
 	if AquaShine.TouchEffect then
 		AquaShine.TouchEffect.Start()
+		AquaShine.TouchEffect.SetPosition(x, y)
 	end
 
 	if AquaShine.CurrentEntryPoint and AquaShine.CurrentEntryPoint.MousePressed then
-		x, y = AquaShine.CalculateTouchPosition(x, y)
 		AquaShine.CurrentEntryPoint.MousePressed(x, y, button, istouch)
 	end
 end
 
 function love.mousemoved(x, y, dx, dy, istouch)
 	if istouch == true then return end
+	x, y = AquaShine.CalculateTouchPosition(x, y)
 
 	if AquaShine.TouchEffect then
 		AquaShine.TouchEffect.SetPosition(x, y)
 	end
 
 	if AquaShine.CurrentEntryPoint and AquaShine.CurrentEntryPoint.MouseMoved then
-		x, y = AquaShine.CalculateTouchPosition(x, y)
 		AquaShine.CurrentEntryPoint.MouseMoved(x, y, dx / AquaShine.LogicalScale.ScaleOverall, dy / AquaShine.LogicalScale.ScaleOverall, istouch)
 	end
 end

AquaShineFFmpegExtension.lua

@@ -15,14 +15,14 @@ if AquaShine.OperatingSystem == "iOS" or has_ffi == false then
 elseif AquaShine.OperatingSystem == "Android" then
 	-- We have to find our "internal" save directory at first
 	-- so we can determine our "lib" dir
-	-- This assume external storage mode is enabled
+	-- This assume external storage mode is enabled. If not, edit accordingly
 	love.filesystem._setAndroidSaveExternal(false)
 	love.filesystem.setIdentity(love.filesystem.getIdentity(), true)
 
 	local lib_dir = love.filesystem.getSaveDirectory().."/../../../lib"
 
 	-- Reset back to external storage mode
-	love.filesystem._setAndroidSaveExternal(false)
+	love.filesystem._setAndroidSaveExternal(true)
 	love.filesystem.setIdentity(love.filesystem.getIdentity(), true)
 
 	function load_ffmpeg_library(libname, ver)

beatmap_select.lua

@@ -347,7 +347,10 @@ end
 
 function BeatmapSelect.Draw()
 	BeatmapSelect.MainUIComposition:Draw()
-	BeatmapSelect.CompositionList[BeatmapSelect.Page]:Draw()
+	
+	if #BeatmapSelect.CompositionList > 0 then
+		BeatmapSelect.CompositionList[BeatmapSelect.Page]:Draw()
+	end
 end
 
 function BeatmapSelect.Exit()

noteloader/load_depls.lua

@@ -154,7 +154,7 @@ function DEPLSBeatmap.GetBackgroundID(this)
 
 	local bgidname = this.project_dir.."/background.txt"
 	if not(this.bgid_loaded) and love.filesystem.isFile(bgidname) then
-		this.bgid = tonumber(love.filesystem.read(bgidname))
+		this.bgid = tonumber((love.filesystem.read(bgidname)))
 		this.bgid_loaded = true
 	end
 
@@ -181,12 +181,12 @@ function DEPLSBeatmap.GetCustomBackground(this)
 
 				if not(this.background[1] and this.background[2]) then
 					AquaShine.Log("NoteLoader2/load_depls", "Non-balanced background (only contain left or right part). Removed")
-					this.backgound[1], this.background[2] = nil, nil
+					this.background[1], this.background[2] = nil, nil
 				end
 
 				if not(this.background[3] and this.background[4]) then
 					AquaShine.Log("NoteLoader2/load_depls", "Non-balanced background (only contain top or bottom part). Removed")
-					this.backgound[3], this.background[4] = nil, nil
+					this.background[3], this.background[4] = nil, nil
 				end
 
 				break