rbutil: added builtin rbspeex encoder. Reworked encoder configuration.

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

1 files changed, 13 insertions, 15 deletions

diff --git a/rbutil/rbutilqt/talkfile.h b/rbutil/rbutilqt/talkfile.h
index 54819c80f8..2e2c3d7a01 100644
--- a/rbutil/rbutilqt/talkfile.h
+++ b/rbutil/rbutilqt/talkfile.h
@@ -21,8 +21,12 @@
 #ifndef TALKFILE_H
 #define TALKFILE_H
 
+#include <QtGui>
 #include "progressloggerinterface.h"
 
+#include "encoders.h"
+
+
 class TTSBase : public QObject
 {
     Q_OBJECT
@@ -55,18 +59,16 @@ public:
 
     bool createTalkFiles(ProgressloggerInterface* logger);
 
+    void setUserSettings(QSettings* setting) { userSettings = setting;}
+    
     void setTTSexe(QString exe){m_TTSexec=exe;}
-    void setEncexe(QString exe){m_EncExec=exe;}
-
+  
     void setTTsType(QString tts) { m_curTTS = tts; }
     void setTTsOpts(QString opts) {m_TTSOpts=opts;}
     void setTTsLanguage(QString language) {m_TTSLanguage = language;}
     void setTTsTemplate(QString t) { m_curTTSTemplate = t; }
 
-    void setEncType(QString enc) { m_curEnc = enc; }
-    void setEncOpts(QString opts) {m_EncOpts=opts;}
-    void setEncTemplate(QString t) { m_curEncTemplate = t; }
-
+   
     void setDir(QDir dir){m_dir = dir; }
     void setMountPoint(QString mountpoint) {m_mountpoint =mountpoint; }
 
@@ -83,10 +85,9 @@ private slots:
 
 private:
     TTSBase* m_tts;
-    bool initEncoder();
-    
-    bool encode(QString input,QString output);
-
+    EncBase* m_enc;
+    QSettings *userSettings;
+   
     QDir   m_dir;
     QString m_mountpoint;
     QString m_curTTS;
@@ -95,11 +96,6 @@ private:
     QString m_TTSLanguage;
     QString m_curTTSTemplate;
 
-    QString m_curEnc;
-    QString m_EncExec;
-    QString m_EncOpts;
-    QString m_curEncTemplate;
-
     bool m_overwriteTalk;
     bool m_overwriteWav;
     bool m_removeWav;
@@ -137,5 +133,7 @@ private:
    
 };
 
+
+
 #endif