summaryrefslogtreecommitdiffstats
path: root/pacman-c++/mainwidget.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'pacman-c++/mainwidget.cpp')
-rw-r--r--pacman-c++/mainwidget.cpp23
1 files changed, 4 insertions, 19 deletions
diff --git a/pacman-c++/mainwidget.cpp b/pacman-c++/mainwidget.cpp
index 9507e85..6930b1a 100644
--- a/pacman-c++/mainwidget.cpp
+++ b/pacman-c++/mainwidget.cpp
@@ -9,17 +9,7 @@ MainWidget::MainWidget(QWidget *parent)
9 : QWidget(parent), m_currentKey(Transmission::none), m_running(false) 9 : QWidget(parent), m_currentKey(Transmission::none), m_running(false)
10{ 10{
11 /* create audio player */ 11 /* create audio player */
12 m_sirenPlayer1 = new AudioPlayer(this); 12 m_ambientPlayer = new GaplessAudioPlayer(Sound::Ambient, 100, this);
13 m_sirenPlayer2 = new AudioPlayer(this);
14 if (m_sirenPlayer1->isWorking() && m_sirenPlayer2->isWorking())
15 {
16 m_sirenPlayer1->setPrefinishMark(100);
17 m_sirenPlayer2->setPrefinishMark(100);
18 connect(m_sirenPlayer1, SIGNAL(prefinishMarkReached(qint32)), this, SLOT(startPlayer2()));
19 connect(m_sirenPlayer2, SIGNAL(prefinishMarkReached(qint32)), this, SLOT(startPlayer1()));
20 AudioManager::self()->registerAudioPlayer(m_sirenPlayer1);
21 AudioManager::self()->registerAudioPlayer(m_sirenPlayer2);
22 }
23 13
24 Color::Color color = connectToServer(); 14 Color::Color color = connectToServer();
25 if (color == Color::none) 15 if (color == Color::none)
@@ -209,17 +199,12 @@ void MainWidget::keyReleaseEvent(QKeyEvent* event)
209void MainWidget::startGame() 199void MainWidget::startGame()
210{ 200{
211 m_running = true; 201 m_running = true;
212 startPlayer1(); 202 m_ambientPlayer->play();
213}
214
215void MainWidget::startPlayer1()
216{
217 m_sirenPlayer1->play(Sound::Ambient);
218} 203}
219 204
220void MainWidget::startPlayer2() 205void MainWidget::setAmbientMuted(bool muted)
221{ 206{
222 m_sirenPlayer2->play(Sound::Ambient); 207 m_ambientPlayer->setMuted(muted);
223} 208}
224 209
225void MainWidget::playerScoreClicked() 210void MainWidget::playerScoreClicked()