X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fsound.h;h=c21401e8ba946751525b72b873c38ebc7329b670;hb=18bfa1c785a123499ee12d0551a9447a4d32d93b;hp=7f6e4141ef68e6b6c593fb6139b464f04e4ed21f;hpb=93219e3b9d2eae11a447556dfe837706baeff22a;p=oweals%2Fminetest.git diff --git a/src/sound.h b/src/sound.h index 7f6e4141e..c21401e8b 100644 --- a/src/sound.h +++ b/src/sound.h @@ -1,18 +1,18 @@ /* -Minetest-c55 -Copyright (C) 2012 celeron55, Perttu Ahola +Minetest +Copyright (C) 2013 celeron55, Perttu Ahola This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +GNU Lesser General Public License for more details. -You should have received a copy of the GNU General Public License along +You should have received a copy of the GNU Lesser General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -20,9 +20,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef SOUND_HEADER #define SOUND_HEADER -#include "irrlichttypes.h" +#include "irrlichttypes_bloated.h" #include -#include #include class OnDemandSoundFetcher @@ -30,7 +29,7 @@ class OnDemandSoundFetcher public: virtual void fetchSounds(const std::string &name, std::set &dst_paths, - std::set > &dst_datas) = 0; + std::set &dst_datas) = 0; }; struct SimpleSoundSpec @@ -53,12 +52,13 @@ 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 &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; + virtual void setListenerGain(float gain) = 0; // playSound functions return -1 on failure, otherwise a handle to the // sound. If name=="", call should be ignored without error. @@ -67,6 +67,8 @@ public: virtual int playSoundAt(const std::string &name, bool loop, float volume, v3f pos) = 0; virtual void stopSound(int sound) = 0; + virtual bool soundExists(int sound) = 0; + virtual void updateSoundPosition(int sound, v3f pos) = 0; int playSound(const SimpleSoundSpec &spec, bool loop) { return playSound(spec.name, loop, spec.gain); } @@ -77,16 +79,19 @@ 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 &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) {} + void setListenerGain(float gain) {} int playSound(const std::string &name, bool loop, float volume) {return 0;} int playSoundAt(const std::string &name, bool loop, float volume, v3f pos) {return 0;} void stopSound(int sound) {} + bool soundExists(int sound) {return false;} + void updateSoundPosition(int sound, v3f pos) {} }; // Global DummySoundManager singleton