mirror of
https://github.com/Anjok07/ultimatevocalremovergui.git
synced 2025-01-31 20:25:22 +01:00
Fixed parameters not actually parsing through
This commit is contained in:
parent
12deede098
commit
ae434b7194
3
.gitignore
vendored
3
.gitignore
vendored
@ -3,4 +3,5 @@ data.pkl
|
||||
# Testing models
|
||||
model_iter26_sr33075_hl384_w512.pth
|
||||
baseline.pth
|
||||
temp.wav
|
||||
temp.wav
|
||||
models/**/*.pth
|
@ -671,7 +671,8 @@ class MainWindow(TkinterDnD.Tk):
|
||||
instrumental = get_model_values(self.instrumentalModel_var.get())
|
||||
stacked = get_model_values(self.stackedModel_var.get())
|
||||
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']
|
||||
hop_length = DEFAULT_DATA['hop_length']
|
||||
window_size = DEFAULT_DATA['window_size']
|
||||
@ -756,6 +757,8 @@ class MainWindow(TkinterDnD.Tk):
|
||||
'n_fft': n_fft, # not needed for v2
|
||||
# Resolution Type
|
||||
'resType': resType,
|
||||
# Parsed constants should be fixed
|
||||
'manType': self.manType_var.get(),
|
||||
# Other Variables (Tkinter)
|
||||
'window': self,
|
||||
'text_widget': self.command_Text,
|
||||
@ -974,7 +977,8 @@ class MainWindow(TkinterDnD.Tk):
|
||||
# Get constants
|
||||
instrumental = get_model_values(self.instrumentalModel_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']
|
||||
hop_length = DEFAULT_DATA['hop_length']
|
||||
window_size = DEFAULT_DATA['window_size']
|
||||
|
@ -54,7 +54,9 @@ data = {
|
||||
'window_size': 320,
|
||||
'n_fft': 2_048,
|
||||
# Resolution Type
|
||||
'resType': 'kaiser_fast'
|
||||
'resType': 'kaiser_fast',
|
||||
# Parsed constants should be fixed
|
||||
'manType': False,
|
||||
}
|
||||
default_sr = data['sr']
|
||||
default_hop_length = data['hop_length']
|
||||
@ -94,6 +96,10 @@ def update_constants(model_name):
|
||||
data['window_size'] = default_window_size
|
||||
data['n_fft'] = default_n_fft
|
||||
|
||||
if data['manType']:
|
||||
# Default constants should be fixed
|
||||
return
|
||||
|
||||
for text_part in text_parts:
|
||||
if 'sr' in text_part:
|
||||
text_part = text_part.replace('sr', '')
|
||||
|
@ -176,7 +176,9 @@ data = {
|
||||
'window_size': 320,
|
||||
'n_fft': 2_048,
|
||||
# Resolution Type
|
||||
'resType': 'kaiser_fast'
|
||||
'resType': 'kaiser_fast',
|
||||
# Parsed constants should be fixed
|
||||
'manType': False,
|
||||
}
|
||||
default_sr = data['sr']
|
||||
default_hop_length = data['hop_length']
|
||||
@ -214,6 +216,10 @@ def update_constants(model_name):
|
||||
data['window_size'] = default_window_size
|
||||
data['n_fft'] = default_n_fft
|
||||
|
||||
if data['manType']:
|
||||
# Default constants should be fixed
|
||||
return
|
||||
|
||||
for text_part in text_parts:
|
||||
if 'sr' in text_part:
|
||||
text_part = text_part.replace('sr', '')
|
||||
|
Loading…
x
Reference in New Issue
Block a user