soiz1 commited on
Commit
d0588ba
·
verified ·
1 Parent(s): 6373eb3

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +4 -6
app.py CHANGED
@@ -341,7 +341,7 @@ reference_files = [
341
  ("四国めたん", "sikokumetan"),
342
  ]
343
 
344
- gallery_items = [os.path.basename(default_dir, f"{filename}.webp") for name, filename in reference_files]
345
  default_reference = os.path.join(default_dir, f"{reference_files[0][1]}.mp3")
346
 
347
  description = ("Zero-shot音声変換モデル(学習不要)。ローカルでの利用方法は[GitHubリポジトリ](https://github.com/Plachtaa/seed-vc)をご覧ください。"
@@ -349,19 +349,17 @@ description = ("Zero-shot音声変換モデル(学習不要)。ローカル
349
  "また、元音声と参考音声の合計時間が30秒を超える場合、元音声は分割処理されます。")
350
 
351
  # ギャラリーで選択された音声を `voice_conversion` に渡すプロキシ関数
352
-
353
- # Modify the proxy function to correctly pass the audio file
354
  def proxy_voice_conversion(source, selected_gallery_item, diffusion_steps, length_adjust, inference_cfg_rate, f0_condition, auto_f0_adjust, pitch_shift):
355
  reference_file = os.path.join(default_dir, f"{selected_gallery_item}.mp3")
356
 
357
- # Call the voice conversion function
358
  outputs = list(voice_conversion(source, reference_file, diffusion_steps, length_adjust, inference_cfg_rate, f0_condition, auto_f0_adjust, pitch_shift))
359
 
360
- # Ensure we have exactly two outputs
361
  while len(outputs) < 2:
362
  outputs.append(None)
363
 
364
- return outputs[0], outputs[1] # Return the two audio files
365
 
366
  inputs = [
367
  gr.Audio(type="filepath", label="元音声"),
 
341
  ("四国めたん", "sikokumetan"),
342
  ]
343
 
344
+ gallery_items = [[os.path.join(default_dir, f"{filename}.webp"), name] for name, filename in reference_files]
345
  default_reference = os.path.join(default_dir, f"{reference_files[0][1]}.mp3")
346
 
347
  description = ("Zero-shot音声変換モデル(学習不要)。ローカルでの利用方法は[GitHubリポジトリ](https://github.com/Plachtaa/seed-vc)をご覧ください。"
 
349
  "また、元音声と参考音声の合計時間が30秒を超える場合、元音声は分割処理されます。")
350
 
351
  # ギャラリーで選択された音声を `voice_conversion` に渡すプロキシ関数
 
 
352
  def proxy_voice_conversion(source, selected_gallery_item, diffusion_steps, length_adjust, inference_cfg_rate, f0_condition, auto_f0_adjust, pitch_shift):
353
  reference_file = os.path.join(default_dir, f"{selected_gallery_item}.mp3")
354
 
355
+ # `voice_conversion` はジェネレーターなのでリスト化して2つの出力を明示的に取得
356
  outputs = list(voice_conversion(source, reference_file, diffusion_steps, length_adjust, inference_cfg_rate, f0_condition, auto_f0_adjust, pitch_shift))
357
 
358
+ # 出力数が2つ未満ならエラー回避のため None を補填
359
  while len(outputs) < 2:
360
  outputs.append(None)
361
 
362
+ return outputs[0], outputs[1] # 2つのオーディオファイルを返す
363
 
364
  inputs = [
365
  gr.Audio(type="filepath", label="元音声"),