diff --git a/build/shared/tools/MovieMaker/src/processing/app/tools/FFmpegEngine.java b/build/shared/tools/MovieMaker/src/processing/app/tools/FFmpegEngine.java index a0d5b9735..f9e7d7911 100644 --- a/build/shared/tools/MovieMaker/src/processing/app/tools/FFmpegEngine.java +++ b/build/shared/tools/MovieMaker/src/processing/app/tools/FFmpegEngine.java @@ -6,6 +6,8 @@ import processing.app.Platform; import javax.swing.*; import java.awt.Component; import java.io.*; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; import java.text.NumberFormat; import java.util.List; import java.util.ArrayList; @@ -27,6 +29,8 @@ class FFmpegEngine { // Use the location of this jar to find the "tool" folder String jarPath = getClass().getProtectionDomain().getCodeSource().getLocation().getFile(); + // https://github.com/processing/processing4/issues/268 + jarPath = URLDecoder.decode(jarPath, StandardCharsets.UTF_8); File toolFolder = new File(jarPath).getParentFile(); // Use that path to get the full path to our copy of the ffmpeg binary String ffmpegName = Platform.isWindows() ? "ffmpeg.exe" : "ffmpeg"; diff --git a/todo.txt b/todo.txt index b12c07be7..04eae2562 100755 --- a/todo.txt +++ b/todo.txt @@ -17,6 +17,11 @@ o key shortcuts broken on Katherine's laptop o try with a clean user account X double-check on other Big Sur machines (tried on VMware, was fine) X worked after a reboot? +X "Massachusetts Institue of Technology" typo in loading screen +X https://github.com/processing/processing4/issues/254 +X https://github.com/processing/processing4/issues/280 (duplicate) +X Movie Maker broken with spaces in path (converted to %20) +X https://github.com/processing/processing4/issues/268 contribs @@ -37,17 +42,6 @@ _ https://github.com/processing/processing4/issues/240 beta 2 -_ movie maker broken with spaces in path (converted to %20) -_ https://github.com/processing/processing4/issues/268 - -_ make the call on the launcher setting for Linux -_ https://github.com/processing/processing4/issues/247 - -_ "Massachusetts Institue of Technology" typo in loading screen -_ https://github.com/processing/processing4/issues/254 -X https://github.com/processing/processing4/issues/280 (duplicate) - - lots of work _ Editor cursor position is offset to the right when display scaling >100% _ https://github.com/processing/processing4/issues/226 @@ -170,6 +164,8 @@ _ https://github.com/processing/processing/issues/5848 _ or at least avoid the multiple _ remove jai_imageio.jar from MovieMaker _ also clean out the other unused class files and src +_ make the call on the launcher setting for Linux +_ https://github.com/processing/processing4/issues/247 decisions before final 4.0 release _ can we compress jdk/Contents/Home/legal into a single zip?