Updated project/solution files for Visual Studio 2012.

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

diff --git a/src/Encoder_AAC.cpp b/src/Encoder_AAC.cpp
index 783a3ca..927fd5c 100644 (file)
--- a/src/Encoder_AAC.cpp
+++ b/src/Encoder_AAC.cpp
@@ -1,11 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2013 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
@@ -48,7 +49,7 @@ class AACEncoderInfo : public AbstractEncoderInfo
                        return true;
                        break;
                default:
-                       THROW("Bad RC mode specified!");
+                       MUTILS_THROW("Bad RC mode specified!");
                }
        }
 
@@ -64,7 +65,7 @@ class AACEncoderInfo : public AbstractEncoderInfo
                        return 41;
                        break;
                default:
-                       THROW("Bad RC mode specified!");
+                       MUTILS_THROW("Bad RC mode specified!");
                }
        }
 
@@ -80,7 +81,7 @@ class AACEncoderInfo : public AbstractEncoderInfo
                        return qBound(8, index2bitrate(index), 400);
                        break;
                default:
-                       THROW("Bad RC mode specified!");
+                       MUTILS_THROW("Bad RC mode specified!");
                }
        }
 
@@ -98,7 +99,7 @@ class AACEncoderInfo : public AbstractEncoderInfo
                        return TYPE_BITRATE;
                        break;
                default:
-                       THROW("Bad RC mode specified!");
+                       MUTILS_THROW("Bad RC mode specified!");
                }
        }
 
@@ -116,13 +117,13 @@ static const g_aacEncoderInfo;
 
 AACEncoder::AACEncoder(void)
 :
-       m_binary_enc(lamexp_lookup_tool("neroAacEnc.exe")),
-       m_binary_tag(lamexp_lookup_tool("neroAacTag.exe")),
-       m_binary_sox(lamexp_lookup_tool("sox.exe"))
+       m_binary_enc(lamexp_tools_lookup("neroAacEnc.exe")),
+       m_binary_tag(lamexp_tools_lookup("neroAacTag.exe")),
+       m_binary_sox(lamexp_tools_lookup("sox.exe"))
 {
        if(m_binary_enc.isEmpty() || m_binary_tag.isEmpty() || m_binary_sox.isEmpty())
        {
-               THROW("Error initializing AAC encoder. Tool 'neroAacEnc.exe' is not registred!");
+               MUTILS_THROW("Error initializing AAC encoder. Tool 'neroAacEnc.exe' is not registred!");
        }
 
        m_configProfile = 0;
@@ -151,7 +152,7 @@ bool AACEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo
                args << "-cbr" << QString::number(qBound(8, index2bitrate(m_configBitrate), 400) * 1000);
                break;
        default:
-               THROW("Bad rate-control mode!");
+               MUTILS_THROW("Bad rate-control mode!");
                break;
        }