Bump x264 minimum required version to API-#160 (r2999).

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

diff --git a/src/thread_encode.h b/src/thread_encode.h
index 6a532d2..e8b53a2 100644 (file)
--- a/src/thread_encode.h
+++ b/src/thread_encode.h
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Simple x264 Launcher
-// Copyright (C) 2004-2015 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2020 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
@@ -21,6 +21,7 @@
 
 #pragma once
 
+#include "thread_abstract.h"
 #include "model_status.h"
 
 #include <QThread>
@@ -37,7 +38,7 @@ class JobObject;
 class AbstractEncoder;
 class AbstractSource;
 
-class EncodeThread : public QThread
+class EncodeThread : public AbstractThread
 {
        Q_OBJECT
 
@@ -100,10 +101,9 @@ protected:
 
        //Entry point
        virtual void run(void);
-       virtual void checkedRun(void);
        
-       //Main encoding functions
-       void encode(void);
+       //Thread main
+       virtual int threadMain(void);
 
        //Static functions
        static QString getPasslogFile(const QString &outputFile);
@@ -111,7 +111,7 @@ protected:
 signals:
        void statusChanged(const QUuid &jobId, const JobStatus &newStatus);
        void progressChanged(const QUuid &jobId, const unsigned int &newProgress);
-       void messageLogged(const QUuid &jobId, const QString &text);
+       void messageLogged(const QUuid &jobId, qint64, const QString &text);
        void detailsChanged(const QUuid &jobId, const QString &details);
 
 private slots: