Muldersoft/Simple-x264-Launcher
Muldersoft/Simple-x264-Launcher
1
0
Fork 0
Code Releases 1 Activity

Fixed a few types.

Browse Source
This commit is contained in:
LoRd_MuldeR 2014-02-14 23:32:36 +01:00
parent d97545c2e4
commit a99b922856
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/thread_encode.cpp
View File

@ -233,7 +233,7 @@ void EncodeThread::encode(void)
//Print system info //Print system info
log(tr("\n--- SYSTEMINFO ---\n")); log(tr("\n--- SYSTEMINFO ---\n"));
log(tr("Binary Path: %1").arg(QDir::toNativeSeparators(m_sysinfo->getAppPath()))); log(tr("Binary Path: %1").arg(QDir::toNativeSeparators(m_sysinfo->getAppPath())));
log(tr("Avisynth 2x: %1").arg(m_sysinfo->hasAVSSupport() ? tr("YES") : tr("NO"))); log(tr("Avisynth OK: %1").arg(m_sysinfo->hasAVSSupport() ? tr("Yes") : tr("No")));
log(tr("VapourSynth: %1").arg(m_sysinfo->hasVPSSupport() ? QDir::toNativeSeparators(m_sysinfo->getVPSPath()) : tr("N/A"))); log(tr("VapourSynth: %1").arg(m_sysinfo->hasVPSSupport() ? QDir::toNativeSeparators(m_sysinfo->getVPSPath()) : tr("N/A")));
//Print encoder settings //Print encoder settings

2
src/version.h
View File

@ -26,7 +26,7 @@
#define VER_X264_MAJOR 2 #define VER_X264_MAJOR 2
#define VER_X264_MINOR 3 #define VER_X264_MINOR 3
#define VER_X264_PATCH 1 #define VER_X264_PATCH 1
#define VER_X264_BUILD 769 #define VER_X264_BUILD 770
#define VER_X264_MINIMUM_REV 2380 #define VER_X264_MINIMUM_REV 2380
#define VER_X264_CURRENT_API 142 #define VER_X264_CURRENT_API 142

14
src/win_addJob.cpp
View File

@ -306,8 +306,8 @@ AddJobDialog::~AddJobDialog(void)
{ {
continue; continue;
} }
OptionsModel *item = reinterpret_cast<OptionsModel*>(ui->cbxTemplate->itemData(i).value<void*>()); const OptionsModel *item = reinterpret_cast<const OptionsModel*>(ui->cbxTemplate->itemData(i).value<const void*>());
ui->cbxTemplate->setItemData(i, QVariant::fromValue<void*>(NULL)); ui->cbxTemplate->setItemData(i, QVariant::fromValue<const void*>(NULL));
X264_DELETE(item); X264_DELETE(item);
} }
@ -623,7 +623,7 @@ void AddJobDialog::saveTemplateButtonClicked(void)
{ {
continue; continue;
} }
OptionsModel* test = reinterpret_cast<OptionsModel*>(ui->cbxTemplate->itemData(i).value<void*>()); const OptionsModel* test = reinterpret_cast<const OptionsModel*>(ui->cbxTemplate->itemData(i).value<const void*>());
if(test != NULL) if(test != NULL)
{ {
if(options->equals(test)) if(options->equals(test))
@ -684,15 +684,15 @@ void AddJobDialog::saveTemplateButtonClicked(void)
if(ui->cbxTemplate->itemText(i).compare(name, Qt::CaseInsensitive) == 0) if(ui->cbxTemplate->itemText(i).compare(name, Qt::CaseInsensitive) == 0)
{ {
index = -1; //Do not append new template index = -1; //Do not append new template
OptionsModel *oldItem = reinterpret_cast<OptionsModel*>(ui->cbxTemplate->itemData(i).value<void*>()); const OptionsModel *oldItem = reinterpret_cast<const OptionsModel*>(ui->cbxTemplate->itemData(i).value<const void*>());
ui->cbxTemplate->setItemData(i, QVariant::fromValue<void*>(options)); ui->cbxTemplate->setItemData(i, QVariant::fromValue<const void*>(options));
ui->cbxTemplate->setCurrentIndex(i); ui->cbxTemplate->setCurrentIndex(i);
X264_DELETE(oldItem); X264_DELETE(oldItem);
} }
} }
if(index >= 0) if(index >= 0)
{ {
ui->cbxTemplate->insertItem(index, name, QVariant::fromValue<void*>(options)); ui->cbxTemplate->insertItem(index, name, QVariant::fromValue<const void*>(options));
ui->cbxTemplate->setCurrentIndex(index); ui->cbxTemplate->setCurrentIndex(index);
} }
ui->cbxTemplate->blockSignals(false); ui->cbxTemplate->blockSignals(false);
@ -719,7 +719,7 @@ void AddJobDialog::deleteTemplateButtonClicked(void)
OptionsModel::deleteTemplate(name); OptionsModel::deleteTemplate(name);
OptionsModel *item = reinterpret_cast<OptionsModel*>(ui->cbxTemplate->itemData(index).value<void*>()); const OptionsModel *item = reinterpret_cast<const OptionsModel*>(ui->cbxTemplate->itemData(index).value<const void*>());
ui->cbxTemplate->removeItem(index); ui->cbxTemplate->removeItem(index);
X264_DELETE(item); X264_DELETE(item);
} }