diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2012-03-25 14:47:51 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2012-03-25 14:48:22 +0300 |
| commit | 1cac1de3b27c5c6a511bf86bd9cb1d763c5c7d5d (patch) | |
| tree | db4e9d92380de549834efc6b50603ac933127c7a /src/sound.h | |
| parent | 524c78a8d696e2ff980db7c60272032b4028864b (diff) | |
| download | minetest-1cac1de3b27c5c6a511bf86bd9cb1d763c5c7d5d.tar.gz minetest-1cac1de3b27c5c6a511bf86bd9cb1d763c5c7d5d.tar.bz2 minetest-1cac1de3b27c5c6a511bf86bd9cb1d763c5c7d5d.zip | |
Almost support loading sounds from server
Diffstat (limited to 'src/sound.h')
| -rw-r--r-- | src/sound.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/sound.h b/src/sound.h index f9c1ea0ce..c342f4e5e 100644 --- a/src/sound.h +++ b/src/sound.h @@ -22,7 +22,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "irrlichttypes.h" #include <string> -#include <vector> #include <set> class OnDemandSoundFetcher @@ -30,7 +29,7 @@ class OnDemandSoundFetcher public: virtual void fetchSounds(const std::string &name, std::set<std::string> &dst_paths, - std::set<std::vector<char> > &dst_datas) = 0; + std::set<std::string> &dst_datas) = 0; }; struct SimpleSoundSpec @@ -53,10 +52,10 @@ public: // Multiple sounds can be loaded per name; when played, the sound // should be chosen randomly from alternatives // Return value determines success/failure - virtual bool loadSound(const std::string &name, + virtual bool loadSoundFile(const std::string &name, const std::string &filepath) = 0; - virtual bool loadSound(const std::string &name, - const std::vector<char> &filedata) = 0; + virtual bool loadSoundData(const std::string &name, + const std::string &filedata) = 0; virtual void updateListener(v3f pos, v3f vel, v3f at, v3f up) = 0; @@ -79,10 +78,10 @@ public: class DummySoundManager: public ISoundManager { public: - virtual bool loadSound(const std::string &name, + virtual bool loadSoundFile(const std::string &name, const std::string &filepath) {return true;} - virtual bool loadSound(const std::string &name, - const std::vector<char> &filedata) {return true;} + virtual bool loadSoundData(const std::string &name, + const std::string &filedata) {return true;} void updateListener(v3f pos, v3f vel, v3f at, v3f up) {} int playSound(const std::string &name, bool loop, float volume) {return 0;} |