Skip to content

Commit f39f2ea

Browse files
committed
Movie Maker now handles spaces in the path (fixes #268)
1 parent 2ac5871 commit f39f2ea

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

build/shared/tools/MovieMaker/src/processing/app/tools/FFmpegEngine.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import javax.swing.*;
77
import java.awt.Component;
88
import java.io.*;
9+
import java.net.URLDecoder;
10+
import java.nio.charset.StandardCharsets;
911
import java.text.NumberFormat;
1012
import java.util.List;
1113
import java.util.ArrayList;
@@ -27,6 +29,8 @@ class FFmpegEngine {
2729
// Use the location of this jar to find the "tool" folder
2830
String jarPath =
2931
getClass().getProtectionDomain().getCodeSource().getLocation().getFile();
32+
// https://github.com/processing/processing4/issues/268
33+
jarPath = URLDecoder.decode(jarPath, StandardCharsets.UTF_8);
3034
File toolFolder = new File(jarPath).getParentFile();
3135
// Use that path to get the full path to our copy of the ffmpeg binary
3236
String ffmpegName = Platform.isWindows() ? "ffmpeg.exe" : "ffmpeg";

todo.txt

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ o key shortcuts broken on Katherine's laptop
1717
o try with a clean user account
1818
X double-check on other Big Sur machines (tried on VMware, was fine)
1919
X worked after a reboot?
20+
X "Massachusetts Institue of Technology" typo in loading screen
21+
X https://github.com/processing/processing4/issues/254
22+
X https://github.com/processing/processing4/issues/280 (duplicate)
23+
X Movie Maker broken with spaces in path (converted to %20)
24+
X https://github.com/processing/processing4/issues/268
2025

2126

2227
contribs
@@ -37,17 +42,6 @@ _ https://github.com/processing/processing4/issues/240
3742

3843
beta 2
3944

40-
_ movie maker broken with spaces in path (converted to %20)
41-
_ https://github.com/processing/processing4/issues/268
42-
43-
_ make the call on the launcher setting for Linux
44-
_ https://github.com/processing/processing4/issues/247
45-
46-
_ "Massachusetts Institue of Technology" typo in loading screen
47-
_ https://github.com/processing/processing4/issues/254
48-
X https://github.com/processing/processing4/issues/280 (duplicate)
49-
50-
5145
lots of work
5246
_ Editor cursor position is offset to the right when display scaling >100%
5347
_ https://github.com/processing/processing4/issues/226
@@ -170,6 +164,8 @@ _ https://github.com/processing/processing/issues/5848
170164
_ or at least avoid the multiple
171165
_ remove jai_imageio.jar from MovieMaker
172166
_ also clean out the other unused class files and src
167+
_ make the call on the launcher setting for Linux
168+
_ https://github.com/processing/processing4/issues/247
173169

174170
decisions before final 4.0 release
175171
_ can we compress jdk/Contents/Home/legal into a single zip?

0 commit comments

Comments
 (0)