From b18385a95f25e13c767244b494f31bd4fc238143 Mon Sep 17 00:00:00 2001 From: manuel Date: Thu, 14 Apr 2011 02:37:31 +0200 Subject: encapsulate gapless audioplayer commit from yesterday into an own class (gaplessaudioplayer) added two new menu entrys: toggle sound + toggle ambient sound (2. very useful!) --- pacman-c++/mainwidget.cpp | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) (limited to 'pacman-c++/mainwidget.cpp') 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) : QWidget(parent), m_currentKey(Transmission::none), m_running(false) { /* create audio player */ - m_sirenPlayer1 = new AudioPlayer(this); - m_sirenPlayer2 = new AudioPlayer(this); - if (m_sirenPlayer1->isWorking() && m_sirenPlayer2->isWorking()) - { - m_sirenPlayer1->setPrefinishMark(100); - m_sirenPlayer2->setPrefinishMark(100); - connect(m_sirenPlayer1, SIGNAL(prefinishMarkReached(qint32)), this, SLOT(startPlayer2())); - connect(m_sirenPlayer2, SIGNAL(prefinishMarkReached(qint32)), this, SLOT(startPlayer1())); - AudioManager::self()->registerAudioPlayer(m_sirenPlayer1); - AudioManager::self()->registerAudioPlayer(m_sirenPlayer2); - } + m_ambientPlayer = new GaplessAudioPlayer(Sound::Ambient, 100, this); Color::Color color = connectToServer(); if (color == Color::none) @@ -209,17 +199,12 @@ void MainWidget::keyReleaseEvent(QKeyEvent* event) void MainWidget::startGame() { m_running = true; - startPlayer1(); -} - -void MainWidget::startPlayer1() -{ - m_sirenPlayer1->play(Sound::Ambient); + m_ambientPlayer->play(); } -void MainWidget::startPlayer2() +void MainWidget::setAmbientMuted(bool muted) { - m_sirenPlayer2->play(Sound::Ambient); + m_ambientPlayer->setMuted(muted); } void MainWidget::playerScoreClicked() -- cgit v1.2.3