From edaab7f46d488a2b0405438491e696abdf8986aa Mon Sep 17 00:00:00 2001
From: Jeremy Bullock <jcbullock@gmail.com>
Date: Nov 21 2016 10:37:55 +0000
Subject: moved ffmpeg temp files to cache folder (#921)


Now the ffmpeg temporary export files will be saved in the cache folder.
close #918 
---

diff --git a/toonz/sources/image/ffmpeg/tiio_ffmpeg.cpp b/toonz/sources/image/ffmpeg/tiio_ffmpeg.cpp
index 9dd86a1..fc147d9 100644
--- a/toonz/sources/image/ffmpeg/tiio_ffmpeg.cpp
+++ b/toonz/sources/image/ffmpeg/tiio_ffmpeg.cpp
@@ -100,7 +100,8 @@ void Ffmpeg::setPath(TFilePath path) { m_path = path; }
 
 void Ffmpeg::createIntermediateImage(const TImageP &img, int frameIndex) {
   m_frameCount++;
-  QString tempPath = m_path.getQString() + "tempOut" +
+  QString tempPath = getFfmpegCache().getQString() + "//" +
+                     QString::fromStdString(m_path.getName()) + "tempOut" +
                      QString::number(m_frameCount) + "." + m_intermediateFormat;
   std::string saveStatus = "";
   TRasterImageP tempImage(img);
@@ -137,8 +138,9 @@ void Ffmpeg::createIntermediateImage(const TImageP &img, int frameIndex) {
 void Ffmpeg::runFfmpeg(QStringList preIArgs, QStringList postIArgs,
                        bool includesInPath, bool includesOutPath,
                        bool overWriteFiles) {
-  QString tempName = "tempOut%d." + m_intermediateFormat;
-  tempName         = m_path.getQString() + tempName;
+  QString tempName = "//" + QString::fromStdString(m_path.getName()) +
+                     "tempOut%d." + m_intermediateFormat;
+  tempName = getFfmpegCache().getQString() + tempName;
 
   QStringList args;
   args = args + preIArgs;
@@ -189,7 +191,8 @@ void Ffmpeg::saveSoundTrack(TSoundTrack *st) {
   int bufSize         = st->getSampleCount() * st->getSampleSize();
   const UCHAR *buffer = st->getRawData();
 
-  m_audioPath   = m_path.getQString() + "tempOut.raw";
+  m_audioPath = getFfmpegCache().getQString() + "//" +
+                QString::fromStdString(m_path.getName()) + "tempOut.raw";
   m_audioFormat = "s" + QString::number(m_bitsPerSample);
   if (m_bitsPerSample > 8) m_audioFormat = m_audioFormat + "le";
   std::string strPath                    = m_audioPath.toStdString();
diff --git a/toonz/sources/image/ffmpeg/tiio_gif.cpp b/toonz/sources/image/ffmpeg/tiio_gif.cpp
index 0676b91..18356e6 100644
--- a/toonz/sources/image/ffmpeg/tiio_gif.cpp
+++ b/toonz/sources/image/ffmpeg/tiio_gif.cpp
@@ -74,7 +74,8 @@ TLevelWriterGif::~TLevelWriterGif() {
   QString filters = "scale=" + QString::number(outLx) + ":-1:flags=lanczos";
   QString paletteFilters = filters + " [x]; [x][1:v] paletteuse";
   if (m_palette) {
-    palette = m_path.getQString() + "palette.png";
+    palette = ffmpegWriter->getFfmpegCache().getQString() + "//" +
+              QString::fromStdString(m_path.getName()) + "palette.png";
     palettePreIArgs << "-v";
     palettePreIArgs << "warning";