shweet/anm2ed
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

let's actually stage those changes...

Browse Source
This commit is contained in:
shweet
2026-03-09 23:09:37 -04:00
parent 2d27b7e8fb
commit c11b404392
127 changed files with 1200 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/render.cpp
View File

@@ -1,4 +1,4 @@
#include "render.h"
#include "render.hpp"
#include <algorithm>
#include <cstring>
@@ -8,11 +8,11 @@
#include <fstream>
#include <string>
#include "log.h"
#include "path_.h"
#include "process_.h"
#include "sdl.h"
#include "string_.h"
#include "log.hpp"
#include "path_.hpp"
#include "process_.hpp"
#include "sdl.hpp"
#include "string_.hpp"
using namespace anm2ed::util;
@@ -56,6 +56,8 @@ namespace anm2ed
std::string audioInputArguments{};
std::string audioOutputArguments{"-an"};
std::string command{};
auto temporaryDirectory = framePaths.front().parent_path();
if (temporaryDirectory.empty()) temporaryDirectory = std::filesystem::temp_directory_path();
auto audio_remove = [&]()
{
@@ -69,8 +71,8 @@ namespace anm2ed
if (type != render::GIF && !audioStream.stream.empty() && audioStream.spec.freq > 0 &&
audioStream.spec.channels > 0)
{
auto tempFilenameUtf8 = std::format("{}.f32", pathString);
audioPath = std::filesystem::temp_directory_path() / path::from_utf8(tempFilenameUtf8);
auto tempFilenameUtf8 = std::format("anm2ed_audio_{}_{}.f32", std::hash<std::string>{}(pathString), SDL_GetTicks());
audioPath = temporaryDirectory / path::from_utf8(tempFilenameUtf8);
std::ofstream audioFile(audioPath, std::ios::binary);
@@ -103,7 +105,7 @@ namespace anm2ed
}
}
auto framesListPath = std::filesystem::temp_directory_path() / path::from_utf8(std::format(
auto framesListPath = temporaryDirectory / path::from_utf8(std::format(
"anm2ed_frames_{}_{}.txt", std::hash<std::string>{}(pathString), SDL_GetTicks())) ;
std::ofstream framesListFile(framesListPath);
if (!framesListFile)
@@ -176,7 +178,15 @@ namespace anm2ed
return false;
}
process.close();
auto ffmpegExitCode = process.close();
if (ffmpegExitCode != 0)
{
logger.error(std::format("FFmpeg exited with code {} while exporting {}", ffmpegExitCode, pathString));
std::error_code ec;
std::filesystem::remove(framesListPath, ec);
audio_remove();
return false;
}
std::error_code ec;
std::filesystem::remove(framesListPath, ec);