Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
TextToSpeech
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Accelerators
System
TextToSpeech
Commits
6e9127f7
Commit
6e9127f7
authored
7 years ago
by
Stuart Mark James
Browse files
Options
Downloads
Patches
Plain Diff
Tweaks to version
parent
4175b9c2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
TextToSpeech.cpp
+10
-10
10 additions, 10 deletions
TextToSpeech.cpp
cmake/ReleaseVersion.cmake
+6
-6
6 additions, 6 deletions
cmake/ReleaseVersion.cmake
cmake/TextToSpeechConfig.h.in
+5
-5
5 additions, 5 deletions
cmake/TextToSpeechConfig.h.in
with
21 additions
and
21 deletions
TextToSpeech.cpp
+
10
−
10
View file @
6e9127f7
...
...
@@ -86,8 +86,8 @@ namespace TextToSpeech_ns
const
string
CacheTypeNone
=
"None"
;
const
string
CacheTypeFile
=
"File"
;
const
string
JinglesUnavailable
=
"
U
navailable"
;
const
string
VoicesUnavailable
=
"
U
navailable"
;
const
string
JinglesUnavailable
=
"
u
navailable"
;
const
string
VoicesUnavailable
=
"
u
navailable"
;
/*----- PROTECTED REGION END -----*/
// TextToSpeech::namespace_starting
...
...
@@ -104,7 +104,7 @@ TextToSpeech::TextToSpeech(Tango::DeviceClass *cl, string &s)
/*----- PROTECTED REGION ID(TextToSpeech::constructor_1) ENABLED START -----*/
init_device
();
/*----- PROTECTED REGION END -----*/
// TextToSpeech::constructor_1
/*----- PROTECTED REGION END -----*/
// TextToSpeech::constructor_1
}
//--------------------------------------------------------
TextToSpeech
::
TextToSpeech
(
Tango
::
DeviceClass
*
cl
,
const
char
*
s
)
...
...
@@ -113,7 +113,7 @@ TextToSpeech::TextToSpeech(Tango::DeviceClass *cl, const char *s)
/*----- PROTECTED REGION ID(TextToSpeech::constructor_2) ENABLED START -----*/
init_device
();
/*----- PROTECTED REGION END -----*/
// TextToSpeech::constructor_2
/*----- PROTECTED REGION END -----*/
// TextToSpeech::constructor_2
}
//--------------------------------------------------------
TextToSpeech
::
TextToSpeech
(
Tango
::
DeviceClass
*
cl
,
const
char
*
s
,
const
char
*
d
)
...
...
@@ -122,7 +122,7 @@ TextToSpeech::TextToSpeech(Tango::DeviceClass *cl, const char *s, const char *d)
/*----- PROTECTED REGION ID(TextToSpeech::constructor_3) ENABLED START -----*/
init_device
();
/*----- PROTECTED REGION END -----*/
// TextToSpeech::constructor_3
/*----- PROTECTED REGION END -----*/
// TextToSpeech::constructor_3
}
//--------------------------------------------------------
...
...
@@ -174,7 +174,9 @@ void TextToSpeech::delete_device()
//--------------------------------------------------------
void
TextToSpeech
::
init_device
()
{
Utils
::
QuickMsTimer
timer
;
DEBUG_STREAM
<<
"TextToSpeech::init_device() "
<<
device_name
<<
" version: "
<<
VERSION_STRING
<<
" build time: "
<<
BUILD_TIME
<<
endl
;
DEBUG_STREAM
<<
"TextToSpeech::init_device() create device "
<<
device_name
<<
endl
;
/*----- PROTECTED REGION ID(TextToSpeech::init_device_before) ENABLED START -----*/
...
...
@@ -331,8 +333,6 @@ void TextToSpeech::init_device()
set_status
(
"Status is ON"
);
do_speech
(
startText
);
cout
<<
"******************************************************TIME"
<<
timer
<<
endl
;
/*----- PROTECTED REGION END -----*/
// TextToSpeech::init_device
}
...
...
@@ -594,7 +594,7 @@ void TextToSpeech::write_jingle(Tango::WAttribute &attr)
attr
.
get_write_value
(
w_val
);
/*----- PROTECTED REGION ID(TextToSpeech::write_jingle) ENABLED START -----*/
if
(
jingle_cache
[
0
]
==
"u
navailable
"
)
if
(
jingle_cache
[
0
]
==
JinglesU
navailable
)
{
*
attr_jingle_read
=
w_val
;
WARN_STREAM
<<
"TextToSpeech::write_jingle(Tango::WAttribute &attr) - No available Jingles"
<<
endl
;
...
...
@@ -819,7 +819,7 @@ void TextToSpeech::do_speech(const string &text)
// we are in an error situation
if
(
!
voice
.
empty
())
{
if
(
!
jingle
.
empty
()
&&
jingle
!=
"u
navailable
"
)
if
(
!
jingle
.
empty
()
&&
jingle
!=
JinglesU
navailable
)
tts_runner
.
addRequest
(
text
,
voice
,
jingle
);
else
tts_runner
.
addRequest
(
text
,
voice
);
...
...
This diff is collapsed.
Click to expand it.
cmake/ReleaseVersion.cmake
+
6
−
6
View file @
6e9127f7
# Project version
set
(
TEXTTOSPEECH_VERSION_MAJOR
"
0
"
)
set
(
TEXTTOSPEECH_VERSION_MINOR
"
1
"
)
set
(
TEXTTOSPEECH_VERSION_REVISION
"0"
)
string
(
TIMESTAMP TEXTTOSPEECH_TIMESTAMP
"%Y-%m-%d %H:%M:%S"
)
set
(
TEXT
_
TO
_
SPEECH_VERSION_MAJOR
"
1
"
)
set
(
TEXT
_
TO
_
SPEECH_VERSION_MINOR
"
0
"
)
set
(
TEXT
_
TO
_
SPEECH_VERSION_REVISION
"0"
)
string
(
TIMESTAMP TEXT
_
TO
_
SPEECH_TIMESTAMP
"%Y-%m-%d %H:%M:%S"
)
# Create the soname string
set
(
TEXTTOSPEECH_VERSION_STRING
${
LIBRARY_VERSION_MAJOR
}
.
${
LIBRARY_VERSION_MINOR
}
.
${
LIBRARY_VERSION_PATCH
}
)
\ No newline at end of file
# Create the version string
set
(
TEXT_TO_SPEECH_VERSION_STRING
${
TEXT_TO_SPEECH_VERSION_MAJOR
}
.
${
TEXT_TO_SPEECH_VERSION_MINOR
}
.
${
TEXT_TO_SPEECH_VERSION_REVISION
}
)
\ No newline at end of file
This diff is collapsed.
Click to expand it.
cmake/TextToSpeechConfig.h.in
+
5
−
5
View file @
6e9127f7
#ifndef TEXTTOSPEECH_CONFIG_H
#define TEXTTOSPEECH_CONFIG_H
#define VERSION_MAJOR "${TEXTTOSPEECH_VERSION_MAJOR}"
#define VERSION_MINOR "${TEXTTOSPEECH_VERSION_MINOR}"
#define VERSION_REVISION "${TEXTTOSPEECH_VERSION_REVISION}"
#define BUILD_TIME "${TEXTTOSPEECH_TIMESTAMP}"
#define VERSION_STRING "${TEXTTOSPEECH_VERSION_STRING}"
#define VERSION_MAJOR "${TEXT
_
TO
_
SPEECH_VERSION_MAJOR}"
#define VERSION_MINOR "${TEXT
_
TO
_
SPEECH_VERSION_MINOR}"
#define VERSION_REVISION "${TEXT
_
TO
_
SPEECH_VERSION_REVISION}"
#define BUILD_TIME "${TEXT
_
TO
_
SPEECH_TIMESTAMP}"
#define VERSION_STRING "${TEXT
_
TO
_
SPEECH_VERSION_STRING}"
#endif /* TEXTTOSPEECH_CONFIG_H */
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment