Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: prefer FileSystemNative rather GLib #2780

Merged
merged 1 commit into from Aug 9, 2022
Merged

refactor: prefer FileSystemNative rather GLib #2780

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 8 additions & 14 deletions synfig-core/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp
View file
Open in desktop
Expand Up @@ -34,13 +34,11 @@
# include <config.h>
#endif

#include <synfig/localization.h>
#include <synfig/filesystemnative.h>
#include <synfig/general.h>
#include <synfig/localization.h>
#include <synfig/soundprocessor.h>

#include <cstdio>
#include <glib/gstdio.h>

#include <ETL/stringf>

#include "trgt_ffmpeg.h"
Expand All @@ -51,11 +49,6 @@

#endif

// MSVC
#ifndef F_OK
#define F_OK 0
#endif

/* === M A C R O S ========================================================= */

using namespace synfig;
Expand Down Expand Up @@ -125,8 +118,8 @@ ffmpeg_trgt::~ffmpeg_trgt()
file=nullptr;

// Remove temporary sound file
if (g_file_test(sound_filename.c_str(), G_FILE_TEST_EXISTS)) {
if( g_remove(sound_filename.c_str()) != 0 ) {
if (FileSystemNative::instance()->is_file(sound_filename.c_str())) {
if(FileSystemNative::instance()->remove_recursive(sound_filename.c_str())) {
synfig::warning("Error deleting temporary sound file (%s).", sound_filename.c_str());
}
}
Expand Down Expand Up @@ -178,18 +171,19 @@ ffmpeg_trgt::init(ProgressCallback* cb = nullptr)
if (cb) cb->error(_("Unable to initialize Sound subsystem"));
with_sound = false;
} else {
auto& fs = FileSystemNative::instance();
synfig::SoundProcessor soundProcessor;
soundProcessor.set_infinite(false);
get_canvas()->fill_sound_processor(soundProcessor);
// Generate random filename here
do {
synfig::GUID guid;
sound_filename = String(filename)+"."+guid.get_string().substr(0,8)+".wav";
} while (g_file_test(sound_filename.c_str(), G_FILE_TEST_EXISTS));
} while (fs->is_exists(sound_filename));

soundProcessor.do_export(sound_filename);

if (!g_file_test(sound_filename.c_str(), G_FILE_TEST_EXISTS)) {
if (!fs->is_exists(sound_filename)) {
with_sound = false;
}
}
Expand All @@ -198,7 +192,7 @@ ffmpeg_trgt::init(ProgressCallback* cb = nullptr)
#if defined(WIN32_PIPE_TO_PROCESSES)
// Windows always have ffmpeg
std::string binary_path = etl::dirname(synfig::get_binary_path(".")) + "/ffmpeg.exe";
if (g_access(binary_path.c_str(), F_OK ) != -1 ) { // File found
if (FileSystemNative::instance()->is_file(ffmpeg_binary_path.c_str())) {
ffmpeg_binary_path = "\"" + binary_path + "\"";
}
#else
Expand Down