Updated x265 and NVEncC versions.

[x264-launcher/x264-launcher.git] / src / source_vapoursynth.h

diff --git a/src/source_vapoursynth.h b/src/source_vapoursynth.h
index 49cac70..23ea6dd 100644 (file)
--- a/src/source_vapoursynth.h
+++ b/src/source_vapoursynth.h
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Simple x264 Launcher
-// Copyright (C) 2004-2014 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2016 LoRd_MuldeR <MuldeR2@GMX.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -22,6 +22,8 @@
 #pragma once
 
 #include "source_abstract.h"
+#include "model_sysinfo.h"
+#include "model_preferences.h"
 
 class VapoursynthSource : public AbstractSource
 {
@@ -29,7 +31,7 @@ public:
        VapoursynthSource(JobObject *jobObject, const OptionsModel *options, const SysinfoModel *const sysinfo, const PreferencesModel *const preferences, JobStatus &jobStatus, volatile bool *abort, volatile bool *pause, QSemaphore *semaphorePause, const QString &sourceFile);
        virtual ~VapoursynthSource(void);
 
-       virtual const QString &getName(void);
+       virtual QString getName(void) const;
 
        virtual bool isSourceAvailable(void);
        virtual QString printVersion(const unsigned int &revision, const bool &modified);
@@ -37,16 +39,15 @@ public:
 
        virtual void flushProcess(QProcess &processInput);
 
+       static const AbstractSourceInfo& getSourceInfo(void);
+
 protected:
        virtual void checkVersion_init(QList<QRegExp*> &patterns, QStringList &cmdLine);
-       virtual void checkVersion_parseLine(const QString &line, QList<QRegExp*> &patterns, unsigned int &coreVers, unsigned int &revision, bool &modified);
+       virtual void checkVersion_parseLine(const QString &line, QList<QRegExp*> &patterns, unsigned int &core, unsigned int &build, bool &modified);
 
        virtual void checkSourceProperties_init(QList<QRegExp*> &patterns, QStringList &cmdLine);
-       virtual void checkSourceProperties_parseLine(const QString &line, QList<QRegExp*> &patterns, unsigned int &frames, unsigned int &fSizeW, unsigned int &fSizeH, unsigned int &fpsNom, unsigned int &fpsDen);
+       virtual void checkSourceProperties_parseLine(const QString &line, QList<QRegExp*> &patterns, ClipInfo &clipInfo);
 
-       virtual const QString &getBinaryPath() { return m_binaryFile; }
+       virtual QString getBinaryPath() const { return getSourceInfo().getBinaryPath(m_sysinfo, m_sysinfo->getCPUFeatures(SysinfoModel::CPUFeatures_X64) && m_sysinfo->getVapourSynth(SysinfoModel::VapourSynth_X64) && (m_preferences->getPrefer64BitSource() || (!m_sysinfo->getVapourSynth(SysinfoModel::VapourSynth_X86)))); }
        virtual void buildCommandLine(QStringList &cmdLine);
-
-       const QString m_sourceName;
-       const QString m_binaryFile;
 };