mii/ncb-tts-r2
1
0
Fork 0
mirror of https://github.com/mii443/ncb-tts-r2.git synced 2025-08-22 16:15:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

support vec audio

Browse Source
This commit is contained in:
mii443
2025-04-04 21:46:32 +09:00
parent 82e3c55fd5
commit 696954395b
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/implement/message.rs
View File

@ -78,7 +78,7 @@ impl TTSMessage for Message {
res res
} }
async fn synthesize(&self, instance: &mut TTSInstance, ctx: &Context) -> Compressed { async fn synthesize(&self, instance: &mut TTSInstance, ctx: &Context) -> Vec<Compressed> {
let text = self.parse(instance, ctx).await; let text = self.parse(instance, ctx).await;
let data_read = ctx.data.read().await; let data_read = ctx.data.read().await;
@ -127,6 +127,6 @@ impl TTSMessage for Message {
.unwrap(), .unwrap(),
}; };
audio vec![audio]
} }
} }

2
src/tts/instance.rs
View File

@ -32,9 +32,11 @@ impl TTSInstance {
let manager = songbird::get(&ctx).await.unwrap(); let manager = songbird::get(&ctx).await.unwrap();
let call = manager.get(self.guild).unwrap(); let call = manager.get(self.guild).unwrap();
let mut call = call.lock().await; let mut call = call.lock().await;
for audio in audio {
call.enqueue(audio.into()).await; call.enqueue(audio.into()).await;
} }
} }
}
pub async fn skip(&mut self, ctx: &Context) { pub async fn skip(&mut self, ctx: &Context) {
let manager = songbird::get(&ctx).await.unwrap(); let manager = songbird::get(&ctx).await.unwrap();

6
src/tts/message.rs
View File

@ -26,7 +26,7 @@ pub trait TTSMessage {
/// ```rust /// ```rust
/// let audio = message.synthesize(instance, ctx).await; /// let audio = message.synthesize(instance, ctx).await;
/// ``` /// ```
async fn synthesize(&self, instance: &mut TTSInstance, ctx: &Context) -> Compressed; async fn synthesize(&self, instance: &mut TTSInstance, ctx: &Context) -> Vec<Compressed>;
} }
pub struct AnnounceMessage { pub struct AnnounceMessage {
@ -43,7 +43,7 @@ impl TTSMessage for AnnounceMessage {
) )
} }
async fn synthesize(&self, instance: &mut TTSInstance, ctx: &Context) -> Compressed { async fn synthesize(&self, instance: &mut TTSInstance, ctx: &Context) -> Vec<Compressed> {
let text = self.parse(instance, ctx).await; let text = self.parse(instance, ctx).await;
let data_read = ctx.data.read().await; let data_read = ctx.data.read().await;
let storage = data_read let storage = data_read
@ -72,6 +72,6 @@ impl TTSMessage for AnnounceMessage {
.await .await
.unwrap(); .unwrap();
audio vec![audio]
} }
} }

4
src/tts/tts.rs
View File

@ -35,7 +35,7 @@ impl TTS {
if let Some(audio) = self.cache.get(&cache_key) { if let Some(audio) = self.cache.get(&cache_key) {
info!("Cache hit for VOICEVOX TTS"); info!("Cache hit for VOICEVOX TTS");
return Ok(audio.clone()); return Ok(audio.new_handle());
} }
info!("Cache miss for VOICEVOX TTS"); info!("Cache miss for VOICEVOX TTS");
@ -58,7 +58,7 @@ impl TTS {
if let Some(audio) = self.cache.get(&cache_key) { if let Some(audio) = self.cache.get(&cache_key) {
info!("Cache hit for GCP TTS"); info!("Cache hit for GCP TTS");
return Ok(audio.clone()); return Ok(audio.new_handle());
} }
info!("Cache miss for GCP TTS"); info!("Cache miss for GCP TTS");