1 files changed, 25 insertions, 28 deletions

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;
 };