diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-12-03 16:52:15 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-12-03 16:55:25 +0300 |
commit | aa1e8a7a7236d49d91501eac2da81bdb96f0bba5 (patch) | |
tree | 833744617232b18ae86aa108dddc72dad8381360 /src/resources/music.cpp | |
parent | d69ea30539a6fe816dd6e1d943a0a2adcbd95c19 (diff) | |
download | manaplus-aa1e8a7a7236d49d91501eac2da81bdb96f0bba5.tar.gz manaplus-aa1e8a7a7236d49d91501eac2da81bdb96f0bba5.tar.bz2 manaplus-aa1e8a7a7236d49d91501eac2da81bdb96f0bba5.tar.xz manaplus-aa1e8a7a7236d49d91501eac2da81bdb96f0bba5.zip |
Rename music.cpp/h to sdlmusic.
Diffstat (limited to 'src/resources/music.cpp')
-rw-r--r-- | src/resources/music.cpp | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/src/resources/music.cpp b/src/resources/music.cpp deleted file mode 100644 index d88b3ccac..000000000 --- a/src/resources/music.cpp +++ /dev/null @@ -1,59 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2004-2009 The Mana World Development Team - * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011-2012 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * 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 - * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include "resources/music.h" - -#include "logger.h" - -#include "debug.h" - -Music::Music(Mix_Music *const music) : - Resource(), - mMusic(music) -{ -} - -Music::~Music() -{ - Mix_FreeMusic(mMusic); -} - -Resource *Music::load(SDL_RWops *const rw) -{ - if (Mix_Music *const music = Mix_LoadMUS_RW(rw)) - { - return new Music(music); - } - else - { - logger->log("Error, failed to load music: %s", Mix_GetError()); - return nullptr; - } -} - -bool Music::play(const int loops, const int fadeIn) -{ - if (fadeIn > 0) - return Mix_FadeInMusic(mMusic, loops, fadeIn); - else - return Mix_PlayMusic(mMusic, loops); -} |