Removed some Debug outputs.

[lamexp/LameXP.git] / src / Decoder_Avisynth.cpp

diff --git a/src/Decoder_Avisynth.cpp b/src/Decoder_Avisynth.cpp
index d357385..e72a52d 100644 (file)
--- a/src/Decoder_Avisynth.cpp
+++ b/src/Decoder_Avisynth.cpp
@@ -1,11 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2011 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2015 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
 // the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// (at your option) any later version, but always including the *additional*
+// restrictions defined in the "License.txt" file.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,19 +22,25 @@
 
 #include "Decoder_Avisynth.h"
 
+
+//Internal
 #include "Global.h"
 
+//MUtils
+#include <MUtils/Exception.h>
+
+//Qt
 #include <QDir>
 #include <QProcess>
 #include <QRegExp>
 
 AvisynthDecoder::AvisynthDecoder(void)
 :
-       m_binary(lamexp_lookup_tool("avs2wav.exe"))
+       m_binary(lamexp_tools_lookup("avs2wav.exe"))
 {
        if(m_binary.isEmpty())
        {
-               throw "Error initializing Avisynth decoder. Tool 'avs2wav.exe' is not registred!";
+               MUTILS_THROW("Error initializing Avisynth decoder. Tool 'avs2wav.exe' is not registred!");
        }
 }
 
@@ -46,6 +53,8 @@ bool AvisynthDecoder::decode(const QString &sourceFile, const QString &outputFil
        QProcess process;
        QStringList args;
 
+       process.setWorkingDirectory(QFileInfo(outputFile).absolutePath());
+
        args << QDir::toNativeSeparators(sourceFile);
        args << QDir::toNativeSeparators(outputFile);
 
@@ -68,7 +77,7 @@ bool AvisynthDecoder::decode(const QString &sourceFile, const QString &outputFil
                        emit messageLogged("\nABORTED BY USER !!!");
                        break;
                }
-               process.waitForReadyRead();
+               process.waitForReadyRead(m_processTimeoutInterval);
                if(!process.bytesAvailable() && process.state() == QProcess::Running)
                {
                        process.kill();
@@ -104,7 +113,7 @@ bool AvisynthDecoder::decode(const QString &sourceFile, const QString &outputFil
        emit statusUpdated(100);
        emit messageLogged(QString().sprintf("\nExited with code: 0x%04X", process.exitCode()));
 
-       if(bTimeout || bAborted || process.exitStatus() != QProcess::NormalExit || QFileInfo(outputFile).size() == 0)
+       if(bTimeout || bAborted || process.exitCode() != EXIT_SUCCESS || QFileInfo(outputFile).size() == 0)
        {
                return false;
        }
@@ -125,7 +134,18 @@ bool AvisynthDecoder::isFormatSupported(const QString &containerType, const QStr
        return false;
 }
 
-QStringList AvisynthDecoder::supportedTypes(void)
+const AbstractDecoder::supportedType_t *AvisynthDecoder::supportedTypes(void)
 {
-       return QStringList() << "Avisynth Script (*.avs)";
+       static const char *exts[] =
+       {
+               "avs", NULL
+       };
+
+       static const supportedType_t s_supportedTypes[] =
+       {
+               { "Avisynth Script", exts },
+               { NULL, NULL }
+       };
+
+       return s_supportedTypes;
 }