TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 02:15:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

removed unloadSfx and unloadMusic, just call del instead

Browse Source
This commit is contained in:
Dave Schuyler 2002-01-12 06:19:42 +00:00
parent f18c25abbd
commit 083477a839
2 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
direct/src/interval/SoundInterval.py
View File

@ -54,6 +54,7 @@ class SoundInterval(Interval):
# Update sound based on current time # Update sound based on current time
if (t >= self.getDuration()): if (t >= self.getDuration()):
# If end of sound reached or stop event received, stop sound # If end of sound reached or stop event received, stop sound
if self.sound:
self.sound.stop() self.sound.stop()
self.ignore(self.stopEvent) self.ignore(self.stopEvent)
elif (event == IVAL_INIT): elif (event == IVAL_INIT):
@ -62,6 +63,7 @@ class SoundInterval(Interval):
# start at the beginning # start at the beginning
if (t < 0.1): if (t < 0.1):
t = 0.0 t = 0.0
if self.sound:
# Start sound # Start sound
self.sound.setTime(t) self.sound.setTime(t)
self.sound.setLoop(self.loop) self.sound.setLoop(self.loop)

16
direct/src/showbase/ShowBase.py
View File

@ -343,14 +343,6 @@ class ShowBase:
self.notify.warning("Could not load music file %s." % name) self.notify.warning("Could not load music file %s." % name)
return sound return sound
def unloadSfx(self, sfx):
if sfx:
del sfx
def unloadMusic(self, music):
if music:
del music
def playSfx(self, sfx, looping = 0, interupt = 1, volume = None, def playSfx(self, sfx, looping = 0, interupt = 1, volume = None,
time = 0.): time = 0.):
if sfx: if sfx:
@ -371,14 +363,6 @@ class ShowBase:
music.setLoop(looping) music.setLoop(looping)
music.play() music.play()
def stopSfx(self, sfx):
if sfx:
sfx.stop()
def stopMusic(self, music):
if music:
music.stop()
def dataloop(self, state): def dataloop(self, state):
# traverse the data graph. This reads all the control # traverse the data graph. This reads all the control
# inputs (from the mouse and keyboard, for instance) and also # inputs (from the mouse and keyboard, for instance) and also