Merge remote-tracking branch 'origin/bugfix-9941' into feature-revspeech_unicode

runrevmark · runrevmark · commit a365c57daeef · 2014-08-05T12:46:16.000+01:00
diff --git a/docs/notes/bugfix-9941.md b/docs/notes/bugfix-9941.md
@@ -0,0 +1 @@
+# Accented characters in string passed to revSpeak cause nothing to be spoken.
diff --git a/revspeech/src/osxspeech.cpp b/revspeech/src/osxspeech.cpp
@@ -39,7 +39,7 @@ OSXSpeechNarrator::OSXSpeechNarrator(void)
 {
 	spchannel = NULL;
 	strcpy(speechvoice, "empty");
-	speechbuffer = NULL;
+	speechtext = NULL;
 	speechspeed = 0;
 	speechpitch = 0;
 }
@@ -70,18 +70,11 @@ bool OSXSpeechNarrator::Start(const char* p_string)
 	{
 		return false;
 	}
-        
-	if (speechbuffer != nil)
-	{
-		if (spchannel != nil)
-			StopSpeech(spchannel);
-			
-		free(speechbuffer);
-        speechbuffer = nil;
-    }
-	
-	speechbuffer = strdup(p_string);
-	SpeakText(spchannel, speechbuffer, strlen(speechbuffer) + 1);
+    
+    if (speechtext != nil)
+        CFRelease(speechtext);
+    speechtext = CFStringCreateWithCString(kCFAllocatorDefault, p_string, kCFStringEncodingMacRoman);
+	SpeakCFString(spchannel, speechtext, nil);
 	return true;
 }
 
@@ -268,13 +261,14 @@ bool OSXSpeechNarrator::SpeechStop(bool ReleaseInit)
 	}
 	while(SpeechBusy() > 0);
 	
-       DisposeSpeechChannel(spchannel);
-       spchannel = nil;
-       if (speechbuffer != nil)
-	{
-           free(speechbuffer);
-           speechbuffer = nil;
-	}
+    DisposeSpeechChannel(spchannel);
+    spchannel = nil;
+    if (speechtext != nil)
+    {
+        CFRelease(speechtext);
+        speechtext = nil;
+    }
+    
    	return true;
 }
 
diff --git a/revspeech/src/osxspeech.h b/revspeech/src/osxspeech.h
@@ -51,7 +51,7 @@ class OSXSpeechNarrator: public INarrator
 private:
 	SpeechChannel spchannel;
 	char speechvoice[255];
-	char *speechbuffer;
+    CFStringRef speechtext;
 	Fixed speechspeed, speechpitch;
 	
 	bool SpeechStart(bool StartInit);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Accented characters in string passed to revSpeak cause nothing to be spoken.`