///////////////////////////////////////////////////////////////////////////////
// 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
#include "Decoder_FLAC.h"
+//Internal
#include "Global.h"
+//MUtils
+#include <MUtils/Exception.h>
+
+//Qt
#include <QDir>
#include <QProcess>
#include <QRegExp>
FLACDecoder::FLACDecoder(void)
:
- m_binary(lamexp_lookup_tool("flac.exe"))
+ m_binary(lamexp_tools_lookup("flac.exe"))
{
if(m_binary.isEmpty())
{
- throw "Error initializing FLAC decoder. Tool 'flac.exe' is not registred!";
+ MUTILS_THROW("Error initializing FLAC decoder. Tool 'flac.exe' is not registred!");
}
}
bool bTimeout = false;
bool bAborted = false;
- QRegExp regExp("\\s(\\d+)% complete");
+ QRegExp regExp("\\b(\\d+)% complete");
while(process.state() != QProcess::NotRunning)
{
}
while(process.bytesAvailable() > 0)
{
- QByteArray line = process.readLine();
+ QByteArray line = process.readLine().replace('\b', char(0x20));
QString text = QString::fromUtf8(line.constData()).simplified();
if(regExp.lastIndexIn(text) >= 0)
{