Dymas/abogen
1
0
Fork 0
mirror of https://github.com/denizsafak/abogen.git synced 2026-07-18 21:50:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor(pyt): dedup voice formula resolution in PyQt

Browse Source 
Replace 2 inline 'if * in voice: get_new_voice(...)' patterns with
resolve_voice() from domain/voice_loader.py. Removes unused import
of get_new_voice.
This commit is contained in:
Artem Akymenko
2026-07-18 14:13:16 +03:00
parent fcdaf2b2a8
commit 957c6778f6
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
abogen/pyqt/conversion.py
+3 -11
View File
@@ -21,7 +21,6 @@ from abogen.constants import (
SUPPORTED_SOUND_FORMATS, SUPPORTED_SOUND_FORMATS,
SUPPORTED_SUBTITLE_FORMATS, SUPPORTED_SUBTITLE_FORMATS,
) )
from abogen.voice_formulas import get_new_voice
from abogen.infrastructure.subtitle_writer import _format_timestamp from abogen.infrastructure.subtitle_writer import _format_timestamp
from abogen.domain.split_pattern import get_split_pattern from abogen.domain.split_pattern import get_split_pattern
from abogen.domain.output_paths import ( from abogen.domain.output_paths import (
@@ -39,7 +38,7 @@ from abogen.domain.audio_buffer import (
SAMPLE_RATE, SAMPLE_RATE,
) )
from abogen.domain.subtitle_generation import process_subtitle_tokens from abogen.domain.subtitle_generation import process_subtitle_tokens
from abogen.domain.voice_loader import load_voice_cached from abogen.domain.voice_loader import load_voice_cached, resolve_voice
from abogen.domain.progress import calc_etr_str from abogen.domain.progress import calc_etr_str
from abogen.domain.normalization import prepare_text_for_tts from abogen.domain.normalization import prepare_text_for_tts
from abogen.domain.pronunciation import ( from abogen.domain.pronunciation import (
@@ -1462,11 +1461,7 @@ class ConversionThread(QThread):
alignment = "{\\an5}" if is_centered else "" alignment = "{\\an5}" if is_centered else ""
# Load voice # Load voice
loaded_voice = ( loaded_voice = resolve_voice(self.voice, tts, self.use_gpu)
get_new_voice(tts, self.voice, self.use_gpu)
if "*" in self.voice
else self.voice
)
# Calculate initial audio buffer size from timed subtitles only # Calculate initial audio buffer size from timed subtitles only
max_end_time = max( max_end_time = max(
@@ -1920,10 +1915,7 @@ class VoicePreviewThread(QThread):
try: try:
# Enable voice formula support for preview # Enable voice formula support for preview
if "*" in self.voice: loaded_voice = resolve_voice(self.voice, self.backend, self.use_gpu)
loaded_voice = get_new_voice(self.backend, self.voice, self.use_gpu)
else:
loaded_voice = self.voice
sample_text = get_sample_voice_text(self.lang_code) sample_text = get_sample_voice_text(self.lang_code)
audio_segments = [] audio_segments = []
for result in self.backend( for result in self.backend(