razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Merge pull request #661 from manongjohn/fix_timeout_calcs

Browse source 
Fix converting timeout from sec to msec
This commit is contained in:
manongjohn 2021-04-12 07:27:44 -04:00 committed by GitHub
commit 3dc0be13c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toonz/sources/image/ffmpeg/tiio_ffmpeg.cpp
View file

@ -16,7 +16,7 @@ Ffmpeg::Ffmpeg() {
m_ffmpegPath = Preferences::instance()->getFfmpegPath(); m_ffmpegPath = Preferences::instance()->getFfmpegPath();
m_ffmpegTimeout = Preferences::instance()->getFfmpegTimeout(); m_ffmpegTimeout = Preferences::instance()->getFfmpegTimeout();
if (m_ffmpegTimeout > 0) if (m_ffmpegTimeout > 0)
m_ffmpegTimeout * 1000; m_ffmpegTimeout *= 1000;
else else
m_ffmpegTimeout = -1; m_ffmpegTimeout = -1;
std::string strPath = m_ffmpegPath.toStdString(); std::string strPath = m_ffmpegPath.toStdString();

2
toonz/sources/toonz/lipsyncpopup.cpp
View file

@ -836,7 +836,7 @@ void LipSyncPopup::onApplyButton() {
runRhubarb(); runRhubarb();
int rhubarbTimeout = Preferences::instance()->getRhubarbTimeout(); int rhubarbTimeout = Preferences::instance()->getRhubarbTimeout();
if (rhubarbTimeout > 0) if (rhubarbTimeout > 0)
rhubarbTimeout * 1000; rhubarbTimeout *= 1000;
else else
rhubarbTimeout = -1; rhubarbTimeout = -1;
m_rhubarb->waitForFinished(rhubarbTimeout); m_rhubarb->waitForFinished(rhubarbTimeout);