From 802d4549d9f58d8e540ab4abadd58afa0f09d332 Mon Sep 17 00:00:00 2001 From: Mark Mine Date: Sat, 19 Oct 2002 23:34:04 +0000 Subject: [PATCH] Change loop paramter on particle and sound intervals which was stomping on loop function --- direct/src/interval/ParticleInterval.py | 2 +- direct/src/interval/SoundInterval.py | 6 +++--- direct/src/tkwidgets/Slider.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/direct/src/interval/ParticleInterval.py b/direct/src/interval/ParticleInterval.py index 84746292ca..22c13b053b 100644 --- a/direct/src/interval/ParticleInterval.py +++ b/direct/src/interval/ParticleInterval.py @@ -25,7 +25,7 @@ class ParticleInterval(Interval.Interval): self.particleEffect = particleEffect self.parent = parent self.worldRelative = worldRelative - self.loop = loop + self.fLoop = loop assert(duration > 0.0 or loop == 1) # Initialize superclass Interval.Interval.__init__(self, name, duration) diff --git a/direct/src/interval/SoundInterval.py b/direct/src/interval/SoundInterval.py index 612ae72e19..098f59bbfb 100644 --- a/direct/src/interval/SoundInterval.py +++ b/direct/src/interval/SoundInterval.py @@ -27,7 +27,7 @@ class SoundInterval(Interval.Interval): SoundInterval.soundNum += 1 # Record instance variables self.sound = sound - self.loop = loop + self.fLoop = loop self.volume = volume self.startTime = startTime # If no duration given use sound's duration as interval's duration @@ -55,7 +55,7 @@ class SoundInterval(Interval.Interval): if self.sound != None: self.sound.setVolume(self.volume) self.sound.setTime(t1) - self.sound.setLoop(self.loop) + self.sound.setLoop(self.fLoop) self.sound.play() self.state = CInterval.SStarted self.currT = t1 @@ -66,7 +66,7 @@ class SoundInterval(Interval.Interval): if self.sound != None: self.sound.setVolume(self.volume) self.sound.setTime(t) - self.sound.setLoop(self.loop) + self.sound.setLoop(self.fLoop) self.sound.play() self.state = CInterval.SStarted self.currT = t diff --git a/direct/src/tkwidgets/Slider.py b/direct/src/tkwidgets/Slider.py index 5c16f152e5..410b1b2b91 100644 --- a/direct/src/tkwidgets/Slider.py +++ b/direct/src/tkwidgets/Slider.py @@ -42,7 +42,7 @@ class Slider(Valuator): style = self['style'], command = self.setEntry, value = self['value']) - self._valuator._widget.bind('', self.mouseReset) + #self._valuator._widget.bind('', self.mouseReset) # Add popup bindings to slider widget try: