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

remove audiomgr valid check

Browse Source
This commit is contained in:
cxgeorge 2002-09-27 19:47:23 +00:00
parent bb45e0fbb9
commit ee5365e11c
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -561,12 +561,10 @@ class ShowBase:
self.notify.debug("Enabling audio") self.notify.debug("Enabling audio")
def loadSfx(self, name): def loadSfx(self, name):
# showbase's sfxManager should always be at front of list # should return a valid sound obj even if soundMgr is invalid
if(not self.sfxManagerIsValidList[0]):
# dont print a warning if mgr invalid, since they should already know
return None
sound = None sound = None
if (name): if (name):
# showbase-created sfxManager should always be at front of list
sound=self.sfxManagerList[0].getSound(name) sound=self.sfxManagerList[0].getSound(name)
if sound == None: if sound == None:
self.notify.warning("Could not load sound file %s." % name) self.notify.warning("Could not load sound file %s." % name)
@ -574,8 +572,7 @@ class ShowBase:
def loadMusic(self, name): def loadMusic(self, name):
if(not self.musicManagerIsValid): # should return a valid sound obj even if musicMgr is invalid
return None
sound = None sound = None
if (name): if (name):
sound=self.musicManager.getSound(name) sound=self.musicManager.getSound(name)

2
direct/src/showbase/Sources.pp
View File

@ -6,7 +6,7 @@
linmath:c putil:c panda:m express:c pandaexpress:m dtoolconfig dtool linmath:c putil:c panda:m express:c pandaexpress:m dtoolconfig dtool
#define SOURCES \ #define SOURCES \
showBase.cxx showBase.h mersenne.cxx mersenne.h showBase.cxx showBase.h mersenne.cxx mersenne.h projectionScreen.h projectionScreen.I projectionScreen.cxx
#define IGATESCAN all #define IGATESCAN all
#end lib_target #end lib_target