diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-05-02 08:42:08 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-05-02 08:42:08 +0000 |
| commit | 822b5fcaa34b78b9668a58680f9e0d89aa3fd7bd (patch) | |
| tree | 40dc605213eff20f62b16e5f54e5e5e03d744d63 /general/Audio.cpp | |
| parent | 696414f1dc8bc419427efb6c1abe1bbae0a68a56 (diff) | |
| download | sigen-822b5fcaa34b78b9668a58680f9e0d89aa3fd7bd.tar.gz sigen-822b5fcaa34b78b9668a58680f9e0d89aa3fd7bd.tar.xz sigen-822b5fcaa34b78b9668a58680f9e0d89aa3fd7bd.zip | |
[FIX] Exceptions no longer used in pokemod
[DEL] Exception and BugCatcher are no longer needed
[ADD] Object.cpp added
git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@119 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'general/Audio.cpp')
| -rw-r--r-- | general/Audio.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/general/Audio.cpp b/general/Audio.cpp index 966cdd15..c5ce73e2 100644 --- a/general/Audio.cpp +++ b/general/Audio.cpp @@ -18,18 +18,18 @@ // Header include #include "Audio.h" -void Audio::playSFX(const QString& url) throw(OpenException) +void Audio::playSFX(const QString& url) { Phonon::MediaObject* sfx = new Phonon::MediaObject(); - Q_CHECK_PTR(sfx); sfx->setCurrentSource(url); - if (sfx->state() == Phonon::ErrorState) - throw(OpenException("Audio", url)); - sfx->play(); - m_curPlay.append(sfx); + if (sfx->state() != Phonon::ErrorState) + { + sfx->play(); + m_curPlay.append(sfx); + } } -void Audio::playMusic(const QString& url) throw(OpenException) +void Audio::playMusic(const QString& url) { if (!m_started) start(); @@ -39,9 +39,8 @@ void Audio::playMusic(const QString& url) throw(OpenException) else { m_music.setCurrentSource(url); - if (m_music.state() == Phonon::ErrorState) - throw(OpenException("Audio", url)); - m_music.play(); + if (m_music.state() != Phonon::ErrorState) + m_music.play(); } } |
