X-Git-Url: https://scm.cri.ensmp.fr/git/minwii.git/blobdiff_plain/46f3ffd7fdde386f41020171b5733e55a8e64a85..eeb5446512c50f683f60903bd0675f4554c7e927:/src/minwii/musicxml.py?ds=inline diff --git a/src/minwii/musicxml.py b/src/minwii/musicxml.py index 0ed7085..ff819e1 100755 --- a/src/minwii/musicxml.py +++ b/src/minwii/musicxml.py @@ -57,9 +57,8 @@ class Part(object) : self._parseMusic() self.verses = [[]] self.chorus = [] - if autoDetectChorus : - self._findChorus() - self._findVersesLoops() + self.songStartsWithChorus = False + self._findVersesLoops(autoDetectChorus) def _parseMusic(self) : divisions = 0 @@ -83,7 +82,13 @@ class Part(object) : previous.addDuration(note) continue else : - previous.addDuration(note) + try : + previous.addDuration(note) + except AttributeError : + # can occur if part starts with a rest. + if previous is not None : + # something else is wrong. + raise continue previous = note @@ -115,25 +120,7 @@ class Part(object) : self.quarterNoteDuration = int(round(60000/tempo)) - - def _findChorus(self): - """ le refrain correspond aux notes pour lesquelles - il n'existe q'une seule syllable attachée. - """ - start = stop = None - for i, note in enumerate(self.notes) : - ll = len(note.lyrics) - if start is None and ll == 1 : - start = i - elif start is not None and ll > 1 : - stop = i - break - if not (start or stop) : - self.chorus = [] - else : - self.chorus = self.notes[start:stop] - - def _findVersesLoops(self) : + def _findVersesLoops(self, autoDetectChorus) : "recherche des couplets / boucles" verse = self.verses[0] for note in self.notes[:-1] : @@ -145,6 +132,13 @@ class Part(object) : self.verses.append(verse) verse.append(self.notes[-1]) + if autoDetectChorus and len(self.verses) > 1 : + for i, verse in enumerate(self.verses) : + if len(verse[0].lyrics) == 1 : + self.chorus = self.verses.pop(i) + self.songStartsWithChorus = i==0 + break + def iterNotes(self, indefinitely=True) : "exécution de la chanson avec l'alternance couplets / refrains" @@ -153,6 +147,10 @@ class Part(object) : else : iterable = cycle(self.verses) for verse in iterable : + if self.songStartsWithChorus : + for note in self.chorus : + yield note, 0 + #print "---partie---" repeats = len(verse[0].lyrics) if repeats > 1 :