1
0
Fork 0
forked from len0rd/rockbox

Split up encoders sources.

Create a separate source / header file for each supported encoder and the base
class and rename classes for better readability. This should also make it
easier adding new encoders.

Remove a few trailing spaces while at it.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31592 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2012-01-06 19:19:32 +00:00
parent f860b57143
commit be0e197190
12 changed files with 337 additions and 239 deletions

View file

@ -22,7 +22,7 @@
#include "configure.h"
#include "autodetection.h"
#include "ui_configurefrm.h"
#include "encoders.h"
#include "encoderbase.h"
#include "ttsbase.h"
#include "system.h"
#include "encttscfggui.h"
@ -40,6 +40,8 @@
#endif
#include "rbutilqt.h"
#include "systrace.h"
#define DEFAULT_LANG "English (en)"
#define DEFAULT_LANG_CODE "en"
@ -436,10 +438,10 @@ void Config::updateEncState()
QString devname = ui.treeDevices->selectedItems().at(0)->data(0, Qt::UserRole).toString();
QString encoder = SystemInfo::platformValue(devname,
SystemInfo::CurEncoder).toString();
ui.encoderName->setText(EncBase::getEncoderName(SystemInfo::platformValue(devname,
ui.encoderName->setText(EncoderBase::getEncoderName(SystemInfo::platformValue(devname,
SystemInfo::CurEncoder).toString()));
EncBase* enc = EncBase::getEncoder(this,encoder);
EncoderBase* enc = EncoderBase::getEncoder(this,encoder);
if(enc->configOk())
{
@ -893,13 +895,13 @@ void Config::configEnc()
QString devname = ui.treeDevices->selectedItems().at(0)->data(0, Qt::UserRole).toString();
QString encoder = SystemInfo::platformValue(devname,
SystemInfo::CurEncoder).toString();
ui.encoderName->setText(EncBase::getEncoderName(SystemInfo::platformValue(devname,
ui.encoderName->setText(EncoderBase::getEncoderName(SystemInfo::platformValue(devname,
SystemInfo::CurEncoder).toString()));
EncBase* enc = EncBase::getEncoder(this,encoder);
EncoderBase* enc = EncoderBase::getEncoder(this,encoder);
EncTtsCfgGui gui(this,enc,EncBase::getEncoderName(encoder));
EncTtsCfgGui gui(this,enc,EncoderBase::getEncoderName(encoder));
gui.exec();
updateEncState();