Improved internal decoder interface.

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

diff --git a/src/Decoder_Avisynth.cpp b/src/Decoder_Avisynth.cpp
index 0de7cbd..e72a52d 100644 (file)
--- a/src/Decoder_Avisynth.cpp
+++ b/src/Decoder_Avisynth.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2014 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
@@ -22,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!");
        }
 }
 
@@ -128,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;
 }