diff --git a/sbv2_core/src/main.rs b/sbv2_core/src/main.rs index f1d2642..17404c8 100644 --- a/sbv2_core/src/main.rs +++ b/sbv2_core/src/main.rs @@ -7,8 +7,8 @@ fn main() -> error::Result<()> { println!("{}", normalized_text); let jtalk = text::JTalk::new()?; - jtalk.g2p(&normalized_text)?; - println!("{:?}", ()); + let (phones, tones, _) = jtalk.g2p(&normalized_text)?; + println!("{:?}", tones); let tokenizer = text::get_tokenizer()?; println!("{:?}", tokenizer); diff --git a/sbv2_core/src/text.rs b/sbv2_core/src/text.rs index ef66120..a037153 100644 --- a/sbv2_core/src/text.rs +++ b/sbv2_core/src/text.rs @@ -54,11 +54,10 @@ impl JTalk { Ok(Self { jpreprocess }) } - pub fn g2p(&self, text: &str) -> Result<()> { + pub fn g2p(&self, text: &str) -> Result<(Vec, Vec, Vec)> { let parsed = self.jpreprocess.run_frontend(text)?; let jtalk_process = JTalkProcess::new(Arc::clone(&self.jpreprocess), parsed); - jtalk_process.g2p()?; - Ok(()) + jtalk_process.g2p() } }