- we love ogg, we hate mp3/wav

- a lot of coding style/intent fix
- add constant.h to pro files

1 files changed, 7 insertions, 9 deletions

diff --git a/pacman-c++/main.cpp b/pacman-c++/main.cpp
index a34ff97..8c9232a 100644
--- a/pacman-c++/main.cpp
+++ b/pacman-c++/main.cpp
@@ -4,6 +4,8 @@
 #include <QtCore>
 #include <QtGui>
 #include <phonon/MediaObject>
+#include <phonon/AudioOutput>
+#include <phonon/BackendCapabilities>
 
 int main(int argc, char **argv)
 {
@@ -13,22 +15,18 @@ int main(int argc, char **argv)
   QGraphicsScene scene(0, 0, 500, 500);
   scene.setBackgroundBrush(Qt::black);
 
-  Actor *actor1 = new Actor(Actor::Player1);
+  Actor *actor1 = new Actor(red);
   scene.addItem(actor1);
   actor1->setPos(100, 100);
 
-  Actor *actor2 = new Actor(Actor::Player2);
+  Actor *actor2 = new Actor(blue);
   scene.addItem(actor2);
   actor2->setPos(120, 100);
 
-  Actor *actor3 = new Actor(Actor::Player3);
+  Actor *actor3 = new Actor(green);
   scene.addItem(actor3);
   actor3->setPos(140, 100);
 
-  Actor *actor4 = new Actor(Actor::Player4);
-  scene.addItem(actor4);
-  actor4->setPos(160, 100);
-
   /*
   Block *block1 = new Block(Actor::Player1);
   scene.addItem(block1);
@@ -36,7 +34,7 @@ int main(int argc, char **argv)
   */
 
   for (unsigned int i=0; i<20; ++i) {
-    Block *b = new Block(Actor::Player1);
+    Block *b = new Block(red);
     scene.addItem(b);
     b->setPos( 100 + i*16, 200);
   }
@@ -53,7 +51,7 @@ int main(int argc, char **argv)
   mainWin.show();
 
   Phonon::MediaObject *music = Phonon::createPlayer(Phonon::MusicCategory,
-                                                    Phonon::MediaSource("/home/totycro/stud/foop/repo/pacman-c++/sound/intro.wav"));
+                                                    Phonon::MediaSource("/home/manuel/uni/foop/pacman-c++/sound/eating_cherry.ogg"));
   music->play();
   
   qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));