Update lib/rvc.py

lib/rvc.py

@@ -237,8 +237,7 @@ def voice_change(voice_model, vocals_path, output_path, pitch_change, f0_method,
     """
     Convert the input vocals using the specified RVC model.
     """
-    rvc_model_path, rvc_index_path = get_rvc_model(voice_model, is_webui)
-
+    
     inferred_audio = infer_audio(
         MODEL_NAME=voice_model,
         SOUND_PATH=vocals_path,
@@ -340,48 +339,36 @@ def song_cover_pipeline(song_input, voice_model, pitch_change, keep_files,
             f'{base_song_name}_lead_{voice_model}_p{pitch_change}_i{index_rate}_fr{filter_radius}_'
             f'rms{rms_mix_rate}_pro{protect}_{f0_method}{algo_suffix}.wav'
         )
-        ai_backing_path = os.path.join(
-            song_dir,
-            f'{base_song_name}_backing_{voice_model}_p{pitch_change}_i{index_rate}_fr{filter_radius}_'
-            f'rms{rms_mix_rate}_pro{protect}_{f0_method}{algo_suffix}.wav'
-        )
+        
         ai_cover_path = os.path.join(song_dir, f'{base_song_name} ({voice_model} Ver).{output_format}')
-        ai_cover_backing_path = os.path.join(song_dir, f'{base_song_name} ({voice_model} Ver With Backing).{output_format}')
-
+        
         if not os.path.exists(ai_vocals_path):
-            display_progress('[~] Converting lead voice using RVC...', 0.5, is_webui, progress)
+            display_progress('[~] Converting voice using RVC...', 0.5, is_webui, progress)
             voice_change(voice_model, main_vocals_dereverb_path, ai_vocals_path, pitch_change,
                          f0_method, index_rate, filter_radius, rms_mix_rate, protect, crepe_hop_length, is_webui)
 
-            display_progress('[~] Converting backing voice using RVC...', 0.65, is_webui, progress)
-            voice_change(voice_model, backup_vocals_path, ai_backing_path, pitch_change,
-                         f0_method, index_rate, filter_radius, rms_mix_rate, protect, crepe_hop_length, is_webui)
-
+            
         display_progress('[~] Applying audio effects to Vocals...', 0.8, is_webui, progress)
         ai_vocals_mixed_path = add_audio_effects(ai_vocals_path, reverb_rm_size, reverb_wet, reverb_dry, reverb_damping)
-        ai_backing_mixed_path = add_audio_effects(ai_backing_path, reverb_rm_size, reverb_wet, reverb_dry, reverb_damping)
-
+        
         if pitch_change_all != 0:
             display_progress('[~] Applying overall pitch change', 0.85, is_webui, progress)
             instrumentals_path = pitch_shift(instrumentals_path, pitch_change_all)
-            backup_vocals_path = pitch_shift(backup_vocals_path, pitch_change_all)
-
+            
         display_progress('[~] Combining AI Vocals and Instrumentals...', 0.9, is_webui, progress)
         combine_audio([ai_vocals_mixed_path, backup_vocals_path, instrumentals_path],
                       ai_cover_path, main_gain, backup_gain, inst_gain, output_format)
-        combine_audio([ai_vocals_mixed_path, ai_backing_mixed_path, instrumentals_path],
-                      ai_cover_backing_path, main_gain, backup_gain, inst_gain, output_format)
-
+        
         if not keep_files:
             display_progress('[~] Removing intermediate audio files...', 0.95, is_webui, progress)
-            intermediate_files = [vocals_path, main_vocals_path, ai_vocals_mixed_path, ai_backing_mixed_path]
+            intermediate_files = [vocals_path, main_vocals_path, ai_vocals_mixed_path]
             if pitch_change_all != 0:
                 intermediate_files += [instrumentals_path, backup_vocals_path]
             for file in intermediate_files:
                 if file and os.path.exists(file):
                     os.remove(file)
 
-        return ai_cover_path, ai_cover_backing_path
+        return ai_cover_path
 
     except Exception as e:
         raise_exception(str(e), is_webui)