Skip to content

Commit

Permalink
Updated tlRender.
Browse files Browse the repository at this point in the history
  • Loading branch information
ggarra13 committed Mar 29, 2024
1 parent d4c9683 commit 76bca1d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
14 changes: 7 additions & 7 deletions mrv2/lib/mrvFl/mrvSaveMovie.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -183,13 +183,13 @@ namespace mrv
}
}

const bool isMovie = file::isMovie(extension);
const bool isAudio = file::isAudio(extension);
if (isMovie)
const bool savingMovie = file::isMovie(extension);
const bool savingAudio = file::isAudio(extension);
if (savingMovie)
{
msg = string::Format(_("Saving movie to {0}.")).arg(newFile);
}
else if (isAudio)
else if (savingAudio)
{
msg = string::Format(_("Saving audio to {0}.")).arg(newFile);
}
Expand Down Expand Up @@ -528,7 +528,7 @@ namespace mrv
char title[1024];

#ifdef TLRENDER_FFMPEG
if (hasVideo && isMovie)
if (hasVideo && savingMovie)
{
if (static_cast<ffmpeg::AudioCodec>(options.ffmpegAudioCodec) ==
ffmpeg::AudioCodec::None ||
Expand All @@ -543,15 +543,15 @@ namespace mrv
_("Saving Movie with Audio %" PRId64 " - %" PRId64),
startFrame, endFrame);
}
else if (hasAudio && isAudio)
else if (hasAudio && savingAudio)
{
snprintf(
title, 1024, _("Saving Audio %" PRId64 " - %" PRId64),
startFrame, endFrame);
}
else
#endif
if (hasVideo && !isMovie && !isAudio)
if (hasVideo && !savingMovie && !savingAudio)
{
snprintf(
title, 1024,
Expand Down
2 changes: 1 addition & 1 deletion tlRender

0 comments on commit 76bca1d

Please sign in to comment.