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

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

1 files changed, 3 insertions, 2 deletions

diff --git a/pacman-c++/audioplayer.h b/pacman-c++/audioplayer.h
index dd0c25a..567ccb1 100644
--- a/pacman-c++/audioplayer.h
+++ b/pacman-c++/audioplayer.h
@@ -28,13 +28,14 @@ public:
 public:
   AudioPlayer();
   static AudioPlayer *self();
-  bool isWorking();
+  bool isWorking() const;
   void stop();
   void setMuted(bool mute = true);
+  bool isMuted() const;
   void play(Sound sound);
   void clear();
   void enqueue(Sound sound);
-  void clearQueue();
+  void clearQueue() const;
   Phonon::State state();
 
 signals: