devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Code police:

Browse source 
- kill trailing whitespace
- replace tabs by spaces


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20623 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2009-04-05 12:46:41 +00:00
parent f3af25f5b7
commit baef133f5f
6 changed files with 474 additions and 469 deletions
Download patch file Download diff file Expand all files Collapse all files

14
rbutil/rbutilqt/tts.cpp
View file

@ -308,10 +308,11 @@ QStringList TTSSapi::getVoiceList(QString language)
delete voicescript; delete voicescript;
QFile::setPermissions(QDir::tempPath() +"/sapi_voice.vbs",QFile::ReadOwner |QFile::WriteOwner|QFile::ExeOwner QFile::setPermissions(QDir::tempPath() +"/sapi_voice.vbs",
|QFile::ReadUser| QFile::WriteUser| QFile::ExeUser QFile::ReadOwner |QFile::WriteOwner |QFile::ExeOwner
|QFile::ReadUser |QFile::WriteUser |QFile::ExeUser
|QFile::ReadGroup |QFile::WriteGroup |QFile::ExeGroup |QFile::ReadGroup |QFile::WriteGroup |QFile::ExeGroup
|QFile::ReadOther |QFile::WriteOther |QFile::ExeOther ); |QFile::ReadOther |QFile::WriteOther |QFile::ExeOther);
QFile::remove(QDir::tempPath() +"/sapi_voice.vbs"); QFile::remove(QDir::tempPath() +"/sapi_voice.vbs");
return result; return result;
@ -339,10 +340,11 @@ bool TTSSapi::stop()
voicescript->waitForFinished(); voicescript->waitForFinished();
delete voicestream; delete voicestream;
delete voicescript; delete voicescript;
QFile::setPermissions(QDir::tempPath() +"/sapi_voice.vbs",QFile::ReadOwner |QFile::WriteOwner|QFile::ExeOwner QFile::setPermissions(QDir::tempPath() +"/sapi_voice.vbs",
|QFile::ReadUser| QFile::WriteUser| QFile::ExeUser QFile::ReadOwner |QFile::WriteOwner |QFile::ExeOwner
|QFile::ReadUser |QFile::WriteUser |QFile::ExeUser
|QFile::ReadGroup |QFile::WriteGroup |QFile::ExeGroup |QFile::ReadGroup |QFile::WriteGroup |QFile::ExeGroup
|QFile::ReadOther |QFile::WriteOther |QFile::ExeOther ); |QFile::ReadOther |QFile::WriteOther |QFile::ExeOther);
QFile::remove(QDir::tempPath() +"/sapi_voice.vbs"); QFile::remove(QDir::tempPath() +"/sapi_voice.vbs");
return true; return true;
} }

4
rbutil/rbutilqt/tts.h
View file

@ -126,7 +126,7 @@ class TTSExes : public TTSBase
class TTSFestival : public TTSBase class TTSFestival : public TTSBase
{ {
Q_OBJECT Q_OBJECT
public: public:
~TTSFestival(); ~TTSFestival();
virtual bool configOk(); virtual bool configOk();
virtual bool start(QString *errStr); virtual bool start(QString *errStr);
@ -136,7 +136,7 @@ public:
QStringList getVoiceList(); QStringList getVoiceList();
QString getVoiceInfo(QString voice); QString getVoiceInfo(QString voice);
private: private:
inline void startServer(); inline void startServer();
inline void ensureServerRunning(); inline void ensureServerRunning();
QString queryServer(QString query, int timeout = -1); QString queryServer(QString query, int timeout = -1);

1
rbutil/rbutilqt/ttsgui.cpp
View file

@ -337,3 +337,4 @@ void TTSFestivalGui::updateDescription(QString value)
ui.descriptionLabel->setText(festival->getVoiceInfo(value)); ui.descriptionLabel->setText(festival->getVoiceInfo(value));
} }
} }

21
rbutil/rbutilqt/ttsgui.h
View file

@ -35,19 +35,19 @@ class TTSFestival;
class TTSSapiGui : public QDialog class TTSSapiGui : public QDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
TTSSapiGui(TTSSapi* sapi,QDialog* parent = NULL); TTSSapiGui(TTSSapi* sapi,QDialog* parent = NULL);
void showCfg(); void showCfg();
void setCfg(RbSettings* sett){settings = sett;} void setCfg(RbSettings* sett){settings = sett;}
public slots: public slots:
virtual void accept(void); virtual void accept(void);
virtual void reject(void); virtual void reject(void);
virtual void reset(void); virtual void reset(void);
void updateVoices(QString language); void updateVoices(QString language);
void useSapi4Changed(int); void useSapi4Changed(int);
private: private:
Ui::SapiCfgFrm ui; Ui::SapiCfgFrm ui;
RbSettings* settings; RbSettings* settings;
TTSSapi* m_sapi; TTSSapi* m_sapi;
@ -56,18 +56,18 @@ private:
class TTSExesGui : public QDialog class TTSExesGui : public QDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
TTSExesGui(QDialog* parent = NULL); TTSExesGui(QDialog* parent = NULL);
void showCfg(QString m_name); void showCfg(QString m_name);
void setCfg(RbSettings* sett){settings = sett;} void setCfg(RbSettings* sett){settings = sett;}
public slots: public slots:
virtual void accept(void); virtual void accept(void);
virtual void reject(void); virtual void reject(void);
virtual void reset(void); virtual void reset(void);
void browse(void); void browse(void);
private: private:
Ui::TTSExesCfgFrm ui; Ui::TTSExesCfgFrm ui;
RbSettings* settings; RbSettings* settings;
QString m_name; QString m_name;
@ -76,13 +76,13 @@ private:
class TTSFestivalGui : public QDialog class TTSFestivalGui : public QDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
TTSFestivalGui(TTSFestival* festival, QDialog* parent = NULL); TTSFestivalGui(TTSFestival* festival, QDialog* parent = NULL);
void showCfg(); void showCfg();
void setCfg(RbSettings* sett){settings = sett;} void setCfg(RbSettings* sett){settings = sett;}
public slots: public slots:
virtual void accept(void); virtual void accept(void);
virtual void reject(void); virtual void reject(void);
//virtual void reset(void); //virtual void reset(void);
@ -91,14 +91,15 @@ public slots:
void onShowDescription(int state); void onShowDescription(int state);
void onBrowseServer(); void onBrowseServer();
void onBrowseClient(); void onBrowseClient();
private: private:
Ui::TTSFestivalCfgFrm ui; Ui::TTSFestivalCfgFrm ui;
RbSettings* settings; RbSettings* settings;
TTSFestival* festival; TTSFestival* festival;
void updateVoices(); void updateVoices();
private slots: private slots:
void updateDescription(QString value); void updateDescription(QString value);
}; };
#endif #endif

1
rbutil/rbutilqt/voicefile.h
View file

@ -81,3 +81,4 @@ private:
}; };
#endif #endif