Parallel initialization of optional AAC encoders + massive code refactoring in AAC...

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

diff --git a/src/Thread_CueSplitter.cpp b/src/Thread_CueSplitter.cpp
index 838a6e6..a219b36 100644 (file)
--- a/src/Thread_CueSplitter.cpp
+++ b/src/Thread_CueSplitter.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
@@ -56,7 +56,7 @@ CueSplitter::CueSplitter(const QString &outputDir, const QString &baseName, CueS
        m_model(model),
        m_outputDir(outputDir),
        m_baseName(baseName),
-       m_soxBin(lamexp_lookup_tool("sox.exe"))
+       m_soxBin(lamexp_tools_lookup("sox.exe"))
 {
        if(m_soxBin.isEmpty())
        {
@@ -208,10 +208,10 @@ void CueSplitter::run()
 
                        //Generate output file name
                        QString trackTitle = trackMetaInfo.title().isEmpty() ? QString().sprintf("Track %02d", trackNo) : trackMetaInfo.title();
-                       QString outputFile = QString("%1/[%2] %3 - %4.wav").arg(m_outputDir, QString().sprintf("%02d", trackNo), lamexp_clean_filename(m_baseName), lamexp_clean_filename(trackTitle));
+                       QString outputFile = QString("%1/[%2] %3 - %4.wav").arg(m_outputDir, QString().sprintf("%02d", trackNo), MUtils::clean_file_name(m_baseName), MUtils::clean_file_name(trackTitle));
                        for(int n = 2; QFileInfo(outputFile).exists(); n++)
                        {
-                               outputFile = QString("%1/[%2] %3 - %4 (%5).wav").arg(m_outputDir, QString().sprintf("%02d", trackNo), lamexp_clean_filename(m_baseName), lamexp_clean_filename(trackTitle), QString::number(n));
+                               outputFile = QString("%1/[%2] %3 - %4 (%5).wav").arg(m_outputDir, QString().sprintf("%02d", trackNo), MUtils::clean_file_name(m_baseName), MUtils::clean_file_name(trackTitle), QString::number(n));
                        }
 
                        //Call split function