Bump version.

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

diff --git a/src/Decoder_Opus.cpp b/src/Decoder_Opus.cpp
index 9b0eac9..47a9dae 100644 (file)
--- a/src/Decoder_Opus.cpp
+++ b/src/Decoder_Opus.cpp
@@ -1,11 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2012 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,8 +22,13 @@
 
 #include "Decoder_Opus.h"
 
+//Internal
 #include "Global.h"
 
+//MUtils
+#include <MUtils/Exception.h>
+
+//Qt
 #include <QDir>
 #include <QProcess>
 #include <QRegExp>
@@ -32,11 +38,11 @@ bool OpusDecoder::m_disableResampling = false;
 
 OpusDecoder::OpusDecoder(void)
 :
-       m_binary(lamexp_lookup_tool("opusdec.exe"))
+       m_binary(lamexp_tools_lookup("opusdec.exe"))
 {
        if(m_binary.isEmpty())
        {
-               throw "Error initializing Opus decoder. Tool 'opusdec.exe' is not registred!";
+               MUTILS_THROW("Error initializing Opus decoder. Tool 'opusdec.exe' is not registred!");
        }
 }
 
@@ -140,8 +146,18 @@ bool OpusDecoder::isFormatSupported(const QString &containerType, const QString
        return false;
 }
 
-QStringList OpusDecoder::supportedTypes(void)
+const AbstractDecoder::supportedType_t *OpusDecoder::supportedTypes(void)
 {
-       return QStringList() << "Opus Audio Codec (*.opus *.ogg)";
-}
+       static const char *exts[] =
+       {
+               "opus", "ogg", NULL
+       };
 
+       static const supportedType_t s_supportedTypes[] =
+       {
+               { "Opus Audio Codec", exts },
+               { NULL, NULL }
+       };
+
+       return s_supportedTypes;
+}