Tweaks to version

TextToSpeech.cpp

@@ -86,8 +86,8 @@ namespace TextToSpeech_ns
 const string CacheTypeNone = "None";
 const string CacheTypeFile = "File";
 
-const string JinglesUnavailable = "Unavailable";
-const string VoicesUnavailable = "Unavailable";
+const string JinglesUnavailable = "unavailable";
+const string VoicesUnavailable = "unavailable";
 
 /*----- 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] == "unavailable")
+    if(jingle_cache[0] == JinglesUnavailable)
     {
         *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 != "unavailable")
+        if(!jingle.empty() && jingle != JinglesUnavailable)
             tts_runner.addRequest(text, voice, jingle);
         else
             tts_runner.addRequest(text, voice);

cmake/ReleaseVersion.cmake

 # 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

cmake/TextToSpeechConfig.h.in

 #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 */