DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename VideoWriter -> FFmpegWriter

Browse Source
This commit is contained in:
Jonas Herzig
2020-10-03 14:52:58 +02:00
parent aee486c4f3
commit 17e554b67c
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/replaymod/render/gui/GuiExportFailed.java
View File

@@ -2,7 +2,7 @@ package com.replaymod.render.gui;
import com.replaymod.core.ReplayMod;
import com.replaymod.render.RenderSettings;
import com.replaymod.render.VideoWriter;
import com.replaymod.render.FFmpegWriter;
import de.johni0702.minecraft.gui.container.GuiPanel;
import de.johni0702.minecraft.gui.container.GuiScreen;
import de.johni0702.minecraft.gui.container.GuiVerticalList;
@@ -23,7 +23,7 @@ import static com.replaymod.core.versions.MCVer.addDetail;
import static com.replaymod.render.ReplayModRender.LOGGER;
public class GuiExportFailed extends GuiScreen {
public static GuiExportFailed tryToRecover(VideoWriter.FFmpegStartupException e, Consumer<RenderSettings> doRestart) {
public static GuiExportFailed tryToRecover(FFmpegWriter.FFmpegStartupException e, Consumer<RenderSettings> doRestart) {
// Always log the error first
LOGGER.error("Rendering video:", e);
@@ -74,7 +74,7 @@ public class GuiExportFailed extends GuiScreen {
setBackground(Background.DIRT);
}
public GuiExportFailed(VideoWriter.FFmpegStartupException e, Consumer<RenderSettings> doRestart) {
public GuiExportFailed(FFmpegWriter.FFmpegStartupException e, Consumer<RenderSettings> doRestart) {
logList.getListPanel().addElements(null,
Arrays.stream(e.getLog().replace("\t", " ").split("\n"))
.map(l -> new GuiLabel().setText(l))

6
src/main/java/com/replaymod/render/gui/GuiRenderQueue.java
View File

@@ -6,7 +6,7 @@ import com.replaymod.core.utils.Utils;
import com.replaymod.core.versions.MCVer;
import com.replaymod.render.RenderSettings;
import com.replaymod.render.ReplayModRender;
import com.replaymod.render.VideoWriter;
import com.replaymod.render.FFmpegWriter;
import com.replaymod.render.rendering.VideoRenderer;
import com.replaymod.render.utils.RenderJob;
import com.replaymod.replay.ReplayHandler;
@@ -169,7 +169,7 @@ public class GuiRenderQueue extends AbstractGuiPopup<GuiRenderQueue> implements
try {
VideoRenderer videoRenderer = new VideoRenderer(renderJob.getSettings(), replayHandler, renderJob.getTimeline());
videoRenderer.renderVideo();
} catch (VideoWriter.NoFFmpegException e) {
} catch (FFmpegWriter.NoFFmpegException e) {
LOGGER.error("Rendering video:", e);
NoticeScreen errorScreen = new NoticeScreen(
//#if MC>=11400
@@ -183,7 +183,7 @@ public class GuiRenderQueue extends AbstractGuiPopup<GuiRenderQueue> implements
);
mc.openScreen(errorScreen);
return;
} catch (VideoWriter.FFmpegStartupException e) {
} catch (FFmpegWriter.FFmpegStartupException e) {
int jobsToSkip = jobsDone;
GuiExportFailed.tryToRecover(e, newSettings -> {
// Update current job with fixed ffmpeg arguments

6
src/main/java/com/replaymod/render/gui/GuiRenderSettings.java
View File

@@ -10,7 +10,7 @@ import com.google.gson.JsonSyntaxException;
import com.replaymod.core.ReplayMod;
import com.replaymod.render.RenderSettings;
import com.replaymod.render.ReplayModRender;
import com.replaymod.render.VideoWriter;
import com.replaymod.render.FFmpegWriter;
import com.replaymod.render.rendering.VideoRenderer;
import com.replaymod.replay.ReplayHandler;
import com.replaymod.replaystudio.pathing.path.Timeline;
@@ -248,7 +248,7 @@ public class GuiRenderSettings extends AbstractGuiPopup<GuiRenderSettings> {
try {
VideoRenderer videoRenderer = new VideoRenderer(save(false), replayHandler, timeline);
videoRenderer.renderVideo();
} catch (VideoWriter.NoFFmpegException e) {
} catch (FFmpegWriter.NoFFmpegException e) {
LOGGER.error("Rendering video:", e);
NoticeScreen errorScreen = new NoticeScreen(
//#if MC>=11400
@@ -261,7 +261,7 @@ public class GuiRenderSettings extends AbstractGuiPopup<GuiRenderSettings> {
//#endif
);
getMinecraft().openScreen(errorScreen);
} catch (VideoWriter.FFmpegStartupException e) {
} catch (FFmpegWriter.FFmpegStartupException e) {
GuiExportFailed.tryToRecover(e, newSettings -> {
// Update settings with fixed ffmpeg arguments
exportArguments.setText(newSettings.getExportArguments());