Update app.py

app.py

@@ -21,12 +21,6 @@ sampling_rate = 44100
 
 
 def create_fn(model, spk):
-    def select_mode(svc_input, tts_input, gender, tts_rate, vc_transform, auto_f0, f0_predictor):
-        if svc_input is None:
-            return tts_fn(tts_input, gender, tts_rate, vc_transform, auto_f0, f0_predictor)
-        else:
-            return svc_fn(svc_input, vc_transform, auto_f0, f0_predictor)
-
     def svc_fn(input_audio, vc_transform, auto_f0, f0p):
         if input_audio is None:
             return 0, None
@@ -72,7 +66,7 @@ def create_fn(model, spk):
         input_audio = (sr, audio)
         return svc_fn(input_audio, vc_transform, auto_f0, f0p)
 
-    return select_mode
+    return svc_fn, tts_fn
 
 
 if __name__ == '__main__':
@@ -94,7 +88,7 @@ if __name__ == '__main__':
             "<center> 使用此处资源创作的作品，请显著标明出处，CJ有两个模型，carl1更清晰，carl2音域广\n"
         )
         with gr.Tabs():
-            for (name, cover, select_mode) in models:
+            for (name, cover, (svc_fn, tts_fn)) in models:
                 with gr.TabItem(name):
                     with gr.Row():
                         with gr.Column():
@@ -102,7 +96,6 @@ if __name__ == '__main__':
                                 with gr.TabItem('语音转语音'):
                                     svc_input = gr.Audio(
                                         label="上传干声 (已支持无限长音频，处理时间约为原音频时间的5倍)")
-
                                 with gr.TabItem('文本转语音'):
                                     tts_input = gr.Textbox(label='说话内容', value='',
                                                            placeholder='已支持无限长内容，处理时间约为说完原内容时间的5倍')
@@ -110,15 +103,20 @@ if __name__ == '__main__':
                                         gender = gr.Radio(label='说话人性别 (男音调低，女音调高)', value='男',
                                                           choices=['男', '女'])
                                         tts_rate = gr.Number(label='语速 (正负, 单位百分比)', value=0)
-                            with gr.Row():
-                                vc_transform = gr.Number(label="音高调整 (正负半音，12为1个八度)", value=0)
-                                f0_predictor = gr.Radio(label="f0预测器 (对电音有影响)",
-                                                        choices=['crepe', 'harvest', 'dio', 'pm'], value='crepe')
-                            with gr.Row():
-                                auto_f0 = gr.Checkbox(
-                                    label="自动音高预测 (文本转语音或正常说话可选)",
-                                    value=False)
-                                submit = gr.Button("生成", variant="primary")
+
+                                with gr.Row():
+                                    vc_transform = gr.Number(label="音高调整 (正负半音，12为1个八度)", value=0)
+                                    f0_predictor = gr.Radio(label="f0预测器 (对电音有影响)",
+                                                            choices=['crepe', 'harvest', 'dio', 'pm'], value='crepe')
+                                with gr.Row():
+                                    auto_f0 = gr.Checkbox(
+                                        label="自动音高预测 (文本转语音或正常说话可选)",
+                                        value=False)
+                                    with gr.TabItem('语音转语音'):
+                                        svc_submit = gr.Button("生成", variant="primary")
+
+                                    with gr.TabItem('文本转语音'):
+                                        tts_submit = gr.Button("生成", variant="primary")
 
                         with gr.Column():
                             gr.Markdown(
@@ -127,8 +125,7 @@ if __name__ == '__main__':
                                                                                                            '</div>'
                             )
                             vc_output = gr.Audio(label="输出音频")
-
-                    submit.click(select_mode,
-                                 [svc_input, tts_input, gender, tts_rate, vc_transform, auto_f0, f0_predictor],
-                                 vc_output)
+                    svc_submit.click(svc_fn, [svc_input, vc_transform, auto_f0, f0_predictor], vc_output)
+                    tts_submit.click(tts_fn, [tts_input, gender, tts_rate, vc_transform, auto_f0, f0_predictor],
+                                     vc_output)
         app.queue(concurrency_count=1, api_open=args.api).launch(share=args.share)