diff options
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(); } } |
