summaryrefslogtreecommitdiffstats
path: root/pacman-c++/mainwidget.cpp
diff options
context:
space:
mode:
authormanuel <manuel@mausz.at>2011-04-07 19:35:53 +0200
committermanuel <manuel@mausz.at>2011-04-07 19:35:53 +0200
commitdd99879ab004dd1d81b5942ad35d5ea6c1476c10 (patch)
tree8750906915f33a1dc9a1ad1750d6620abd1bf4e2 /pacman-c++/mainwidget.cpp
parent9ef1e89e3ec01a5a34863b1b0aa3483b49404560 (diff)
downloadfoop-dd99879ab004dd1d81b5942ad35d5ea6c1476c10.tar.gz
foop-dd99879ab004dd1d81b5942ad35d5ea6c1476c10.tar.bz2
foop-dd99879ab004dd1d81b5942ad35d5ea6c1476c10.zip
fixing app icon on windows
add audio player
Diffstat (limited to 'pacman-c++/mainwidget.cpp')
-rw-r--r--pacman-c++/mainwidget.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/pacman-c++/mainwidget.cpp b/pacman-c++/mainwidget.cpp
index 96cf62f..537c5ad 100644
--- a/pacman-c++/mainwidget.cpp
+++ b/pacman-c++/mainwidget.cpp
@@ -4,9 +4,7 @@
4#include "bonuspoint.h" 4#include "bonuspoint.h"
5#include "point.h" 5#include "point.h"
6#include "constants.h" 6#include "constants.h"
7 7#include "audioplayer.h"
8#include <phonon/MediaObject>
9#include <QFile>
10 8
11// temporary 9// temporary
12Transmission::map_t createDummyMap() 10Transmission::map_t createDummyMap()
@@ -94,13 +92,11 @@ MainWidget::MainWidget()
94 createGui(); 92 createGui();
95 updateMap(createDummyMap()); 93 updateMap(createDummyMap());
96 94
97#if 1 95#if 0
98 emit startGame(); 96 emit startGame();
99#else 97#else
100 Phonon::MediaObject *player = Phonon::createPlayer(Phonon::MusicCategory, 98 AudioPlayer::self()->playIntro();
101 Phonon::MediaSource(new QFile(":/sound/intro"))); 99 connect(AudioPlayer::self(), SIGNAL(finished()), this, SLOT(startGame()));
102 connect(player, SIGNAL(finished()), this, SLOT(startGame()));
103 player->play();
104#endif 100#endif
105} 101}
106 102