jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

obs-ffmpeg: Move file read error to separate function 

Moves the code that generates a file read error message to its own
function for the sake of cleaning things up a bit.
master
jp9000 2020-05-19 16:10:06 -07:00
parent c8ff234255
commit c165798959
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
plugins/obs-ffmpeg/obs-ffmpeg-mux.c
View File

@ -264,6 +264,27 @@ static inline void start_pipe(struct ffmpeg_muxer *stream, const char *path)
dstr_free(&cmd); dstr_free(&cmd);
} }
static void set_file_not_readable_error(struct ffmpeg_muxer *stream,
obs_data_t *settings, const char *path)
{
struct dstr error_message;
dstr_init_copy(&error_message, obs_module_text("UnableToWritePath"));
#ifdef _WIN32
/* special warning for Windows 10 users about Defender */
struct win_version_info ver;
get_win_ver(&ver);
if (ver.major >= 10) {
dstr_cat(&error_message, "\n\n");
dstr_cat(&error_message,
obs_module_text("WarnWindowsDefender"));
}
#endif
dstr_replace(&error_message, "%1", path);
obs_output_set_last_error(stream->output, error_message.array);
dstr_free(&error_message);
obs_data_release(settings);
}
static bool ffmpeg_mux_start(void *data) static bool ffmpeg_mux_start(void *data)
{ {
struct ffmpeg_muxer *stream = data; struct ffmpeg_muxer *stream = data;
@ -282,23 +303,7 @@ static bool ffmpeg_mux_start(void *data)
/* TODO: remove once ffmpeg-mux is refactored to pass errors back */ /* TODO: remove once ffmpeg-mux is refactored to pass errors back */
FILE *test_file = os_fopen(path, "wb"); FILE *test_file = os_fopen(path, "wb");
if (!test_file) { if (!test_file) {
struct dstr error_message; set_file_not_readable_error(stream, settings, path);
dstr_init_copy(&error_message,
obs_module_text("UnableToWritePath"));
#ifdef _WIN32
// special warning for Windows 10 users about Defender
struct win_version_info ver;
get_win_ver(&ver);
if (ver.major >= 10) {
dstr_cat(&error_message, "\n\n");
dstr_cat(&error_message,
obs_module_text("WarnWindowsDefender"));
}
#endif
dstr_replace(&error_message, "%1", path);
obs_output_set_last_error(stream->output, error_message.array);
dstr_free(&error_message);
obs_data_release(settings);
return false; return false;
} }