Skip to content

Commit

Permalink
Merge pull request #12 from napulen/music21parsing
Browse files Browse the repository at this point in the history
Fix music21 parsing. Fix #10 and #11 .
  • Loading branch information
salu133445 authored Nov 4, 2020
2 parents 9bccef3 + 6f863c6 commit 4330215
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions muspy/inputs/music21.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def parse_key_signatures(
"""
key_signatures = []
for item in stream.flat.getKeySignatures():
for item in stream.flat.getElementsByClass("Key"):
time = int(float(item.offset * resolution))
key_signature = KeySignature(time, item.tonic.pitchClass, item.mode)
key_signatures.append(key_signature)
Expand Down Expand Up @@ -246,11 +246,9 @@ def from_music21_part(
"""
instruments = partitionByInstrument(part)
if len(instruments) > 1:
return [
parse_track(instrument, resolution) for instrument in instruments
]
return parse_track(part, resolution)
if not instruments:
return parse_track(part, resolution)
return [parse_track(instrument, resolution) for instrument in instruments]


def from_music21_opus(
Expand Down

0 comments on commit 4330215

Please sign in to comment.