Dropped Mac release and added Java 8 release

- To address issues with Macs, the Mac release was dropped entirely, as the Java 8 release will be easier for Mac users to set up.

Author: ScriptTiger

Build.cmd

@@ -34,6 +34,18 @@ cd ..\..
 
 if %DEV% == 1 goto Exit
 
+echo Build Java %JV% package...
+set PLATFORM=Java_%JV%
+md "Release\%JV%\%PROJECT%_%PLATFORM%"
+md "Release\%JV%\%PROJECT%_%PLATFORM%\legal"
+(
+	copy "Release\%JV%\%PROJECT%.jar" "Release\%JV%\%PROJECT%_%PLATFORM%"
+	copy README.md "Release\%JV%\%PROJECT%_%PLATFORM%"
+	copy LICENSE "Release\%JV%\%PROJECT%_%PLATFORM%"
+	copy bin\std.rnnn "Release\%JV%\%PROJECT%_%PLATFORM%"
+	xcopy docs\rnnoise /s "Release\%JV%\%PROJECT%_%PLATFORM%\legal\rennoise\"
+) > nul
+
 echo Set Java version to build...
 set JV=21
 
@@ -81,20 +93,6 @@ echo Build launcher for Linux...
 set GOOS=linux
 go build -ldflags="-s -w" -o "Release\%JV%\%PROJECT%_%PLATFORM%\%CNAME%" src\%PACKAGE%.go src\include_other.go
 
-echo Build app image for Mac...
-set PLATFORM=Mac_amd64
-jlink.exe -p "Release\%JV%\%PROJECT%.jar;%JAVA_HOME%\jmods\mac" --add-modules %DEPS%,%PACKAGE% --compress=zip-9 --no-header-files --no-man-pages --strip-debug --output "Release\%JV%\%PROJECT%_%PLATFORM%"
-(
-	copy README.md "Release\%JV%\%PROJECT%_%PLATFORM%"
-	copy LICENSE "Release\%JV%\%PROJECT%_%PLATFORM%"
-	copy bin\std.rnnn "Release\%JV%\%PROJECT%_%PLATFORM%\bin"
-	xcopy docs\rnnoise /s "Release\%JV%\%PROJECT%_%PLATFORM%\legal\rennoise\"
-) > nul
-
-echo Build launcher for Mac...
-set GOOS=darwin
-go build -ldflags="-s -w" -o "Release\%JV%\%PROJECT%_%PLATFORM%\%CNAME%.app" src\%PACKAGE%.go src\include_other.go
-
 :Exit
 
 echo Build complete

README.md

@@ -19,6 +19,8 @@ Features:
 **Download the precompiled executables for your target operating system to get started (only 64-bit platforms currently supported):**  
 https://github.com/ScriptTiger/ACXMaster/releases
 
+NOTE: It should be preferable to use the package compiled for your specific operating system, as it will be more optimized for your particular operating system and also be packaged with the latest LTS version of Java (OpenJDK), Java 21 as of writing this. However, if you do decide to use the Java 8 release, such as if you are a Mac user and don't have a package specifically for your operating system, you will need to make sure you have installed both [Java 8](https://www.java.com/download/) and FFmpeg. For Mac users, please refer to [FFmpeg's official documentation on how to install FFmpeg on Mac](https://trac.ffmpeg.org/wiki/CompilationGuide/macOS).
+
 # More About ScriptTiger
 
 For more ScriptTiger scripts and goodies, check out ScriptTiger's GitHub Pages website:  

src/acxmaster/MainDialog.java

@@ -32,15 +32,16 @@ public MainDialog() {
 		final int H = 270;
 		final int PAD = 5;
 
-		// Store current look and feel
+		// Store look and feels
 		LookAndFeel lookAndFeel = UIManager.getLookAndFeel();
+		String systemLookAndFeel = UIManager.getSystemLookAndFeelClassName();
 
 		// JPanel properties
 		setPreferredSize(new Dimension(W, H));
 		setLayout(null);
 
 		// Read and load settings from acxmaster.conf file if it exists
-		new Settings(false, mode, graphicEQ, options, targets, export);
+		new Settings(false, mode, master, graphicEQ, options, targets, export);
 
 		// Set up menu bar
 		JMenuBar jMenuBar = new JMenuBar();
@@ -60,6 +61,20 @@ public MainDialog() {
 		});
 		settings.add(modeItem);
 
+		// Set up FFmpeg menu item
+		JMenuItem ffmpegItem = new JMenuItem("FFmpeg");
+		ffmpegItem.addActionListener(e -> {
+			JFileChooser ffmpegChooser = null;
+			try {
+				UIManager.setLookAndFeel(systemLookAndFeel);
+				ffmpegChooser = new JFileChooser();
+				UIManager.setLookAndFeel(lookAndFeel);
+			} catch (Exception err) {};
+			ffmpegChooser.showDialog(jFrame, "Choose FFmpeg executable...");
+			master.setFFmpegPath(ffmpegChooser.getSelectedFile().getPath());
+		});
+		settings.add(ffmpegItem);
+
 		// Set up Targets menu item
 		JMenuItem targetsItem = new JMenuItem("Targets");
 		targetsItem.addActionListener(e -> new TargetsDialog(jFrame, targets));
@@ -81,7 +96,7 @@ public MainDialog() {
 
 		// Set up Save Settings menu item
 		JMenuItem saveSettingsItem = new JMenuItem("Save Settings");
-		saveSettingsItem.addActionListener(e -> new Settings(true, mode, graphicEQ, options, targets, export));
+		saveSettingsItem.addActionListener(e -> new Settings(true, mode, master, graphicEQ, options, targets, export));
 		settings.add(saveSettingsItem);
 
 		// Initialize buttons and text fields
@@ -119,7 +134,7 @@ public MainDialog() {
 		chooseButton.addActionListener(e -> {
 			JFileChooser fileChooser = null;
 			try {
-				UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+				UIManager.setLookAndFeel(systemLookAndFeel);
 				fileChooser = new JFileChooser();
 				UIManager.setLookAndFeel(lookAndFeel);
 			} catch (Exception err) {};
@@ -159,7 +174,7 @@ public MainDialog() {
 		saveButton.addActionListener(e -> {
 			JFileChooser saveChooser = null;
 			try {
-				UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+				UIManager.setLookAndFeel(systemLookAndFeel);
 				saveChooser = new JFileChooser();
 				UIManager.setLookAndFeel(lookAndFeel);
 			} catch (Exception err) {};
@@ -195,6 +210,7 @@ public MainDialog() {
 			chooseButton.setEnabled(false);
 			saveButton.setEnabled(false);
 			modeItem.setEnabled(false);
+			ffmpegItem.setEnabled(false);
 			targetsItem.setEnabled(false);
 			eqItem.setEnabled(false);
 			exportItem.setEnabled(false);
@@ -238,12 +254,13 @@ public void run() {
 							}
 							if (mode.getMode()) {masterButton.setText("Mastering complete!");
 							} else {masterButton.setText("Checking complete!");}
-						} else {masterButton.setText("Ensure FFmpeg is installed in your path!");}
+						} else {masterButton.setText("Ensure the path to FFmpeg is set correctly!");}
 						fileChooserTextField.setText("");
 						saveChooserTextField.setText("");
 						saveButton.setText("Save...");
 						chooseButton.setEnabled(true);
 						modeItem.setEnabled(true);
+						ffmpegItem.setEnabled(true);
 						if (mode.getMode()) {
 							targetsItem.setEnabled(true);
 							eqItem.setEnabled(true);

src/acxmaster/Master.java

@@ -17,6 +17,7 @@ class Master {
 	private final Options options = new Options();
 
 	// Files
+	private static String ffmpegPath = "ffmpeg";
 	private static File[] files;
 	private static Boolean isSingle;
 	private static File saveFile;
@@ -40,6 +41,7 @@ class Master {
 	public Options getOptions() {return options;}
 
 	// Files
+	public String getFFmpegPath() {return ffmpegPath;}
 	public File[] getFiles() {return files;}
 	public int getFileCount() {return files.length;}
 	public Boolean isSingle() {return isSingle;}
@@ -59,6 +61,7 @@ private String getChain() {
 	//////////
 
 	// Files
+	public void setFFmpegPath(String ffmpegPath) {this.ffmpegPath = ffmpegPath;}
 	public void setFiles(File[] files) {
 			this.files = files;
 			chain = "";
@@ -75,8 +78,7 @@ public void setFiles(File[] files) {
 	// Function to wrap FFmpeg
 	private void ffmpeg(Boolean post, String[] ffmpeg) {
 		try {
-			Runtime runtime = Runtime.getRuntime();
-			Process process = runtime.exec(ffmpeg);
+			Process process = new ProcessBuilder(ffmpeg).start();
 			InputStream stderr = process.getErrorStream();
 			InputStreamReader stderrReader = new InputStreamReader(stderr);
 			BufferedReader stderrBufferedReader = new BufferedReader(stderrReader);
@@ -175,9 +177,8 @@ private void ffmpeg(Boolean post, String[] ffmpeg) {
 	public Boolean ffCheck() {
 		Boolean err = true;
 		try {
-			Runtime runtime = Runtime.getRuntime();
-			String[] ffmpeg = {"ffmpeg", "-version"};
-			Process process = runtime.exec(ffmpeg);
+			String[] ffmpeg = {ffmpegPath, "-version"};
+			Process process = new ProcessBuilder(ffmpeg).start();
 			process.waitFor();
 		} catch (Exception exception) {
 			new ErrorDialog(exception.getMessage());
@@ -189,24 +190,24 @@ public Boolean ffCheck() {
 	// Function to analyze files
 	public void analyze(File file) {
 		audioInfo = new AudioInfo(file, saveFile, isSingle, export.getExtension());
-		String[] analyze = {"ffmpeg", "-hide_banner", "-i", file.getPath(), "-vn", "-sn", "-dn", "-filter_complex", "[0:a]aformat=cl=mono,"+getChain()+"asplit[loudnorm],astats=measure_perchannel=none:measure_overall=Noise_floor+Number_of_samples+Peak_level+RMS_level;[loudnorm]loudnorm=print_format=summary", "-f", "null", ""};
+		String[] analyze = {ffmpegPath, "-hide_banner", "-i", file.getPath(), "-vn", "-sn", "-dn", "-filter_complex", "[0:a]aformat=cl=mono,"+getChain()+"asplit[loudnorm],astats=measure_perchannel=none:measure_overall=Noise_floor+Number_of_samples+Peak_level+RMS_level;[loudnorm]loudnorm=print_format=summary", "-f", "null", ""};
 		ffmpeg(false, analyze);
 	}
 
 	// Function check files
 	public void check(File file) {
 		audioInfo = new AudioInfo(file);
-		String[] preCheck = {"ffmpeg", "-hide_banner", "-i", file.getPath(), "-vn", "-sn", "-dn", "-frames:a", "0", "-f", "null", ""};
+		String[] preCheck = {ffmpegPath, "-hide_banner", "-i", file.getPath(), "-vn", "-sn", "-dn", "-frames:a", "0", "-f", "null", ""};
 		ffmpeg(false, preCheck);
 		String end = String.valueOf(audioInfo.getRoughDuration()-1);
-		String[] check = {"ffmpeg", "-hide_banner", "-i", file.getPath(), "-vn", "-sn", "-dn", "-filter_complex", "[0:a]asplit=3[end][astats],atrim=end=1[start];[end]atrim=start="+end+",[start]concat=2:0:1,astats=measure_perchannel=none:measure_overall=RMS_level;[astats]astats=measure_perchannel=none:measure_overall=Noise_floor+Number_of_samples+Peak_level+RMS_level", "-f", "null", ""};
+		String[] check = {ffmpegPath, "-hide_banner", "-i", file.getPath(), "-vn", "-sn", "-dn", "-filter_complex", "[0:a]asplit=3[end][astats],atrim=end=1[start];[end]atrim=start="+end+",[start]concat=2:0:1,astats=measure_perchannel=none:measure_overall=RMS_level;[astats]astats=measure_perchannel=none:measure_overall=Noise_floor+Number_of_samples+Peak_level+RMS_level", "-f", "null", ""};
 		ffmpeg(true, check);
 	}
 
 	// Function to predict problems
 	public void predict(File file) {
 		String end = String.valueOf(audioInfo.getRoughDuration()-1);
-		String[] predict = {"ffmpeg", "-hide_banner", "-i", file.getPath(), "-vn", "-sn", "-dn", "-filter_complex", "[0:a]aformat=cl=mono,"+getChain()+"loudnorm=i="+String.valueOf(targets.getI())+":lra="+String.valueOf(targets.getLRA())+":tp="+String.valueOf(targets.getTP())+":measured_I="+String.valueOf(audioInfo.getII())+":measured_LRA="+String.valueOf(audioInfo.getILRA())+":measured_tp="+String.valueOf(audioInfo.getITP())+":measured_thresh="+String.valueOf(audioInfo.getIT())+":offset="+String.valueOf(audioInfo.getTO())+":print_format=summary"+options.getStereoChain()+",asplit=3[end][astats],atrim=end=1[start];[end]atrim=start="+end+",[start]concat=2:0:1,astats=measure_perchannel=none:measure_overall=RMS_level;[astats]astats=measure_perchannel=none:measure_overall=Noise_floor+Number_of_samples+Peak_level+RMS_level", "-f", "null", ""};
+		String[] predict = {ffmpegPath, "-hide_banner", "-i", file.getPath(), "-vn", "-sn", "-dn", "-filter_complex", "[0:a]aformat=cl=mono,"+getChain()+"loudnorm=i="+String.valueOf(targets.getI())+":lra="+String.valueOf(targets.getLRA())+":tp="+String.valueOf(targets.getTP())+":measured_I="+String.valueOf(audioInfo.getII())+":measured_LRA="+String.valueOf(audioInfo.getILRA())+":measured_tp="+String.valueOf(audioInfo.getITP())+":measured_thresh="+String.valueOf(audioInfo.getIT())+":offset="+String.valueOf(audioInfo.getTO())+":print_format=summary"+options.getStereoChain()+",asplit=3[end][astats],atrim=end=1[start];[end]atrim=start="+end+",[start]concat=2:0:1,astats=measure_perchannel=none:measure_overall=RMS_level;[astats]astats=measure_perchannel=none:measure_overall=Noise_floor+Number_of_samples+Peak_level+RMS_level", "-f", "null", ""};
 		ffmpeg(true, predict);
 	}
 
@@ -216,7 +217,7 @@ public void master(File file) {
 		int sampleRate;
 		if (export.getSampleRate() == 0) {sampleRate = audioInfo.getSampleRate();
 		} else {sampleRate = export.getSampleRate();}
-		String[] master = {"ffmpeg", "-hide_banner", "-y", "-i", file.getPath(), "-vn", "-sn", "-dn", "-filter_complex", "[0:a]aformat=cl=mono,"+getChain()+"loudnorm=i="+String.valueOf(targets.getI())+":lra="+String.valueOf(targets.getLRA())+":tp="+String.valueOf(targets.getTP())+":measured_I="+String.valueOf(audioInfo.getII())+":measured_LRA="+String.valueOf(audioInfo.getILRA())+":measured_tp="+String.valueOf(audioInfo.getITP())+":measured_thresh="+String.valueOf(audioInfo.getIT())+":offset="+String.valueOf(audioInfo.getTO())+":print_format=summary"+options.getStereoChain()+",asplit=4[end][astats][master],atrim=end=1[start];[end]atrim=start="+end+",[start]concat=2:0:1,astats=measure_perchannel=none:measure_overall=RMS_level[null0];[astats]astats=measure_perchannel=none:measure_overall=Noise_floor+Number_of_samples+Peak_level+RMS_level[null1]", "-map", "[master]", "-ar", String.valueOf(sampleRate), "-ab", String.valueOf(export.getBitRate()), "-c:a", export.getCodec(), "-sample_fmt", export.getBitDepth(), "-compression_level", String.valueOf(export.getCompressionLevel()), audioInfo.getSaveFileString(), "-map", "[null0]", "-map", "[null1]", "-f", "null", ""};
+		String[] master = {ffmpegPath, "-hide_banner", "-y", "-i", file.getPath(), "-vn", "-sn", "-dn", "-filter_complex", "[0:a]aformat=cl=mono,"+getChain()+"loudnorm=i="+String.valueOf(targets.getI())+":lra="+String.valueOf(targets.getLRA())+":tp="+String.valueOf(targets.getTP())+":measured_I="+String.valueOf(audioInfo.getII())+":measured_LRA="+String.valueOf(audioInfo.getILRA())+":measured_tp="+String.valueOf(audioInfo.getITP())+":measured_thresh="+String.valueOf(audioInfo.getIT())+":offset="+String.valueOf(audioInfo.getTO())+":print_format=summary"+options.getStereoChain()+",asplit=4[end][astats][master],atrim=end=1[start];[end]atrim=start="+end+",[start]concat=2:0:1,astats=measure_perchannel=none:measure_overall=RMS_level[null0];[astats]astats=measure_perchannel=none:measure_overall=Noise_floor+Number_of_samples+Peak_level+RMS_level[null1]", "-map", "[master]", "-ar", String.valueOf(sampleRate), "-ab", String.valueOf(export.getBitRate()), "-c:a", export.getCodec(), "-sample_fmt", export.getBitDepth(), "-compression_level", String.valueOf(export.getCompressionLevel()), audioInfo.getSaveFileString(), "-map", "[null0]", "-map", "[null1]", "-f", "null", ""};
 		ffmpeg(true, master);
 	}
 }

src/acxmaster/Settings.java

@@ -5,12 +5,13 @@
 
 // Settings class
 class Settings {
-	public Settings(Boolean save, Mode mode, GraphicEQ graphicEQ, Options options, Targets targets, Export export) {
+	public Settings(Boolean save, Mode mode, Master master, GraphicEQ graphicEQ, Options options, Targets targets, Export export) {
 		try {
 			if (save) {
 				FileWriter writer = new FileWriter("acxmaster.conf");
 				writer.write(
 					"mode="+String.valueOf(mode.getMode())+"\n"+
+					"ffmpeg="+master.getFFmpegPath()+"\n"+
 					"1b="+graphicEQ.getOneBand()+"\n"+
 					"2b="+graphicEQ.getTwoBand()+"\n"+
 					"3b="+graphicEQ.getThreeBand()+"\n"+
@@ -56,6 +57,9 @@ public Settings(Boolean save, Mode mode, GraphicEQ graphicEQ, Options options, T
 						case "mode":
 							try {mode.setMode(Boolean.parseBoolean(tokens[1]));} catch (Exception exception) {}
 							break;
+						case "ffmpeg":
+							master.setFFmpegPath(tokens[1]);
+							break;
 						case "1b":
 							graphicEQ.setOneBand(tokens[1]);
 							break;

src/acxmaster/Targets.java

@@ -9,7 +9,7 @@ class Targets {
 
 	private static float i = -20;
 	private static float lra = 7;
-	private static float tp = -3;
+	private static float tp = (float)-3.1;
 
 	//////////
 	// Getters

src/acxmaster/TargetsDialog.java

@@ -56,7 +56,7 @@ public TargetsDialog(JFrame jFrame, Targets targets) {
 		defaults.addActionListener(e -> {
 			iTextField.setText("-20.0");
 			lraTextField.setText("7.0");
-			tpTextField.setText("-3.0");
+			tpTextField.setText("-3.1");
 		});
 		jDialog.add(defaults);