Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rbutil: Simplify extenal encoder binary handling.

Browse source 
We only use lame as external encoder for voice on the Archos targets.
Simplify the implementation by removing (unused) handling of (potential)
other encoders.

Change-Id: I175cc21868fb7ef9524247d78cfb7bdf65e9e162
This commit is contained in:
Dominik Riebeling 2020-10-31 21:45:59 +01:00
parent daefd5686f
commit 1fa826738d
2 changed files with 19 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
rbutil/rbutilqt/base/encoderexe.cpp
View file

@ -22,31 +22,27 @@
#include "utils.h"
#include "Logger.h"
EncoderExe::EncoderExe(QString name,QObject *parent) : EncoderBase(parent)
EncoderExe::EncoderExe(QString name, QObject *parent) : EncoderBase(parent),
m_name(name)
{
m_name = name;
m_TemplateMap["lame"] = "\"%exe\" %options \"%input\" \"%output\"";
}
void EncoderExe::generateSettings()
{
QString exepath =RbSettings::subValue(m_name,RbSettings::EncoderPath).toString();
if(exepath == "") exepath = Utils::findExecutable(m_name);
QString exepath = RbSettings::subValue(m_name,RbSettings::EncoderPath).toString();
if(exepath.isEmpty()) exepath = Utils::findExecutable(m_name);
insertSetting(eEXEPATH,new EncTtsSetting(this,EncTtsSetting::eSTRING,
tr("Path to Encoder:"),exepath,EncTtsSetting::eBROWSEBTN));
insertSetting(eEXEOPTIONS,new EncTtsSetting(this,EncTtsSetting::eSTRING,
tr("Encoder options:"),RbSettings::subValue(m_name,RbSettings::EncoderOptions)));
insertSetting(eEXEPATH, new EncTtsSetting(this, EncTtsSetting::eSTRING,
tr("Path to Encoder:"), exepath, EncTtsSetting::eBROWSEBTN));
insertSetting(eEXEOPTIONS, new EncTtsSetting(this, EncTtsSetting::eSTRING,
tr("Encoder options:"), RbSettings::subValue(m_name, RbSettings::EncoderOptions)));
}
void EncoderExe::saveSettings()
{
RbSettings::setSubValue(m_name,RbSettings::EncoderPath,getSetting(eEXEPATH)->current().toString());
RbSettings::setSubValue(m_name,RbSettings::EncoderOptions,getSetting(eEXEOPTIONS)->current().toString());
RbSettings::setSubValue(m_name, RbSettings::EncoderPath, getSetting(eEXEPATH)->current().toString());
RbSettings::setSubValue(m_name, RbSettings::EncoderOptions, getSetting(eEXEOPTIONS)->current().toString());
RbSettings::sync();
}
@ -55,29 +51,20 @@ bool EncoderExe::start()
m_EncExec = RbSettings::subValue(m_name, RbSettings::EncoderPath).toString();
m_EncOpts = RbSettings::subValue(m_name, RbSettings::EncoderOptions).toString();
m_EncTemplate = m_TemplateMap.value(m_name);
QFileInfo enc(m_EncExec);
if(enc.exists())
{
return true;
}
else
{
return false;
}
return enc.exists();
}
bool EncoderExe::encode(QString input,QString output)
{
QString execstring = m_EncTemplate;
if (!configOk())
return false;
execstring.replace("%exe",m_EncExec);
execstring.replace("%options",m_EncOpts);
execstring.replace("%input",input);
execstring.replace("%output",output);
LOG_INFO() << "cmd: " << execstring;
int result = QProcess::execute(execstring);
QStringList args;
args << m_EncOpts;
args << input;
args << output;
int result = QProcess::execute(m_EncExec, args);
return result == 0;
}
@ -86,9 +73,6 @@ bool EncoderExe::configOk()
{
QString path = RbSettings::subValue(m_name, RbSettings::EncoderPath).toString();
if (QFileInfo(path).exists())
return true;
return false;
return QFileInfo::exists(path);
}

2
rbutil/rbutilqt/base/encoderexe.h
View file

@ -48,8 +48,6 @@ class EncoderExe : public EncoderBase
QString m_name;
QString m_EncExec;
QString m_EncOpts;
QMap<QString,QString> m_TemplateMap;
QString m_EncTemplate;
};
#endif