Merge branch 'master' of git.manuel.mausz.at:/foop

Conflicts:
	pacman-c++/sceneholder.cpp
	pacman-c++/util.h

1 files changed, 11 insertions, 1 deletions

diff --git a/pacman-c++/audioplayer.cpp b/pacman-c++/audioplayer.cpp
index 424d3cf..5507bb3 100644
--- a/pacman-c++/audioplayer.cpp
+++ b/pacman-c++/audioplayer.cpp
@@ -52,6 +52,11 @@ AudioPlayer *AudioPlayer::self()
   return m_instance;
 }
 
+bool AudioPlayer::isWorking() const
+{
+  return m_working;
+}
+
 void AudioPlayer::stop()
 {
   m_player->stop();
@@ -62,6 +67,11 @@ void AudioPlayer::setMuted(bool mute)
   m_output->setMuted(mute);
 }
 
+bool AudioPlayer::isMuted() const
+{
+  return m_output->isMuted();
+}
+
 void AudioPlayer::play(AudioPlayer::Sound sound)
 {
   if (!m_working)
@@ -86,7 +96,7 @@ void AudioPlayer::enqueue(AudioPlayer::Sound sound)
   m_player->enqueue(Phonon::MediaSource(m_sounds[sound]));
 }
 
-void AudioPlayer::clearQueue()
+void AudioPlayer::clearQueue() const
 {
   if (!m_working)
     return;