diff options
Diffstat (limited to 'general/Audio.cpp')
| -rw-r--r-- | general/Audio.cpp | 61 |
1 files changed, 30 insertions, 31 deletions
diff --git a/general/Audio.cpp b/general/Audio.cpp index 034de04d..46f2853b 100644 --- a/general/Audio.cpp +++ b/general/Audio.cpp @@ -1,25 +1,24 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: general/Audio.cpp -// Purpose: Cache for sound effects -// Author: Ben Boeckel -// Modified by: Ben Boeckel -// Created: Fri Jan 18 21:34:16 2008 -// Copyright: ©2007-2008 Ben Boeckel and Nerdy Productions -// Licence: -// 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 3 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. -// -// You should have received a copy of the GNU General Public License along -// with this program. If not, see <http://www.gnu.org/licenses/>. -///////////////////////////////////////////////////////////////////////////// +/* + * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * + * 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 3 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. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ +// Qt includes +#include <QMutableListIterator> + +// Header include #include "Audio.h" void Audio::playSFX(const QString& url) throw(OpenException) @@ -29,28 +28,28 @@ void Audio::playSFX(const QString& url) throw(OpenException) if (sfx->state() == Phonon::ErrorState) throw(OpenException("Audio", url)); sfx->play(); - curPlay.append(sfx); + m_curPlay.append(sfx); } void Audio::playMusic(const QString& url) throw(OpenException) { - if (!started) + if (!m_started) start(); - musicUrl = url; - if (music.state() == Phonon::PlayingState) - music.seek(music.totalTime() - 1000); + m_musicUrl = url; + if (m_music.state() == Phonon::PlayingState) + m_music.seek(m_music.totalTime() - 1000); else { - music.setCurrentSource(url); - if (music.state() == Phonon::ErrorState) + m_music.setCurrentSource(url); + if (m_music.state() == Phonon::ErrorState) throw(OpenException("Audio", url)); - music.play(); + m_music.play(); } } void Audio::prune() { - for (QMutableListIterator<Phonon::MediaObject*> i(curPlay); i.hasNext(); i.next()) + for (QMutableListIterator<Phonon::MediaObject*> i(m_curPlay); i.hasNext(); i.next()) { if (i.value()->state() == Phonon::StoppedState) { @@ -62,7 +61,7 @@ void Audio::prune() void Audio::clear() { - for (QMutableListIterator<Phonon::MediaObject*> i(curPlay); i.hasNext(); i.next()) + for (QMutableListIterator<Phonon::MediaObject*> i(m_curPlay); i.hasNext(); i.next()) { if (i.value()->state() == Phonon::PlayingState) i.value()->stop(); |