From d15b08c18167965f1c5a4db9db1855434253d7e4 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Wed, 22 Apr 2020 13:10:48 +1000
Subject: [PATCH] sampleformat: fixed erroneous constant

---
 app/audio/sampleformat.cpp   | 2 +-
 app/common/crashhandler.cpp  | 2 +-
 app/common/filefunctions.cpp | 2 +-
 app/common/filefunctions.h   | 2 +-
 app/render/colormanager.cpp  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/audio/sampleformat.cpp b/app/audio/sampleformat.cpp
index 7ec614dac..f7af19c65 100644
--- a/app/audio/sampleformat.cpp
+++ b/app/audio/sampleformat.cpp
@@ -24,7 +24,7 @@
 
 OLIVE_NAMESPACE_ENTER
 
-const SampleFormat::Format SampleFormat::kInternalFormat = SAMPLE_FMT_S32;
+const SampleFormat::Format SampleFormat::kInternalFormat = SAMPLE_FMT_FLT;
 
 QString SampleFormat::GetSampleFormatName(const SampleFormat::Format &f)
 {
diff --git a/app/common/crashhandler.cpp b/app/common/crashhandler.cpp
index e4daf7dd8..b8ac83a0c 100644
--- a/app/common/crashhandler.cpp
+++ b/app/common/crashhandler.cpp
@@ -42,7 +42,7 @@
 OLIVE_NAMESPACE_ENTER
 
 void crash_handler(int sig) {
-  QString log_path = QDir(FileFunctions::GetTempPath()).filePath(QStringLiteral("olive_crash"));
+  QString log_path = QDir(FileFunctions::GetTempFilePath()).filePath(QStringLiteral("olive_crash"));
   QFile output(log_path);
 
   output.open(QFile::WriteOnly);
diff --git a/app/common/filefunctions.cpp b/app/common/filefunctions.cpp
index 3d6aaf95d..c918066c8 100644
--- a/app/common/filefunctions.cpp
+++ b/app/common/filefunctions.cpp
@@ -98,7 +98,7 @@ QString FileFunctions::GetApplicationPath()
   return QCoreApplication::applicationDirPath();
 }
 
-QString FileFunctions::GetTempPath()
+QString FileFunctions::GetTempFilePath()
 {
   QString temp_path = QDir(QDir(QStandardPaths::writableLocation(QStandardPaths::TempLocation))
                            .filePath(QCoreApplication::organizationName()))
diff --git a/app/common/filefunctions.h b/app/common/filefunctions.h
index 323a84e1f..19eac2cbf 100644
--- a/app/common/filefunctions.h
+++ b/app/common/filefunctions.h
@@ -52,7 +52,7 @@ public:
 
   static QString GetApplicationPath();
 
-  static QString GetTempPath();
+  static QString GetTempFilePath();
 
   static void CopyDirectory(const QString& source, const QString& dest);
 };
diff --git a/app/render/colormanager.cpp b/app/render/colormanager.cpp
index 8c0b1a941..6a956b308 100644
--- a/app/render/colormanager.cpp
+++ b/app/render/colormanager.cpp
@@ -57,7 +57,7 @@ const QString &ColorManager::GetConfigFilename() const
 void ColorManager::SetUpDefaultConfig()
 {
   // Kind of hacky, but it'll work
-  QString dir = QDir(FileFunctions::GetTempPath()).filePath(QStringLiteral("ocioconf"));
+  QString dir = QDir(FileFunctions::GetTempFilePath()).filePath(QStringLiteral("ocioconf"));
 
   FileFunctions::CopyDirectory(QStringLiteral(":/ocioconf"),
                                dir);