sampleformat: fixed erroneous constant
This commit is contained in:
@@ -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)
|
||||
{
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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()))
|
||||
|
||||
@@ -52,7 +52,7 @@ public:
|
||||
|
||||
static QString GetApplicationPath();
|
||||
|
||||
static QString GetTempPath();
|
||||
static QString GetTempFilePath();
|
||||
|
||||
static void CopyDirectory(const QString& source, const QString& dest);
|
||||
};
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user