major audio rewrite

1 files changed, 6 insertions, 6 deletions

diff --git a/pacman-c++/client.cpp b/pacman-c++/client.cpp
index c35510a..394b446 100644
--- a/pacman-c++/client.cpp
+++ b/pacman-c++/client.cpp
@@ -1,6 +1,6 @@
 #include "client.h"
 #include "clicklabel.h"
-#include "audioplayer.h"
+#include "audio.h"
 #include "pacman.pb.h"
 
 Client::Client()
@@ -25,9 +25,9 @@ void Client::createMenu()
   toggleSound->setFixedHeight(16);
   toggleSound->setAlignment(Qt::AlignBottom);
 
-  bool sound = AudioPlayer::self()->isWorking();
+  bool sound = AudioManager::self()->isWorking();
   bool muted = !(sound && m_settings->value("muted", false).toBool());
-  AudioPlayer::self()->setMuted(muted);
+  AudioManager::self()->setMuted(muted);
 
   QImage img(muted ? ":/soundoff" : ":/soundon");
   img.setColor(1, menuBar()->palette().color(
@@ -38,7 +38,7 @@ void Client::createMenu()
   if (sound)
   {
     connect(toggleSound, SIGNAL(clicked()), this, SLOT(toggleSound()));
-    connect(AudioPlayer::self(), SIGNAL(mutedChanged(bool)), this, SLOT(mutedChanged(bool)));
+    connect(AudioManager::self(), SIGNAL(mutedChanged(bool)), this, SLOT(mutedChanged(bool)));
   }
 
   menuBar()->setCornerWidget(toggleSound);
@@ -46,9 +46,9 @@ void Client::createMenu()
 
 void Client::toggleSound() const
 {
-  if (!AudioPlayer::self()->isWorking())
+  if (!AudioManager::self()->isWorking())
     return;
-  AudioPlayer::self()->setMuted(!AudioPlayer::self()->isMuted());
+  AudioManager::self()->setMuted(!AudioManager::self()->isMuted());
 }
 
 void Client::mutedChanged(bool muted) const