Make encoder name conversion functions static to the base class.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16305 a1c6a512-1295-4272-9138-f99709370657

7 files changed, 42 insertions, 44 deletions

diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp
index ec4bd188e5..25fc675ca5 100644
--- a/rbutil/rbutilqt/configure.cpp
+++ b/rbutil/rbutilqt/configure.cpp
@@ -289,9 +289,9 @@ void Config::setDevices()
     
     //encoders
     int index;
-    QStringList encoders = getEncoderList();
+    QStringList encoders = EncBase::getEncoderList();
     for(int a = 0; a < encoders.size(); a++)
-        ui.comboEncoder->addItem(getEncoderName(encoders.at(a)), encoders.at(a));
+        ui.comboEncoder->addItem(EncBase::getEncoderName(encoders.at(a)), encoders.at(a));
     //update index of combobox
     index = ui.comboEncoder->findData(settings->curEncoder());
     if(index < 0) index = 0;
@@ -332,7 +332,7 @@ void Config::updateTtsState(int index)
 void Config::updateEncState(int index)
 {
     QString encoder = ui.comboEncoder->itemData(index).toString();
-    EncBase* enc = getEncoder(encoder);
+    EncBase* enc = EncBase::getEncoder(encoder);
     enc->setCfg(settings);
     
     if(enc->configOk())
@@ -599,7 +599,7 @@ void Config::configTts()
 void Config::configEnc()
 {
     int index = ui.comboEncoder->currentIndex();
-    EncBase* enc = getEncoder(ui.comboEncoder->itemData(index).toString());
+    EncBase* enc = EncBase::getEncoder(ui.comboEncoder->itemData(index).toString());
     
     enc->setCfg(settings);
     enc->showCfg();
diff --git a/rbutil/rbutilqt/createvoicewindow.cpp b/rbutil/rbutilqt/createvoicewindow.cpp
index 768b1ae117..843041fde7 100644
--- a/rbutil/rbutilqt/createvoicewindow.cpp
+++ b/rbutil/rbutilqt/createvoicewindow.cpp
@@ -100,11 +100,11 @@ void CreateVoiceWindow::setSettings(RbSettings* sett)
     
     QString encoder = settings->curEncoder();
     // only proceed if encoder setting is set
-    EncBase* enc = getEncoder(encoder);
+    EncBase* enc = EncBase::getEncoder(encoder);
     if(enc != NULL) {
         enc->setCfg(settings);
         if(enc->configOk())
-            ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg(getEncoderName(encoder)));
+            ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg(EncBase::getEncoderName(encoder)));
         else
             ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg("Invalid encoder configuration!"));
     }
diff --git a/rbutil/rbutilqt/encoders.cpp b/rbutil/rbutilqt/encoders.cpp
index 0077263df0..acc7e4ef9c 100644
--- a/rbutil/rbutilqt/encoders.cpp
+++ b/rbutil/rbutilqt/encoders.cpp
@@ -26,12 +26,13 @@
 #include "encodersguicli.h"
 #endif
 
-static QMap<QString,QString> encoderList;
-static QMap<QString,EncBase*> encoderCache;
+
+QMap<QString,QString> EncBase::encoderList;
+QMap<QString,EncBase*> EncBase::encoderCache;
 
 
 // initialize list of encoders
-void initEncodernamesList()
+void EncBase::initEncodernamesList()
 {
     encoderList["rbspeex"] = "Rockbox Speex Encoder";
     encoderList["lame"] = "Lame Mp3 Encoder";
@@ -39,7 +40,7 @@ void initEncodernamesList()
 
 
 // get nice name for a specific encoder
-QString getEncoderName(QString encoder)
+QString EncBase::getEncoderName(QString encoder)
 {
     if(encoderList.isEmpty())
         initEncodernamesList();
@@ -48,7 +49,7 @@ QString getEncoderName(QString encoder)
 
 
 // get a specific encoder object
-EncBase* getEncoder(QString encoder)
+EncBase* EncBase::getEncoder(QString encoder)
 {
     // check cache
     if(encoderCache.contains(encoder))
@@ -70,7 +71,7 @@ EncBase* getEncoder(QString encoder)
 }
 
 
-QStringList getEncoderList()
+QStringList EncBase::getEncoderList()
 {
     if(encoderList.isEmpty())
         initEncodernamesList();
diff --git a/rbutil/rbutilqt/encoders.h b/rbutil/rbutilqt/encoders.h
index 8e91e6e149..b5460de3ab 100644
--- a/rbutil/rbutilqt/encoders.h
+++ b/rbutil/rbutilqt/encoders.h
@@ -29,40 +29,37 @@ extern "C"
     #include "rbspeex.h"
 }
 
-class EncBase;
-
-//inits the encoder List
-void initEncodernamesList(void);
-// function to get a specific encoder
-EncBase* getEncoder(QString encname);
-// get the list of encoders, nice names
-QString getEncoderName(QString encoder);
-QStringList getEncoderList(void);
-
 
 class EncBase : public QObject
 {
     Q_OBJECT
-public:
-    EncBase(QObject *parent );
-    
-    virtual bool encode(QString input,QString output)
-        {(void)input; (void)output; return false;}
-    virtual bool start(){return false;}
-    virtual bool stop(){return false;}
-    virtual void showCfg(){}
-    virtual bool configOk(){return false;}
+    public:
+        EncBase(QObject *parent );
+
+        virtual bool encode(QString input,QString output)
+            {(void)input; (void)output; return false;}
+        virtual bool start(){return false;}
+        virtual bool stop(){return false;}
+        virtual void showCfg(){}
+        virtual bool configOk(){return false;}
+
+        void setCfg(RbSettings *sett){settings = sett;}
+        static QString getEncoderName(QString);
+        static EncBase* getEncoder(QString);
+        static QStringList getEncoderList(void);
+
+    public slots:
+        virtual void accept(void){}
+        virtual void reject(void){}
+        virtual void reset(void){}
+    private:
+        static void initEncodernamesList(void);
 
-    void setCfg(RbSettings *sett){settings = sett;}
-     
-public slots:
-    virtual void accept(void){}
-    virtual void reject(void){}
-    virtual void reset(void){}
+    protected:
+        RbSettings* settings;
 
-protected:
-   
-    RbSettings* settings;
+        static QMap<QString,QString> encoderList;
+        static QMap<QString,EncBase*> encoderCache;
 };
 
 
diff --git a/rbutil/rbutilqt/installtalkwindow.cpp b/rbutil/rbutilqt/installtalkwindow.cpp
index 539374a07e..59ec12fa11 100644
--- a/rbutil/rbutilqt/installtalkwindow.cpp
+++ b/rbutil/rbutilqt/installtalkwindow.cpp
@@ -119,11 +119,11 @@ void InstallTalkWindow::setSettings(RbSettings* sett)
         ui.labelTtsProfile->setText(tr("Selected TTS Engine: <b>%1</b>").arg("Invalid TTS configuration!"));
     
     QString encoder = settings->curEncoder();
-    EncBase* enc = getEncoder(encoder);
+    EncBase* enc = EncBase::getEncoder(encoder);
     if(enc != NULL) {
         enc->setCfg(settings);
         if(enc->configOk())
-            ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg(getEncoderName(encoder)));
+            ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg(EncBase::getEncoderName(encoder)));
         else
             ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg("Invalid encoder configuration!"));
     }
diff --git a/rbutil/rbutilqt/talkfile.cpp b/rbutil/rbutilqt/talkfile.cpp
index 4390c430b9..7e5b6a2a0c 100644
--- a/rbutil/rbutilqt/talkfile.cpp
+++ b/rbutil/rbutilqt/talkfile.cpp
@@ -44,7 +44,7 @@ bool TalkFileCreator::createTalkFiles(ProgressloggerInterface* logger)
     }
 
     // Encoder
-    m_enc = getEncoder(settings->curEncoder());  
+    m_enc = EncBase::getEncoder(settings->curEncoder());  
     m_enc->setCfg(settings);
   
     if(!m_enc->start())
diff --git a/rbutil/rbutilqt/voicefile.cpp b/rbutil/rbutilqt/voicefile.cpp
index 208e134274..e2944eb79d 100644
--- a/rbutil/rbutilqt/voicefile.cpp
+++ b/rbutil/rbutilqt/voicefile.cpp
@@ -155,7 +155,7 @@ void VoiceFileCreator::downloadDone(bool error)
     }
 
     // Encoder
-    m_enc = getEncoder(settings->curEncoder());  
+    m_enc = EncBase::getEncoder(settings->curEncoder());  
     m_enc->setCfg(settings);
   
     if(!m_enc->start())