Mercurial > pyntnclick
changeset 631:8b78fc07a862 pyntnclick
Less buggy non-albow music support
| author | Neil Muller <neil@dip.sun.ac.za> |
|---|---|
| date | Sat, 11 Feb 2012 22:24:24 +0200 |
| parents | a5f573002fb0 |
| children | 6ba418db1e84 |
| files | pyntnclick/sound.py |
| diffstat | 1 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/pyntnclick/sound.py Sat Feb 11 22:20:52 2012 +0200 +++ b/pyntnclick/sound.py Sat Feb 11 22:24:24 2012 +0200 @@ -29,22 +29,22 @@ def __init__(self, pieces, random, repeat): self._pieces = pieces self._random = random - self._repeate = repeat + self._repeat = repeat def get_next(self): # Get the next piece - if self.pieces: + if self._pieces: if self._random: - if not self._repeat or len(self._items) < 3: - i = randrange(0, len(self.items)) + if not self._repeat or len(self._pieces) < 3: + i = randrange(0, len(self._pieces)) else: # Ignore the last entry, since we possibly just played it - i = randrange(0, len(self.items) - 1) + i = randrange(0, len(self._pieces) - 1) else: i = 0 - result = self.items.pop(i) + result = self._pieces.pop(i) if self._repeat: - self.items.push(result) + self._pieces.append(result) return result return None @@ -148,7 +148,7 @@ def change_playlist(self, new_playlist): if self.sound_enabled: - music.stop_music() + music.stop() self._current_playlist = new_playlist self.start_next_music()