読み上げ機能変更

diff --git a/nlite.suo b/nlite.suo
index 4b8b938..be11a29 100644 (file)
Binary files a/nlite.suo and b/nlite.suo differ

diff --git a/speaker/open_jtalk_core.cpp b/speaker/open_jtalk_core.cpp
index 81dd2ff..a8b2d93 100644 (file)
--- 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);
                }