Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GETMusic fixes #196

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

GETMusic fixes #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7065314
add .gitignore
NomarCub Mar 29, 2024
e68b802
fix save_path on Windows - / separator was not portable
NomarCub Mar 29, 2024
908e70a
fix miditoolkit.containers error - see https://github.com/microsoft/m…
NomarCub Mar 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions getmusic/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
cache
__pycache__
10 changes: 5 additions & 5 deletions getmusic/position_generation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ def encoding_to_MIDI(encoding, tpc, decode_chord):

def get_tick(bar, pos):
return (bar_to_pos[bar] + pos) * midi_obj.ticks_per_beat // pos_resolution
midi_obj.instruments = [miditoolkit.containers.Instrument(program=(
midi_obj.instruments = [miditoolkit.midi.containers.Instrument(program=(
0 if i == 128 else i), is_drum=(i == 128), name=str(i)) for i in range(128 + 1)]

for i in encoding:
Expand All @@ -445,7 +445,7 @@ def get_tick(bar, pos):
end = start + get_tick(0, e2d(1))
for kind_shift in _CHORD_KIND_PITCHES[kind_name]:
pitch = 36 + root_pitch_shift + kind_shift
midi_obj.instruments[1].notes.append(miditoolkit.containers.Note(
midi_obj.instruments[1].notes.append(miditoolkit.midi.containers.Note(
start=start, end=end, pitch=pitch, velocity=e2v(20)))
elif program != 129:
pitch = (i[3] - 128 if program == 128 else i[3])
Expand All @@ -457,7 +457,7 @@ def get_tick(bar, pos):
end = start + duration
velocity = e2v(i[5])

midi_obj.instruments[program].notes.append(miditoolkit.containers.Note(
midi_obj.instruments[program].notes.append(miditoolkit.midi.containers.Note(
start=start, end=end, pitch=pitch, velocity=velocity))
midi_obj.instruments = [
i for i in midi_obj.instruments if len(i.notes) > 0]
Expand All @@ -466,7 +466,7 @@ def get_tick(bar, pos):
new_ts = bar_to_timesig[i]
if new_ts != cur_ts:
numerator, denominator = e2t(new_ts)
midi_obj.time_signature_changes.append(miditoolkit.containers.TimeSignature(
midi_obj.time_signature_changes.append(miditoolkit.midi.containers.TimeSignature(
numerator=numerator, denominator=denominator, time=get_tick(i, 0)))
cur_ts = new_ts
cur_tp = None
Expand All @@ -475,7 +475,7 @@ def get_tick(bar, pos):
if new_tp != cur_tp:
tempo = e2b(new_tp)
midi_obj.tempo_changes.append(
miditoolkit.containers.TempoChange(tempo=tempo, time=get_tick(0, i)))
miditoolkit.midi.containers.TempoChange(tempo=tempo, time=get_tick(0, i)))
cur_tp = new_tp
return midi_obj

Expand Down
8 changes: 4 additions & 4 deletions getmusic/preprocess/to_oct.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ def encoding_to_MIDI(encoding):

def get_tick(bar, pos):
return (bar_to_pos[bar] + pos) * midi_obj.ticks_per_beat // pos_resolution
midi_obj.instruments = [miditoolkit.containers.Instrument(program=(
midi_obj.instruments = [miditoolkit.midi.containers.Instrument(program=(
0 if i == 128 else i), is_drum=(i == 128), name=str(i)) for i in range(128 + 1)]
for i in encoding:
start = get_tick(i[0], i[1])
Expand All @@ -382,7 +382,7 @@ def get_tick(bar, pos):
duration = 1
end = start + duration
velocity = e2v(i[5])
midi_obj.instruments[program].notes.append(miditoolkit.containers.Note(
midi_obj.instruments[program].notes.append(miditoolkit.midi.containers.Note(
start=start, end=end, pitch=pitch, velocity=velocity))
midi_obj.instruments = [
i for i in midi_obj.instruments if len(i.notes) > 0]
Expand All @@ -391,7 +391,7 @@ def get_tick(bar, pos):
new_ts = bar_to_timesig[i]
if new_ts != cur_ts:
numerator, denominator = e2t(new_ts)
midi_obj.time_signature_changes.append(miditoolkit.containers.TimeSignature(
midi_obj.time_signature_changes.append(miditoolkit.midi.containers.TimeSignature(
numerator=numerator, denominator=denominator, time=get_tick(i, 0)))
cur_ts = new_ts
cur_tp = None
Expand All @@ -400,7 +400,7 @@ def get_tick(bar, pos):
if new_tp != cur_tp:
tempo = e2b(new_tp)
midi_obj.tempo_changes.append(
miditoolkit.containers.TempoChange(tempo=tempo, time=get_tick(0, i)))
miditoolkit.midi.containers.TempoChange(tempo=tempo, time=get_tick(0, i)))
cur_tp = new_tp
return midi_obj

Expand Down
12 changes: 6 additions & 6 deletions getmusic/track_generation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ def encoding_to_MIDI(encoding, tpc, decode_chord):

def get_tick(bar, pos):
return (bar_to_pos[bar] + pos) * midi_obj.ticks_per_beat // pos_resolution
midi_obj.instruments = [miditoolkit.containers.Instrument(program=(
midi_obj.instruments = [miditoolkit.midi.containers.Instrument(program=(
0 if i == 128 else i), is_drum=(i == 128), name=str(i)) for i in range(128 + 1)]

for i in encoding:
Expand All @@ -423,7 +423,7 @@ def get_tick(bar, pos):
end = start + get_tick(0, e2d(1))
for kind_shift in _CHORD_KIND_PITCHES[kind_name]:
pitch = 36 + root_pitch_shift + kind_shift
midi_obj.instruments[1].notes.append(miditoolkit.containers.Note(
midi_obj.instruments[1].notes.append(miditoolkit.midi.containers.Note(
start=start, end=end, pitch=pitch, velocity=e2v(20)))
elif program != 129:
pitch = (i[3] - 128 if program == 128 else i[3])
Expand All @@ -435,7 +435,7 @@ def get_tick(bar, pos):
end = start + duration
velocity = e2v(i[5])

midi_obj.instruments[program].notes.append(miditoolkit.containers.Note(
midi_obj.instruments[program].notes.append(miditoolkit.midi.containers.Note(
start=start, end=end, pitch=pitch, velocity=velocity))
midi_obj.instruments = [
i for i in midi_obj.instruments if len(i.notes) > 0]
Expand All @@ -444,7 +444,7 @@ def get_tick(bar, pos):
new_ts = bar_to_timesig[i]
if new_ts != cur_ts:
numerator, denominator = e2t(new_ts)
midi_obj.time_signature_changes.append(miditoolkit.containers.TimeSignature(
midi_obj.time_signature_changes.append(miditoolkit.midi.containers.TimeSignature(
numerator=numerator, denominator=denominator, time=get_tick(i, 0)))
cur_ts = new_ts
cur_tp = None
Expand All @@ -453,7 +453,7 @@ def get_tick(bar, pos):
if new_tp != cur_tp:
tempo = e2b(new_tp)
midi_obj.tempo_changes.append(
miditoolkit.containers.TempoChange(tempo=tempo, time=get_tick(0, i)))
miditoolkit.midi.containers.TempoChange(tempo=tempo, time=get_tick(0, i)))
cur_tp = new_tp
return midi_obj

Expand Down Expand Up @@ -715,7 +715,7 @@ def main():

midi_obj = encoding_to_MIDI(oct_final, tpc, args.decode_chord)

save_path = os.path.join(args.file_path, '{}2{}-{}'.format(conditional_name, content_name, file_name.split('/')[-1]))
save_path = os.path.join(args.file_path, '{}2{}-{}'.format(conditional_name, content_name, os.path.basename(file_name)))

midi_obj.dump(save_path)

Expand Down