--- infoscreen/MainView.cpp	2010/01/05 17:19:02	526
+++ infoscreen/MainView.cpp	2010/01/05 20:14:22	527
@@ -6,13 +6,10 @@
 
 #include <QTimer>
 
-//#include <VideoPlayer> //Phonon
-//#include <MediaSource> //Phonon
-
 #include "MyWebView.h"
 #include "clientsiderender.h"
 #include "pictureview.h"
-
+#include "videoview.h"
 
 MainView::MainView(QWidget* parent)
  : QWidget(parent)
@@ -22,13 +19,6 @@
 
 	qApp->setOverrideCursor( QCursor( Qt::BlankCursor) );
 
-	
-	//Phonon::VideoPlayer* video;
-	//video = new Phonon::VideoPlayer(Phonon::VideoCategory, this);	
-	//video->load( Phonon::MediaSource("http://todic.dk/ps3cache/Inglourious_Basterds_2009.avi") );
-	//layout->addWidget(video,1);
-	//video->play();
-
         render = new ClientSideRender(this);
         render->setVisible( false );
 
@@ -38,12 +28,14 @@
         picture = new PictureView(this);
         picture->setVisible( true );
 
-
+        video = new VideoView(this);
+        video->setVisible(false);
 
 	QVBoxLayout* layout = new QVBoxLayout();
         layout->addWidget(web,1);
         layout->addWidget(render,1);
         layout->addWidget(picture,1);
+        layout->addWidget(video,1);
 	layout->addStretch();
 	layout->setContentsMargins(0,0,0,0);
         setLayout(layout);
@@ -61,10 +53,14 @@
     static int count = 0;
     screenManager.timerTick();
 
+    //if (count == 0)
+    //    video->loadUrl("");
+
+
     if ( (count%10) == 0) {
 
         int t = count / 10;
-        qDebug() << t;
+
         if ( (t%2) == 0) {
             picture->loadFromUrl("http://87.104.25.138/infoscreens/data/images/image1.jpg");
         } else {