helloWorld199 commited on
Commit
5ef2eba
·
verified ·
1 Parent(s): 8b791ee

Update src/main.py

Browse files
Files changed (1) hide show
  1. src/main.py +4 -4
src/main.py CHANGED
@@ -187,7 +187,7 @@ def preprocess_song(song_input, mdx_model_params, song_id, is_webui, input_type,
187
  #display_progress('[~] Applying DeReverb to Vocals...', 0.3, is_webui, progress)
188
  #_, main_vocals_dereverb_path = run_mdx(mdx_model_params, song_output_dir, os.path.join(mdxnet_models_dir, 'Reverb_HQ_By_FoxJoy.onnx'), main_vocals_path, invert_suffix='DeReverb', exclude_main=True, denoise=True)
189
 
190
- return orig_song_path, vocals_path, instrumentals_path#, main_vocals_path, backup_vocals_path, main_vocals_dereverb_path
191
 
192
 
193
  def voice_change(voice_model, vocals_path, output_path, pitch_change, f0_method, index_rate, filter_radius, rms_mix_rate, protect, crepe_hop_length, is_webui):
@@ -278,9 +278,9 @@ def song_cover_pipeline(song_input, voice_model, pitch_change, keep_files,
278
 
279
  # if any of the audio files aren't available or keep intermediate files, rerun preprocess
280
  if any(path is None for path in paths) or keep_files:
281
- orig_song_path, vocals_path, instrumentals_path= preprocess_song(song_input, mdx_model_params, song_id, is_webui, input_type, progress)
282
- print(vocals_path, instrumentals_path)
283
- return vocals_path, instrumentals_path
284
  else:
285
  print("ENTRATO ELSE, ERRORE!")
286
  orig_song_path, instrumentals_path, main_vocals_dereverb_path, backup_vocals_path = paths
 
187
  #display_progress('[~] Applying DeReverb to Vocals...', 0.3, is_webui, progress)
188
  #_, main_vocals_dereverb_path = run_mdx(mdx_model_params, song_output_dir, os.path.join(mdxnet_models_dir, 'Reverb_HQ_By_FoxJoy.onnx'), main_vocals_path, invert_suffix='DeReverb', exclude_main=True, denoise=True)
189
 
190
+ return orig_song_path, vocals_path, instrumentals_path, main_vocals_path, backup_vocals_path, main_vocals_dereverb_path
191
 
192
 
193
  def voice_change(voice_model, vocals_path, output_path, pitch_change, f0_method, index_rate, filter_radius, rms_mix_rate, protect, crepe_hop_length, is_webui):
 
278
 
279
  # if any of the audio files aren't available or keep intermediate files, rerun preprocess
280
  if any(path is None for path in paths) or keep_files:
281
+ orig_song_path, vocals_path, instrumentals_path, backup_vocals_path, main_vocals_dereverb_path= preprocess_song(song_input, mdx_model_params, song_id, is_webui, input_type, progress)
282
+ print(vocals_path, instrumentals_path, backup_vocals_path, main_vocals_dereverb_path)
283
+ return vocals_path, instrumentals_path, backup_vocals_path, main_vocals_dereverb_path
284
  else:
285
  print("ENTRATO ELSE, ERRORE!")
286
  orig_song_path, instrumentals_path, main_vocals_dereverb_path, backup_vocals_path = paths