From edab66005167fc52541df955752c8284868f201b Mon Sep 17 00:00:00 2001 From: Heberti Almeida Date: Mon, 11 Jul 2016 22:13:49 -0300 Subject: [PATCH] Fixed voice language, now using book language for TTS if available --- Source/EPUBCore/FREpubParser.swift | 3 ++- Source/EPUBCore/FRMetadata.swift | 2 +- Source/FolioReaderAudioPlayer.swift | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Source/EPUBCore/FREpubParser.swift b/Source/EPUBCore/FREpubParser.swift index 8ad61cf71..f876bb1a7 100755 --- a/Source/EPUBCore/FREpubParser.swift +++ b/Source/EPUBCore/FREpubParser.swift @@ -253,7 +253,8 @@ class FREpubParser: NSObject, SSZipArchiveDelegate { } if tag.name == "dc:language" { - metadata.language = tag.value ?? "" + let language = tag.value ?? metadata.language + metadata.language = language != "en" ? language : metadata.language } if tag.name == "dc:creator" { diff --git a/Source/EPUBCore/FRMetadata.swift b/Source/EPUBCore/FRMetadata.swift index f5a2aa4ba..a2f40a419 100755 --- a/Source/EPUBCore/FRMetadata.swift +++ b/Source/EPUBCore/FRMetadata.swift @@ -85,7 +85,7 @@ class FRMetadata: NSObject { var creators = [Author]() var contributors = [Author]() var dates = [Date]() - var language = "en" + var language = "en-US" var titles = [String]() var identifiers = [Identifier]() var subjects = [String]() diff --git a/Source/FolioReaderAudioPlayer.swift b/Source/FolioReaderAudioPlayer.swift index 4a8d44d1f..c84d950f4 100644 --- a/Source/FolioReaderAudioPlayer.swift +++ b/Source/FolioReaderAudioPlayer.swift @@ -348,6 +348,8 @@ class FolioReaderAudioPlayer: NSObject, AVAudioPlayerDelegate, AVSpeechSynthesiz let utterance = AVSpeechUtterance(string: text) utterance.rate = utteranceRate + utterance.voice = AVSpeechSynthesisVoice(language: book.metadata.language) + if(synthesizer.speaking){ synthesizer.stopSpeakingAtBoundary(AVSpeechBoundary.Word) }