Bump release year.

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

diff --git a/src/Encoder_DCA.cpp b/src/Encoder_DCA.cpp
index d517326..1dc3fc8 100644 (file)
--- a/src/Encoder_DCA.cpp
+++ b/src/Encoder_DCA.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2014 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2017 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
@@ -109,6 +109,17 @@ class DCAEncoderInfo : public AbstractEncoderInfo
                static const char* s_description = "dcaenc-2 by Alexander E. Patrakov";
                return s_description;
        }
+
+       virtual const char *extension(void) const
+       {
+               static const char* s_extension = "dts";
+               return s_extension;
+       }
+
+       virtual bool isResamplingSupported(void) const
+       {
+               return false;
+       }
 }
 static const g_dcaEncoderInfo;
 
@@ -118,7 +129,7 @@ static const g_dcaEncoderInfo;
 
 DCAEncoder::DCAEncoder(void)
 :
-       m_binary(lamexp_lookup_tool("dcaenc.exe"))
+       m_binary(lamexp_tools_lookup(L1S("dcaenc.exe")))
 {
        if(m_binary.isEmpty())
        {
@@ -130,14 +141,14 @@ DCAEncoder::~DCAEncoder(void)
 {
 }
 
-bool DCAEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const QString &outputFile, volatile bool *abortFlag)
+bool DCAEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const unsigned int channels, const QString &outputFile, volatile bool *abortFlag)
 {
        QProcess process;
        QStringList args;
 
-       args << "-i" << QDir::toNativeSeparators(sourceFile);
-       args << "-o" << QDir::toNativeSeparators(outputFile);
-       args << "-b" << QString::number(qBound(32, index2bitrate(m_configBitrate), 4096));
+       args << L1S("-i") << QDir::toNativeSeparators(sourceFile);
+       args << L1S("-o") << QDir::toNativeSeparators(outputFile);
+       args << L1S("-b") << QString::number(qBound(32, index2bitrate(m_configBitrate), 4096));
 
        if(!startProcess(process, m_binary, args))
        {
@@ -148,7 +159,7 @@ bool DCAEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo
        bool bAborted = false;
        int prevProgress = -1;
 
-       QRegExp regExp("\\[(\\d+)\\.(\\d+)%\\]");
+       QRegExp regExp(L1S("\\[(\\d+)\\.(\\d+)%\\]"));
 
        while(process.state() != QProcess::NotRunning)
        {
@@ -156,7 +167,7 @@ bool DCAEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo
                {
                        process.kill();
                        bAborted = true;
-                       emit messageLogged("\nABORTED BY USER !!!");
+                       emit messageLogged(L1S("\nABORTED BY USER !!!"));
                        break;
                }
                process.waitForReadyRead(m_processTimeoutInterval);
@@ -164,7 +175,7 @@ bool DCAEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo
                {
                        process.kill();
                        qWarning("DCAENC process timed out <-- killing!");
-                       emit messageLogged("\nPROCESS TIMEOUT !!!");
+                       emit messageLogged(L1S("\nPROCESS TIMEOUT !!!"));
                        bTimeout = true;
                        break;
                }
@@ -207,16 +218,11 @@ bool DCAEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo
        return true;
 }
 
-QString DCAEncoder::extension(void)
-{
-       return "dts";
-}
-
 bool DCAEncoder::isFormatSupported(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion)
 {
-       if(containerType.compare("Wave", Qt::CaseInsensitive) == 0)
+       if(containerType.compare(L1S("Wave"), Qt::CaseInsensitive) == 0)
        {
-               if(formatType.compare("PCM", Qt::CaseInsensitive) == 0)
+               if(formatType.compare(L1S("PCM"), Qt::CaseInsensitive) == 0)
                {
                        return true;
                }