Commit: 4436ba4125ca65563ade344da2e7050140b7dcf6 - nlite (git)

Commit MetaInfo

• Revision: 4436ba4125ca65563ade344da2e7050140b7dcf6 (tree)
• Time: 2012-02-22 00:43:01
• Author: qwerty2501 <riot313@gmai...>
• Commiter: qwerty2501

Log Message

読み上げ機能変更

Change Summary

• modified: nlite.suo
• modified: speaker/open_jtalk_core.cpp

Incremental Difference

Binary files a/nlite.suo and b/nlite.suo differ

--- a/speaker/open_jtalk_core.cpp
+++ b/speaker/open_jtalk_core.cpp
@@ -149,22 +149,28 @@ void  COpenJtalkCore::SynthesisThreadFunction(void *userData){
 
 		if(dwRslt-  WAIT_OBJECT_0 == 1)break;
 		else if(dwRslt-  WAIT_OBJECT_0 == 0){
-			CString synthesisString;
-			SynthesisQueue synthesisQueueCopy;
+			CString synthesisString(TEXT(""));
+			
 			self.synthesisQueueCS.Lock();
 
-			synthesisQueueCopy = self.synthesisQueue;
-			self.synthesisQueue.clear();
+			 
 			
+			auto rbegin = self.synthesisQueue.rbegin();
+			auto rend = self.synthesisQueue.rend();
 
+			for(;rbegin != rend;(++rbegin)){
+				synthesisString += *rbegin;
+
+				if(rbegin != rend){
+					synthesisString += TEXT(" ");
+				}
+			}
+			self.synthesisQueue.clear();
 			self.synthesisQueueCS.Unlock();
 
-			auto rbegin = synthesisQueueCopy.rbegin();
-			auto rend = synthesisQueueCopy.rend();
+			
 
-			for(;rbegin != rend;++rbegin){
-				self.Synthesis((const TChar_P)(const wchar_t*)*rbegin);
-			}
+			self.Synthesis((const TChar_P)(const wchar_t*)synthesisString);
 		}