From 33aae787dacf9d87851b71b5859b9f9aa88f80c5 Mon Sep 17 00:00:00 2001 From: manuel Date: Tue, 12 Apr 2011 21:40:28 +0200 Subject: add siren player --- pacman-c++/audio.h | 3 ++- pacman-c++/mainwidget.cpp | 10 +++++++++- pacman-c++/mainwidget.h | 3 ++- pacman-c++/pacman.qrc | 1 + 4 files changed, 14 insertions(+), 3 deletions(-) (limited to 'pacman-c++') diff --git a/pacman-c++/audio.h b/pacman-c++/audio.h index bea7fb8..2e14715 100644 --- a/pacman-c++/audio.h +++ b/pacman-c++/audio.h @@ -19,7 +19,8 @@ namespace Sound Intro = 0, WakaWaka, EatingCherry, - Die + Die, + Siren }; }; diff --git a/pacman-c++/mainwidget.cpp b/pacman-c++/mainwidget.cpp index 89cbd58..5ef37e3 100644 --- a/pacman-c++/mainwidget.cpp +++ b/pacman-c++/mainwidget.cpp @@ -2,13 +2,20 @@ #include "actor.h" #include "block.h" #include "constants.h" -#include "audio.h" #include "util.h" #include "pacman.pb.h" MainWidget::MainWidget(QWidget *parent) : QWidget(parent), m_currentKey(Transmission::none), m_running(false) { + /* create audio player */ + m_sirenPlayer = new AudioPlayer(this); + if (m_sirenPlayer->isWorking()) + { + m_sirenPlayer->setLoop(Sound::Siren); + AudioManager::self()->registerAudioPlayer(m_sirenPlayer); + } + Color::Color color = connectToServer(); if (color == Color::none) { @@ -192,6 +199,7 @@ void MainWidget::keyReleaseEvent(QKeyEvent* event) void MainWidget::startGame() { m_running = true; + m_sirenPlayer->play(); } void MainWidget::playerScoreClicked() diff --git a/pacman-c++/mainwidget.h b/pacman-c++/mainwidget.h index 589377b..a3cde3d 100644 --- a/pacman-c++/mainwidget.h +++ b/pacman-c++/mainwidget.h @@ -3,7 +3,7 @@ #include "sceneholder.h" #include "constants.h" -#include "pixmapitem.h" +#include "audio.h" #include "pacman.pb.h" #include #include @@ -49,6 +49,7 @@ private: /* game running */ bool m_running; + AudioPlayer *m_sirenPlayer; QTcpSocket *m_socket; SceneHolder *m_scene; diff --git a/pacman-c++/pacman.qrc b/pacman-c++/pacman.qrc index 4fb542e..c4b18e6 100644 --- a/pacman-c++/pacman.qrc +++ b/pacman-c++/pacman.qrc @@ -25,5 +25,6 @@ sound/waka_waka.ogg sound/eating_cherry.ogg sound/die.ogg + sound/siren.ogg -- cgit v1.2.3