From 311aae0a0e9289ff7039cfcdcdb78d8e5981f094 Mon Sep 17 00:00:00 2001 From: Cary Sandvig Date: Fri, 20 Oct 2000 00:19:29 +0000 Subject: [PATCH] *** empty log message *** --- direct/src/showbase/Loader.py | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/direct/src/showbase/Loader.py b/direct/src/showbase/Loader.py index 4e66b77d1b..b2a8d5dd52 100644 --- a/direct/src/showbase/Loader.py +++ b/direct/src/showbase/Loader.py @@ -69,23 +69,14 @@ class Loader: return texture # sound loading funcs - def loadSample(self, samplePath): + def loadSound(self, soundPath): """loadSample(self, string) Attempt to load a sound from the given file path using Cary's sound class. Returns None if not found""" - Loader.notify.info("Loading sound: %s" % (samplePath) ) - sound = self.__audioPool.loadSample(samplePath) + Loader.notify.info("Loading sound: %s" % (soundPath) ) + sound = self.__audioPool.loadSound(soundPath) return sound - def loadMusic(self, musicPath): - """loadMusic(self, string) - Attempt to load music from the given file path using - Cary's sound class. Returns None if not found""" - Loader.notify.info("Loading music: %s" % (musicPath) ) - music = self.__audioPool.loadMusic(musicPath) - return music - -