diff --git a/main.py b/main.py index 897ad0c..295a573 100644 --- a/main.py +++ b/main.py @@ -15,7 +15,7 @@ def main(): offset = timing.offset.total_seconds() * 10e3 print(beatmap.audio_filename) - timings, amplitudes, freqs = sound_process.process_song(beatmap.audio_filename, offset, bpm) + timings, amplitudes, freqs = sound_process.process_song(beatmap.audio_filename, bpm, offset=offset) beatmap._hit_objects = place.greedy(bpm, offset, timings, amplitudes) #beatmap._hit_objects = [sl.Slider(sl.Position(0, 0), timedelta(milliseconds=3), timedelta(milliseconds=130), 0, sl.curve.Linear([sl.Position(0, 0), sl.Position(100, 100)], 100), 100, 2, 1, 1, 1, timing.ms_per_beat, [], [],)] diff --git a/sound_process.py b/sound_process.py index c32e3d7..dabcc3d 100755 --- a/sound_process.py +++ b/sound_process.py @@ -425,7 +425,7 @@ def process_song(filename, bpm, offset=0, div_len_factor=1, n_iter_2=-1, thresho n_iter = n_iter_2 if(n_iter == -1): song_len = get_songlen(filename) - n_iter = int(song_len/div_len)-1 + n_iter = int(song_len/div_len)-1/3 filtered_name = f"{filename}_trimmed.wav" @@ -439,7 +439,7 @@ def process_song(filename, bpm, offset=0, div_len_factor=1, n_iter_2=-1, thresho def main(): - data = process_song("tetris_4.wav", 160, n_iter_2 = 32) + data = process_song("tetris_4.wav", 160, n_iter_2 = 64) #print(data) print("Program finished with return 0")