From c2ceacdc0493e40aab1fbea9b1e6d19d2412b066 Mon Sep 17 00:00:00 2001
From: tuna2134 <masato@priv.tuna2134.dev>
Date: Mon, 9 Sep 2024 17:13:21 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=81=AE=E3=81=9F?=
 =?UTF-8?q?=E3=82=81=E3=81=AE=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sbv2_core/src/main.rs | 4 ++--
 sbv2_core/src/text.rs | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

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<String>, Vec<i32>, Vec<i32>)> {
         let parsed = self.jpreprocess.run_frontend(text)?;
         let jtalk_process = JTalkProcess::new(Arc::clone(&self.jpreprocess), parsed);
-        jtalk_process.g2p()?;
-        Ok(())
+        jtalk_process.g2p()
     }
 }