Cool_Tools/ultimatevocalremovergui
1
0
Fork 0
mirror of https://github.com/Anjok07/ultimatevocalremovergui.git synced 2025-02-07 23:11:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed parameters not actually parsing through

Browse Source
This commit is contained in:
Dilan Boskan 2021-01-14 16:40:14 +01:00
parent 12deede098
commit ae434b7194
4 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -4,3 +4,4 @@ data.pkl
model_iter26_sr33075_hl384_w512.pth model_iter26_sr33075_hl384_w512.pth
baseline.pth baseline.pth
temp.wav temp.wav
models/**/*.pth

8
VocalRemover.py
View File

@ -671,7 +671,8 @@ class MainWindow(TkinterDnD.Tk):
instrumental = get_model_values(self.instrumentalModel_var.get()) instrumental = get_model_values(self.instrumentalModel_var.get())
stacked = get_model_values(self.stackedModel_var.get()) stacked = get_model_values(self.stackedModel_var.get())
try: try:
if [bool(instrumental), bool(stacked)].count(True) == 2: if ([bool(instrumental), bool(stacked)].count(True) == 2 and
not self.manType_var.get()):
sr = DEFAULT_DATA['sr'] sr = DEFAULT_DATA['sr']
hop_length = DEFAULT_DATA['hop_length'] hop_length = DEFAULT_DATA['hop_length']
window_size = DEFAULT_DATA['window_size'] window_size = DEFAULT_DATA['window_size']
@ -756,6 +757,8 @@ class MainWindow(TkinterDnD.Tk):
'n_fft': n_fft, # not needed for v2 'n_fft': n_fft, # not needed for v2
# Resolution Type # Resolution Type
'resType': resType, 'resType': resType,
# Parsed constants should be fixed
'manType': self.manType_var.get(),
# Other Variables (Tkinter) # Other Variables (Tkinter)
'window': self, 'window': self,
'text_widget': self.command_Text, 'text_widget': self.command_Text,
@ -974,7 +977,8 @@ class MainWindow(TkinterDnD.Tk):
# Get constants # Get constants
instrumental = get_model_values(self.instrumentalModel_var.get()) instrumental = get_model_values(self.instrumentalModel_var.get())
stacked = get_model_values(self.stackedModel_var.get()) stacked = get_model_values(self.stackedModel_var.get())
if [bool(instrumental), bool(stacked)].count(True) == 2: if ([bool(instrumental), bool(stacked)].count(True) == 2 and
not self.manType_var.get()):
sr = DEFAULT_DATA['sr'] sr = DEFAULT_DATA['sr']
hop_length = DEFAULT_DATA['hop_length'] hop_length = DEFAULT_DATA['hop_length']
window_size = DEFAULT_DATA['window_size'] window_size = DEFAULT_DATA['window_size']

8
inference_v2.py
View File

@ -54,7 +54,9 @@ data = {
'window_size': 320, 'window_size': 320,
'n_fft': 2_048, 'n_fft': 2_048,
# Resolution Type # Resolution Type
'resType': 'kaiser_fast' 'resType': 'kaiser_fast',
# Parsed constants should be fixed
'manType': False,
} }
default_sr = data['sr'] default_sr = data['sr']
default_hop_length = data['hop_length'] default_hop_length = data['hop_length']
@ -94,6 +96,10 @@ def update_constants(model_name):
data['window_size'] = default_window_size data['window_size'] = default_window_size
data['n_fft'] = default_n_fft data['n_fft'] = default_n_fft
if data['manType']:
# Default constants should be fixed
return
for text_part in text_parts: for text_part in text_parts:
if 'sr' in text_part: if 'sr' in text_part:
text_part = text_part.replace('sr', '') text_part = text_part.replace('sr', '')

8
inference_v4.py
View File

@ -176,7 +176,9 @@ data = {
'window_size': 320, 'window_size': 320,
'n_fft': 2_048, 'n_fft': 2_048,
# Resolution Type # Resolution Type
'resType': 'kaiser_fast' 'resType': 'kaiser_fast',
# Parsed constants should be fixed
'manType': False,
} }
default_sr = data['sr'] default_sr = data['sr']
default_hop_length = data['hop_length'] default_hop_length = data['hop_length']
@ -214,6 +216,10 @@ def update_constants(model_name):
data['window_size'] = default_window_size data['window_size'] = default_window_size
data['n_fft'] = default_n_fft data['n_fft'] = default_n_fft
if data['manType']:
# Default constants should be fixed
return
for text_part in text_parts: for text_part in text_parts:
if 'sr' in text_part: if 'sr' in text_part:
text_part = text_part.replace('sr', '') text_part = text_part.replace('sr', '')