From 822b5fcaa34b78b9668a58680f9e0d89aa3fd7bd Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Fri, 2 May 2008 08:42:08 +0000 Subject: [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 --- general/Audio.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'general/Audio.cpp') 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(); } } -- cgit